login bug fixed
Merge branches 'master' and 'arthurBranch'