towards angular-esk login
merge conflicts