Committing interim version of War3Source_Engine_Config
KvMergeSubkeys needs to be fixed
Merge branch 'War3Source-2' of github.com:War3Source/War3Source into War3Source-2

Conflicts:
	addons/sourcemod/scripting/War3Source_Engine_Config.sp
Merge branch 'War3Source-2' of github.com:War3Source/War3Source into War3Source-2