Merge remote-tracking branch 'origin/1.0' into 1.0-develop
updated configuration
updated to psr-4
updates from sonata
updated
updated composer and base layout
updated
updated composer.json
Merge remote-tracking branch 'bitbucket/1.0-develop' into 1.0-develop
updated vendor
updated ckeditor to use elogen instead of rz
updated config file