Merge branch 'master' of https://github.com/johnsonpham/TechLooper

Conflicts:
	src/main/webapp/assets/modules/job/searchResult.ctrl.js
Merge commit '4e73eec701bf99a3cf699a597df50afad5903641'
merge remote branch
Merge commit 'd197fd9d61592dc9db84ffcf2a36aae17c02de94'
Merge commit
Add jQuery selector
Merge commit '72dba1e6a350085acca536202185d04deffeb1f3'

Conflicts:
	src/main/webapp/assets/modules/job/searchResult.ctrl.js
Merge commit '15af63a434470ada93962c79d5018d29bd765e62'

Conflicts:
	src/main/webapp/assets/modules/job/searchBox.srv.js
	src/main/webapp/assets/modules/job/searchResult.ctrl.js
Merge commit '73cf9037ec7e813f44bfa48137dedde196b5f317'

Conflicts:
	src/main/webapp/assets/modules/job/searchResult.ctrl.js