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

Conflicts:
	protected/controllers/admin/NetgametypesController.php
	protected/views/admin/netgametypes/form.php
k