internationalisation : partie jeu
Merge branch 'master' of https://github.com/Marmau/geonigme.git

Conflicts:
	app/views/dashboard/createEnigma.scala.html
	app/views/dashboard/createHunt.scala.html
	app/views/dashboard/createStep.scala.html
	app/views/dashboard/dashboard.scala.html
	app/views/dashboard/includeFormHunt.scala.html
	app/views/dashboard/mainDashboard.scala.html
	app/views/dashboard/showHunt.scala.html
	app/views/dashboard/updateEnigma.scala.html
	app/views/dashboard/updateHunt.scala.html
	app/views/dashboard/updateStep.scala.html
	app/views/game/enigma.scala.html
	app/views/game/finish.scala.html
	app/views/game/go.scala.html
	app/views/global/index.scala.html
	app/views/global/login.scala.html
	conf/messages.en
	conf/messages.fr
Merge branch 'master' of https://github.com/Marmau/geonigme.git
internationalisation : menus + jeu + panel admin
Merge branch 'master' of https://github.com/Marmau/geonigme.git

Conflicts:
	app/views/adminpanel/editUser.scala.html
	app/views/dashboard/createHunt.scala.html
	app/views/dashboard/includeFormHunt.scala.html
	app/views/dashboard/showHunt.scala.html
	app/views/dashboard/updateHunt.scala.html
	app/views/dashboard/updateStep.scala.html
	app/views/game/enigma.scala.html
	app/views/game/summaryEnigmaFail.scala.html
	app/views/game/summaryEnigmaGood.scala.html
	app/views/global/menu.scala.html
	conf/messages.en
	conf/messages.fr