bug fixed
x
Merge branch 'master' of http://github.com/mugua/xiaotao-develop