change auth logic & override fosuserbundle views
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/config/config.yml
	src/M235/YourSub/SandwichBundle/Resources/views/layout.html.twig
change auth logic & override fosuserbundle views