merged
Merge branch 'master' of https://github.com/songecko/lan-friends-day.git

Conflicts:
	src/Odiseo/LanBundle/Controller/Frontend/MainController.php
	src/Odiseo/LanBundle/Entity/User.php