Committed to merge
Merge commit '33f8a1272f96d795ce98d121150a9265c90c6b6b'

Conflicts:
	src/main/webapp/assets/modules/job/searchForm.ctrl.js
	src/main/webapp/assets/modules/job/searchResult.ctrl.js
	src/main/webapp/assets/modules/job/searchResult.tpl.html
update code
update code
Add searchBox.srv.js