Merge branch 'andreywix-Feature-AbstractLogin'
Merge remote-tracking branch 'upstream/master'
fixes logging in
Merge pull request #59 from andreywix/Feature-PolishingUp

Feature - Polishing up