Blame 049b1d6e789821fe96b71765a56006474dd29ac4
Blame 049b1d6e789821fe96b71765a56006474dd29ac4
Blame 049b1d6e789821fe96b71765a56006474dd29ac4
Add new properties to tournament : maxTeamNumber, type
Merge remote-tracking branch 'origin/master'

Conflicts:
	mepa-front/src/main/resources/i18n/messages_fr.properties
	mepa-front/src/main/webapp/WEB-INF/views/tournament/read/list.jsp
Merge branch 'master' of https://github.com/sigl-mepa-2015/mepa into jaune_branch