fighter model added
Merge branch 'origin/develop'

Conflicts:
	tojam/Assembly-CSharp-Editor-vs.csproj
	tojam/Assembly-CSharp-Editor.csproj
	tojam/Assembly-CSharp-Editor.pidb
	tojam/Assembly-CSharp-firstpass-vs.csproj
	tojam/Assembly-CSharp-firstpass.csproj
	tojam/Assembly-CSharp-firstpass.pidb
	tojam/Assembly-CSharp.pidb
	tojam/Assembly-UnityScript-vs.unityproj
	tojam/Assembly-UnityScript.pidb
	tojam/Assembly-UnityScript.unityproj
	tojam/Assets/Fonts.meta
	tojam/Assets/Fonts/tr2n.meta
	tojam/Assets/Fonts/tr2n/License.txt.meta
	tojam/Assets/Fonts/tr2n/Readme.txt.meta
	tojam/Assets/Fonts/tr2n/TR2N-Sample.png.meta
	tojam/Assets/Fonts/tr2n/Tr2n.ttf.meta
	tojam/Assets/Scenes/FlightTestScene.unity
	tojam/Assets/Textures/drone_texture_v1o.png.meta
	tojam/tojam.userprefs