Initial commit
Merge branch 'master' of github.com:paulcelie/UserBundle into development
Fix json
Merge pull request #1 from paulcelie/development

Development