Merge branch 'gh-pages' into develop
Login work a little more (but still rather unstable)
Realized when $apply was relevant - login works as intended now...
Merge branch 'develop' into gh-pages