Merge branch 'master' into '289-hilfreichere-darstellung-von-statistiken'

# Conflicts:
#   templates/lecture.html

templates/lecture.html

@@ -39,7 +39,6 @@
 			<div class="col-xs-12" style="padding-top: 20px">
 				<p>{{ moderator_editor(['lectures',lecture.id,'comment'], lecture.comment) }}</p>
 			</div>
-			{% if (chapters|length > 0) or ismod() %}
 			<div class="col-xs-12 table-responsive" style="padding-top: 10px;">
 				<p>Kapitel:
 				<button class="btn btn-default" id="hintnewchapter">{% if ismod() %}Neues Kapitel{% else %}Kapitelmarker vorschlagen{% endif %}</button>