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

Conflicts:
	protected/components/Debug.php
	protected/controllers/admin/OldarticleController.php
	protected/models/ApiFahao.php
	protected/modules/m/views/layouts/column3.php
	protected/modules/m/views/layouts/danji.php
	protected/modules/m/views/layouts/fahao.php
	protected/modules/m/views/layouts/main1.php
	protected/modules/m/views/wwwindex/mybox.php
	protected/views/admin/article/searchtime.php
	protected/views/admin/test/commentlist.php
	protected/views/admin/test/form.php
	protected/views/wy/index/indextest.php