Merge branch 'master' of https://github.com/rantd/image-processing

Conflicts:
	FeatureDetection.java
update
Merge branch 'master' of https://github.com/rantd/image-processing

Conflicts:
	FeatureDetection.java