Merge branch 'entitystruct' into dev

Conflicts:
	app/config/config.yml
MainController & Users realized
Merge remote-tracking branch 'origin/develop' into dev

Conflicts:
	app/AppKernel.php
	app/config/config.yml
	src/Soy/Bundle/UserBundle/SoyUserBundle.php