fix loginbyqq
Merge remote-tracking branch 'origin/master' into zl
fix login and register, add searchAct
Merge remote-tracking branch 'origin/zl'