update map & menu
Merge branch 'master' of github.com:Evrika/Vidal

Conflicts:
	src/Vidal/MainBundle/Controller/IndexController.php
merge