/ | workin on clean merge
Merge branch 'master' into usermanagement

Conflicts:
	app/AppKernel.php