为了合并的commit
Merge branch 'master' of https://github.com/jenseni/ezsp

Conflicts:
	Application/Admin/Controller/CompanyController.class.php
优惠活动，动态新闻后台页面