fix conflict
Merge branch 'master' of ssh://github.com/cuongnx/obir_imagecollector

Conflicts:
	.classpath