Merge commit 'b0949df2f8d6b9825971980d641b0ea2650b2f32'

Conflicts:
	src/main/java/com/techlooper/service/impl/JobQueryBuilderImpl.java
Merge branch 'master' of https://github.com/phuonghuynh/TechLooper

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