Streamline water bottle strings by @seelenapparat

Water bottles are sorted by the object model in the gear now.

Remove old canteen configs since it is in under pet waterbottle now.

SQF/dayz_code/Configs/CfgMagazines/Items/Canteen.hpp

@@ -1,21 +0,0 @@
-class ItemCanteenEmpty : CA_Magazine
-{
-	scope = public;
-	count = 1;
-	type = WeaponSlotItem;
-	
-	model = "\dayz_equip\models\waterbottle_gear.p3d";
-	picture = "\dayz_equip\textures\equip_waterbottle_empty_ca.paa";
-	displayName = $STR_ITEM_CANTEEN_EMPTY_NAME;
-	descriptionShort = $STR_ITEM_CANTEEN_DESC;
-	
-	//TODO
-	/*class ItemActions
-	{
-		class Fill
-		{
-			text = $STR_ACTIONS_FILL_W;
-			script = "spawn player_fillWater;";
-		};
-	};*/
-};

SQF/dayz_code/Configs/CfgMagazines/Items/Items.hpp

@@ -23,5 +23,4 @@
 #include "equip_brick.hpp"
 #include "equip_lever.hpp"
 #include "WaterBottle.hpp"
-//#include "Canteen.hpp"
 #include "Explosives.hpp"