Added CurrentUser service
Merge remote-tracking branch 'origin/master' git pug master