fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/runtime/console.log
	protected/views/layouts/column3.php
	protected/views/layouts/column5.php
	protected/views/layouts/main.php
	protected/views/weixin/templateset.php