Merge branch 'master' of C:\Users\Bibhuti\workspace\prescient-service with conflicts.
UI style sheet for user screen and create user controller is modified