Patrick

merging router, controller and login view changes