minor tweaks and a Room rule
Merge branch 'master' of github.com:Twodordan/Sandbox_1_CaveGrid

Conflicts:
	Assets/MainSceneIce.unity
	Assets/Standard Assets/Materials/iceMaterial.mat
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/05/0564881755a248243b77f88e29590afe
updated rooms