trans
Merge branch 'develop' of github.com:black-project/AdminBundle into develop
Merge pull request #11 from Axxon/develop

Develop
Update composer.json
Merge branch 'release/0.2.3'