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

Conflicts:
	protected/extensions/yii-detectmobilebrowser/XDetectMobileBrowser.php
	protected/modules/m/views/wwwindex/detailtop.php
	protected/modules/m/views/wwwindex/feedback.php
	protected/modules/m/views/wwwindex/login.php
	protected/modules/m/views/wwwindex/register.php
	protected/modules/m/views/wwwindex/top.php
	protected/modules/m/views/wygame/list.php
	protected/modules/m/views/wyzq/index.php
	protected/views/wy/index/indextest.php