forum
Merge branch 'master' of https://github.com/DZTGroup/wechat-estate
forum
Merge branch 'master' of https://github.com/DZTGroup/wechat-estate into mao_dbconfig

Conflicts:
	protected/config/console.php
	protected/config/main.php