Derp.

Merge branch 'devel' of codecrew.fi:bortal into devel

Conflicts:
	code/MoyaWeb/src/fi/codecrew/moya/web/helper/LayoutView.java

code/MoyaWeb/WebContent/tournaments/admin/view_tournament_single.xhtml

@@ -30,6 +30,14 @@
 						</f:facet>
 						</f:facet>
 						<h:outputText value="#{participant.participator.email}" />
 						<h:outputText value="#{participant.participator.email}" />
 					</p:column>
 					</p:column>
+					<p:column>
+						<f:facet name="header">
+							<h:outputText value="#{i18n['tournament.participant_place']}" />
+						</f:facet>
+						<ui:repeat rendered="#{not empty participant.participator.groupMemberships}" var="groupMembership" value="#{participant.participator.groupMemberships}">
+       						<h:outputText value="#{groupMembership.placeReservation.name}" />&nbsp;
+       					</ui:repeat>
+					</p:column>
 	 			</p:dataTable>
 	 			</p:dataTable>
  			</h:form>
  			</h:form>
  			
  			

code/MoyaWeb/WebContent/tournaments/admin/view_tournament_team.xhtml

@@ -43,6 +43,11 @@
 							        				<li>
 							        				<li>
 							        					<h:outputText value="#{member.eventUser.email}" />
 							        					<h:outputText value="#{member.eventUser.email}" />
 							        				</li>
 							        				</li>
+							        				<li>
+							        					<ui:repeat rendered="#{not empty member.eventUser.groupMemberships}" var="groupMembership" value="#{member.eventUser.groupMemberships}">
+							        						<h:outputText value="#{groupMembership.placeReservation.name}" />&nbsp;
+							        					</ui:repeat>
+							        				</li>
 						        				</ul>
 						        				</ul>
 						        			</li>
 						        			</li>
 						        		</ui:repeat>
 						        		</ui:repeat>