Merge branch 'rose_branch' of https://github.com/sigl-mepa-2015/mepa into rose_branch

Conflicts:
	mepa-front/src/main/webapp/WEB-INF/views/reporting/tournamentReporting.jsp

Reporting : General Rank of Player