WHAAAT
Merge branch 'master' of github.com:fhacktory/BlenderBQ

Conflicts:
	filters.py