Tagged
Merge remote-tracking branch 'origin/master'

Conflicts:
	SparkMoWare/logic/Filter.java