inserted image filtering
inserted image filtering
Merge branch 'master' of https://github.com/yonisim/butterflys

Conflicts:
	butterflys-identify/src/gui/gui.java