Rename Expansion folder
Merge tag 'RenameExpansionFolder' into RED_Combat
Civilization 5 CvGameCoreSource 1.0.3.18
Merge branch 'master' into RED_Combat

Conflicts:
	CvGameCoreDLL/CvDllContext.cpp
	CvGameCoreDLL_Expansion1/CvDllContext.cpp