Login hotfix
Merge branch 'master' of https://github.com/Tasha25/Weintervene2014

hotfix