Merge pull request #10 from Axxon/develop

Develop
Fix for JS in form
Merge branch 'release/0.2.1'
Merge branch 'develop' of github.com:black-project/AdminBundle into develop
Merge branch 'release/0.2.2'
Merge branch 'develop' of github.com:black-project/AdminBundle into develop