Refactoring to AuthController
$user object in all views
Merge remote-tracking branch 'origin/master'