Some changes for update faces.materialIndex
Merge branch 'master' of git@github.com:ssachtleben/herowar.git

Conflicts:
	app/assets/javascripts/editor/helper/selectorArea.coffee