Accept the correct files

Yeah
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/plugins/ClassFilter.java