updated materials
Merge branch 'master' of https://github.com/menohack/Vera into pathfindingCombat

Conflicts:
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Vera.userprefs