ALPHA 0.07f pre show build
Merge branch 'master' of https://github.com/vipvex/Dracarys

Conflicts:
	NewDragonSimulator/Library/CurrentMaximizeLayout.dwlt
	NewDragonSimulator/Library/InspectorExpandedItems.asset
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-CSharp.dll
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-UnityScript.dll
	NewDragonSimulator/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	NewDragonSimulator/Library/assetDatabase3
	NewDragonSimulator/Library/guidmapper
	NewDragonSimulator/Library/metadata/09/09f03bdea272b2e4d9c97d790709ad34
	NewDragonSimulator/Library/metadata/11/110b3b0cab2c8db4180f223ebdd245a3
	NewDragonSimulator/Library/metadata/1a/1a03f00c8bb965646bc19d8e3e278157
	NewDragonSimulator/Library/metadata/3f/3f484771cdecae54ebf22f37c2c2ecaf
	NewDragonSimulator/Library/metadata/5f/5f6f67c54bb3ac248a72c9e43cb24b94
	NewDragonSimulator/Library/metadata/69/69bfc9d54b79cd24f89ce3c87dab7bbf
	NewDragonSimulator/Library/metadata/8a/8a4f3b2a3262e504587dc6065cb7db4a