bug fix
Merge branch 'devlop' into forIpad
??
log清掉
Merge branch 'devlop' into forIpad