I dont remember what I changed...
Merge remote-tracking branch 'origin/master'

Conflicts:
	ValenceGame BASE/Assembly-CSharp-vs.csproj
	ValenceGame BASE/Assembly-UnityScript-Editor-vs.unityproj
	ValenceGame BASE/Assembly-UnityScript-vs.unityproj
	ValenceGame BASE/Assets/Scenes/level1.unity
	ValenceGame BASE/ValenceGame BASE-csharp.sln
	ValenceGame BASE/ValenceGame BASE.sln