Gena_Filter_Work
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/dream/Filters/FilterHiPass.java
	src/com/dream/MainView.java