2014.12.24 13:54 HEE Merry christmas :)
Merge branch 'master' of https://github.com/MinsuCracy/imgsearch

Conflicts:
	imgsearch/src/main/java/org/imgsearch/common/Criteria.java