Made login page work
Merge remote-tracking branch 'origin'