11.13改进
Merge branch 'master' of https://github.com/MrSaxon/tzy

Conflicts:
	protected/modules/master/views/action/view.php