Renamed materials.
Merge branch 'master' of https://github.com/willistherage/kimjongawesome

Conflicts:
	proto/assets/js/character.js
	proto/assets/js/compositeimage.js
	proto/assets/js/materialsmodel.js