fix bug
Merge branch 'master' of https://github.com/baoshujun/love_pig.git
调整为正式登陆
wenjian
Merge remote-tracking branch 'origin/master'

merge ontouch