多处修改
Merge branch 'master' of https://github.com/popsup/popsup

Conflicts:
	protected/controllers/TipController.php