minor edits
Merge branch 'master' of https://github.com/andallas/Wopen

Conflicts:
	Assembly-CSharp-Editor-vs.csproj
	Assembly-CSharp-Editor.csproj
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assets/Scenes/zack_scene_protoype_test 1.unity
	Assets/Scenes/zack_scene_protoype_test 1.unity.meta
	Wopen-csharp.sln
	Wopen.sln