Correct IDEA Project structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/common/tarun1998/thirstmod/reflection/ItemMilkMod.java
	src/main/java/common/tarun1998/thirstmod/reflection/ItemPotionMod.java
	src/main/java/common/tarun1998/thirstmod/reflection/ItemSoupMod.java
	src/main/resources/content/HungerDrinks/Beef Stew.txt
	src/main/resources/content/HungerDrinks/Bottled Mushroom Stew.txt
	src/main/resources/content/HungerDrinks/Bottled RedMushroom Stew.txt
	src/main/resources/content/HungerDrinks/Chicken Broth.txt
	src/main/resources/content/HungerDrinks/Protein Mix.txt
	src/main/resources/content/HungerDrinks/Sweet Water.txt
	src/main/resources/content/HungerDrinks/icons.png
	src/main/resources/content/MoDrinks/Apple Juice.txt
	src/main/resources/content/MoDrinks/Cactus Water.txt
	src/main/resources/content/MoDrinks/Diamond Drink.txt
	src/main/resources/content/MoDrinks/Glistering Melon Juice.txt
	src/main/resources/content/MoDrinks/Golden Apple Juice.txt
	src/main/resources/content/MoDrinks/Melonade Juice.txt
	src/main/resources/content/MoDrinks/Pumpkin Juice.txt
	src/main/resources/content/MoDrinks/Tea.txt
	src/main/resources/content/MoDrinks/moDrinks.png
	src/main/resources/content/NetherSurvival/Magma Drink.txt
	src/main/resources/content/NetherSurvival/Nether-Wart Drink.txt
	src/main/resources/content/NetherSurvival/icons.png
	src/main/resources/mods/ThirstMod/Config.txt
	src/main/resources/mods/ThirstMod/mcmod.info
	src/main/resources/mods/ThirstMod/tarun1998/thirstmod/textures/drinksBrewer.png
	src/main/resources/mods/ThirstMod/tarun1998/thirstmod/textures/icons.png
	src/main/resources/mods/ThirstMod/tarun1998/thirstmod/textures/thirstBar.png
	src/main/resources/mods/ThirstMod/tarun1998/thirstmod/textures/waterCollector.png