profile -> login, other updates
Merge branch 'master' of /Users/coolaj86/Code/angular-tpl into ng-tpl