Few infrastructure changes and initial user service.
Merge remote-tracking branch 'origin/master'