fixed hard reference to fos-userbundle
Merge branch 'master' into uberspace

Conflicts:
	app/AppKernel.php