修复bug
Merge branch 'master' of https://github.com/GavinLai/zhufuyu

Conflicts:
	modules/wxserver/Wxserver_Model.php
	themes/default/css/m.css