Clean up user service and introduct some consistent naming scheme
Merge branches 'master' and 'master' of github.com:enwida/idpRepo