ruby style!
fixed login through phone
Merge remote-tracking branch 'origin/master'