Log in
Merge remote-tracking branch 'origin/master'
login controller cleaned up, popup-generator updated