订阅小bug
Merge branch 'master' of http://github.com/tjproject/TiCheck_Server

Conflicts:
	.DS_Store
	index.php~
	protected/.DS_Store
	protected/config/main.php~
	protected/modules/Push/controllers/DefaultController.php~
	protected/modules/Subscription/controllers/CancelController.php~
	protected/modules/Subscription/controllers/CreateController.php~
	protected/modules/Subscription/controllers/DefaultController.php~
	protected/modules/Subscription/controllers/InfoController.php~
	protected/modules/Subscription/controllers/ModifyController.php~
	protected/modules/User/controllers/CreateController.php~
	protected/modules/User/controllers/DefaultController.php~
	protected/modules/User/controllers/LoginController.php~
	protected/modules/User/controllers/ModifyController.php~
	protected/views/site/error.php~