merge version from desktop
Merge branch 'master' of https://github.com/interxuxing/imageclef-proj

Conflicts:
	utils/.idea/workspace.xml