v0.9
fixed conflicts
fix conflicts
wechat module nearly done
Merge branch 'master' of https://github.com/IdiotAlliance/wcptf
"fixed conflicts"
Conflicts:
	protected/controllers/ImageUpController.php
	protected/models/HotProductsAR.php
	protected/models/ProductsAR.php
	protected/modules/takeAway/models/ProductInfoForm.php
	protected/runtime/AR.log
	protected/runtime/error.log
	ueditor/ueditor.config.js
	upload/20131110/13840889708481.jpg
	upload/20131112/13842524097476.jpg