July 16 2014 14:55:45 (MQ2-20140716)
Merge branch 'MQ2-Baseline'

Resolved Conflicts:
	MQ2Main/DataTypeList.h
	MQ2Main/ISXEQ/ISXEQDataTypes.cpp
	MQ2Main/ISXEQ/ISXEQTopLevelObjects.h
	MQ2Main/MQ2Data.cpp
	MQ2Main/MQ2DataTypes.cpp
	MQ2Main/MQ2DataTypes.h