Merge pull request #1 from RajBasu/erica

Erica
changes to invi.s walls
Merge commit 'c42ee455d7d21e11b668bcf8ebb598a604292ce4' into Ian_Branch

Conflicts:
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/guidmapper
	Temp/__EditModeScene
Merge pull request #2 from RajBasu/Ian_Branch

Ian branch