Adding LegacyBundle and related DB/EM
Fixing config.yml
Refixing config.yml
Merge branch 'develop' into lord_baine

Conflicts:
	app/AppKernel.php
	app/config/config.yml
Merge branch 'develop'