recovery point for the branche
 installed and configured SonataAdminBundle, SonataAdminOrmBundle and SonataMediaBundle
fix config sonata
Delete upl.txt
sonata_projects_configuration renamed to sonata.yml
Merge branch 'add_sonata_media_bundle_and_configure' of https://github.com/geekhub-php/CheDream2 into add_sonata_media_bundle_and_configure
 fix sonata.yml
Merge pull request #13 from geekhub-php/add_sonata_media_bundle_and_configure

Add sonata media bundle and configure
Update Status.php
Merge branch 'develop' into choose-frontend-framework-and-create-base-template-on-twbs

Conflicts:
	app/config/config.yml
	composer.json
fix after merge