add and fix composer.json
Merge commit 'edbfdd7eda75708f68837fa5c1e81f6380920911' into rock/doctrine-bundle