User controller
Merge branch 'UIWebsite'