added controller to login
Merge branch 'master' into CreateNavBar
Fixed a bug from login button in navbar
Merge branch 'master' into CreateNavBar