Merge branch 'master' into 352_TBot-Password
Fixed unit test
Merge branch 'master' of github.com:TeamMentor/Dev into 352_TBot-Password
User.cshtml being cached.
User section converted to ng_view.
Merge remote-tracking branch 'origin/352_TBot-Password' into azure