Merge commit '46fc07dabfd13742f83314937987e34416688567'

Conflicts:
	src/main/java/com/techlooper/service/impl/JobQueryBuilderImpl.java
Merge commit '37cf30f293df1a81778c121ecf387a741a7f837b'

Conflicts:
	src/main/java/com/techlooper/service/impl/JobQueryBuilderImpl.java