Fixed Media deletion
Merge pull request #478 from sylvaindeloux/master

Fixed Media deletion
CKEditor integration doc
Merge pull request #387 from coopTilleuls/cke-doc

CKEditor integration doc
Update CKEditor documentation for the SonataFormatterBundle way
Merge pull request #479 from eko/master

Update CKEditor documentation for the SonataFormatterBundle way
Make the admin bundle optional
Fix test autoload
Merge branch 'sonata-project/master'

Conflicts:
	composer.json