Remove role/ user --> user spring security template
Merge branch 'develop' of https://github.com/tncgroup/tncrepo into develop