;
Merge branch 'master' of https://github.com/zionwang/new_pipaw

Conflicts:
	protected/controllers/admin/TestController.php
	protected/modules/m/controllers/WwwIndexController.php
	protected/modules/m/controllers/WyIndexController.php
	protected/modules/m/controllers/WyNewsController.php
	protected/modules/m/controllers/WyZqController.php