mazetest refining
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Meshes/Materials/slasher_scythe_diffuse.mat
	Assets/Meshes/Materials/slasher_scythe_diffuse.mat.meta
	Assets/Meshes/slasher_scythe_diffuse.bmp.meta
	Assets/Meshes/slasher_scythe_mesh.fbx.meta