update
Merge commit 'f53480c5069ca18e4c2e70670a8f26b5867639a8'

Conflicts:
	src/main/webapp/assets/modules/job/searchResult.tpl.html
New search textbox