nodo
Merge branch 'master' of https://github.com/MinsuCracy/imgsearch.git

Conflicts:
	imgsearch/src/main/java/org/imgsearch/mapper/ImgsearchMapper.xml