Merge branch 'fix/552' into 'master'

Only show cohort when cohort is not None

Closes #552

See merge request thalia/concrexit!784

website/members/templates/members/index.html

@@ -64,7 +64,9 @@
 					<div class="post-overlay">
 						<div class="post-overlay-meta">
 							<h2>{{ member.profile.display_name }}</h2>
-                            <p>{% trans "Cohort" %}: {{ member.profile.starting_year }}</p>
+                                                        {% if member.profile.starting_year %}
+                                                        <p>{% trans "Cohort" %}: {{ member.profile.starting_year }}</p>
+                                                        {% endif %}
 						</div>
 					</div>
 					<div class="post-body avatar-subtitle">