Added controller: 'LoginCtrl
Fixed merge conflicts