ignore blocks of your color
Merge persistence and material filtering

Conflicts:
	index.js