Applying latest.
Rebuilt--applying
Merging
merging
merging
Merge branch 'master' of https://github.com/russjudge/ArtemisMissionEditor

Conflicts:
	ArtemisMissionEditor/ArtemisMissionEditor.csproj
	ArtemisMissionEditor/Classes/Mission/ExpressionMember/Checks/ExpressionException.cs
	ArtemisMissionEditor/Classes/Mission/ExpressionMember/Enumerators & Descriptor Classes/ExpressionMemberValueBehaviorInXml.cs
	ArtemisMissionEditor/Classes/Mission/ExpressionMember/Enumerators & Descriptor Classes/ExpressionMemberValueDescription.cs
	ArtemisMissionEditor/Classes/Mission/Mission.cs
	ArtemisMissionEditor/Classes/Shared/Helper.cs
	ArtemisMissionEditor/Classes/User Controls/PanelSpaceMap.cs
	ArtemisMissionEditor/Forms/DialogSimple.Designer.cs
	ArtemisMissionEditor/Forms/DialogSimple.cs
	ArtemisMissionEditor/Forms/FormSpaceMap.Designer.cs
	ArtemisMissionEditor/Properties/AssemblyInfo.cs
	ArtemisMissionEditor/bin/Debug/ArtemisMissionEditor.exe
	ArtemisMissionEditor/bin/Debug/ArtemisMissionEditor.exe.CodeAnalysisLog.xml
	ArtemisMissionEditor/bin/Debug/ArtemisMissionEditor.pdb
	ArtemisMissionEditor/bin/Debug/ArtemisMissionEditor.vshost.exe
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.DialogSpaceMap.resources
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.FormDependency.resources
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.FormFindReplace.resources
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.FormLog.resources
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.FormMain.resources
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.FormMissionProperties.resources
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.FormSearchResults.resources
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.FormSettings.resources
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.csproj.FileListAbsolute.txt
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.csproj.GenerateResource.Cache
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.csprojResolveAssemblyReference.cache
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.exe
	ArtemisMissionEditor/obj/x86/Debug/ArtemisMissionEditor.pdb
	ArtemisMissionEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferences.cache
	ArtemisMissionEditor/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	ArtemisMissionEditor/obj/x86/Debug/TempPE/Properties.Resources.Designer.cs.dll
	ArtemisMissionEditor/obj/x86/Release/ArtemisMissionEditor.csprojResolveAssemblyReference.cache
	ArtemisMissionEditor/zzz_Changelog.txt
	ArtemisMissionEditor/zzz_Future_Plans.txt
	ArtemisToolbox.suo
	ArtemisToolbox.v11.suo
	EngineeringTemplateMaster/obj/x86/Debug/ArtemisEngineeringPresetManager.csprojResolveAssemblyReference.cache