application details and proc
Merge remote-tracking branch 'origin/master'

Conflicts:
	Merit.Traveller.BMS/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Merit.Traveller.v12.suo