cleanup
Merge branch 'develop' of https://github.com/RtxLabs/UserBundle into develop