cleanup
Merge branch 'feature/ROC-758' into develop
cleanup, user mail save fix
Merge pull request #57 from RtxLabs/feature/ROC-759-2

cleanup, user mail save fix
Merge branch 'develop' of https://github.com/RtxLabs/UserBundle into develop
Merge branch 'develop'