news commit 10-29
Merge branch 'master' of https://github.com/qiaohe/jobPanel

Conflicts:
	Recruitment/MyClass/BaseView/BaseUIViewController.m
	Recruitment/MyClass/BaseView/ClassifyView/MyGrowingViewController.m