User controller related changes and Specs for tests
Merge remote-tracking branch 'origin'