Added user controller
Merge branch 'master' into cli-addnavbar
User page created, UserPageController