jakes test stuff
Merge remote-tracking branch 'origin/Hans' into Jake

Conflicts:
	DDD/Assembly-CSharp.suo
	DDD/Assembly-UnityScript-firstpass-vs.unityproj
	DDD/Assembly-UnityScript-firstpass.unityproj
	DDD/Assembly-UnityScript-vs.unityproj
	DDD/Assembly-UnityScript.unityproj
	DDD/Library/AssetServerCacheV3
	DDD/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
menu scene
Merge remote-tracking branch 'origin/Jake' into Hans