Correct bugs and change Login method
Merge branch 'master' of https://github.com/Drakesinger/SmartHome