update: fixed routing
Merge branch 'master' of ssh://github.com/sylvainlb/jeu

Conflicts:
	app/assets/javascripts/jeu.js
	app/assets/javascripts/views/zones/zones_index.js
bugfix: missing menu