Merge remote-tracking branch 'origin/master'
Add logo. Make password field hidden. Change labels.