fix log (4)!
new fix log(4.1)
fix login (5)!
fix login (5)!
Merge branch 'origin/master'