no message
Merge branch 'master' of https://github.com/kingwang317/it4fun-fuel

Conflicts:
	fuel/application/views/job_detail.php
	fuel/application/views/job_list.php
merge
Merge branch 'master' of https://github.com/kingwang317/it4fun-fuel

Conflicts:
	fuel/modules/resume/controllers/resume_manage.php