fixed error SQLFastQuery ALTER TABLE war3source ADD COLUMN diamonds int DEFAULT '0' failed, Error: Duplicate column name 'diamonds'
diamonds column was checking the wrong table
Merge branch 'master-war3source-primary'
converted from tabs to spaces
Converted Tabs To Spaces

Conflicts:
	addons/sourcemod/scripting/W3SIncs/War3Source_Constants.inc
	addons/sourcemod/scripting/W3SIncs/War3Source_Interface.inc
	addons/sourcemod/scripting/W3SIncs/War3Source_Shopitems2.inc
	addons/sourcemod/scripting/War3Source_Engine_BuffSystem.sp
	addons/sourcemod/scripting/War3Source_Engine_CommandHook.sp
	addons/sourcemod/scripting/War3Source_Engine_DatabaseSaveXP.sp
	addons/sourcemod/scripting/War3Source_Engine_ItemClass2.sp
	addons/sourcemod/scripting/War3Source_Engine_ItemOwnership2.sp
	addons/sourcemod/scripting/War3Source_Engine_MenuItemsinfo2.sp
	addons/sourcemod/scripting/War3Source_Engine_MenuRacePlayerinfo.sp
	addons/sourcemod/scripting/War3Source_Engine_MenuShopmenu2.sp
	addons/sourcemod/scripting/War3Source_Engine_PlayerClass.sp
	addons/sourcemod/scripting/War3Source_ShopItems2.sp
Merge branch 'W3S-Dev-2.0'
Merge pull request #97 from War3Evo/master

Converted Tabs back to Spaces