Customize v2
Merge remote-tracking branch 'origin/master'

Conflicts:
	AVPZ/AVPZ-csharp.sln
	AVPZ/AVPZ.sln
	AVPZ/AVPZ.userprefs
	AVPZ/Assembly-CSharp-Editor-vs.csproj
	AVPZ/Assembly-CSharp-Editor.csproj
	AVPZ/Assembly-CSharp-firstpass-vs.csproj
	AVPZ/Assembly-CSharp-firstpass.csproj
	AVPZ/Assembly-CSharp-vs.csproj
	AVPZ/Assembly-CSharp.csproj
	AVPZ/Assembly-UnityScript-Editor-vs.unityproj
	AVPZ/Assembly-UnityScript-Editor.unityproj
	AVPZ/Assembly-UnityScript-firstpass-vs.unityproj
	AVPZ/Assembly-UnityScript-firstpass.unityproj
	AVPZ/Assembly-UnityScript-vs.unityproj
	AVPZ/Assembly-UnityScript.unityproj
	AVPZ/Assets/Level_1.unity
	AVPZ/Assets/Standard Assets/Scripts/CharacterControl.cs
	AVPZ/Library/CurrentLayout.dwlt
	AVPZ/Library/CurrentMaximizeLayout.dwlt
	AVPZ/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	AVPZ/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	AVPZ/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	AVPZ/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	AVPZ/Library/ScriptAssemblies/Assembly-CSharp.dll
	AVPZ/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	AVPZ/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	AVPZ/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	AVPZ/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	AVPZ/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	AVPZ/Library/ScriptAssemblies/Assembly-UnityScript.dll
	AVPZ/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	AVPZ/Library/assetDatabase3
	AVPZ/Library/expandedItems
	AVPZ/Library/guidmapper
	AVPZ/Library/metadata/0c/0c5e786b8af5bef44a5cf3c194223d9c
	AVPZ/Library/metadata/3e/3e5a26c5001815d4c805728ef09dbf1d
	AVPZ/Library/metadata/7a/7a5f3546b415afd4da6f7895ac3cc004
	AVPZ/Library/metadata/a5/a500ca6842c228c4ebf1153ecf032a21
	AVPZ/Library/metadata/c1/c124bc8e7b2e66d45bbfd1b88160175a