version 20131129 22:00 bylpp001
修改了公司介绍，公司代理，公司招聘状态字
Merge branch 'master' of https://github.com/scutLaoYi/shengwu

Conflicts:
	Controller/CompanyDescriptionsController.php
	View/CompanyDescriptions/view_recruitment.ctp