commit 12-15
commit 12-16
commit 12-22
Merge branch 'master' of https://github.com/czd327917086/wuliuzaixian

Conflicts:
	Application/Api/Controller/ApiController.class.php
	Application/Api/Controller/VipController.class.php