translation
Merge branch 'develop' of github.com:black-project/AdminBundle into develop
translation
fix token generation
merge conficts
minor fix
Merge pull request #7 from Axxon/develop

Develop
Remove .DS_Store
Fix for JS in form
Merge branch 'release/0.2.1'