Replaced WarUtility with AbstractArmoryItem and added implementation
Added AbstractDefenseArmoryItem, AbstractEffectArmoryItem and AbstractProjectileArmoryItem all with implementation of method act()
Added class Upgrade with implementation
Added ArrayLists of AbstractArmoryItem to ArmoryScreen
Fixed MergeConflict

Conflicts:

	MeteorDefense/src/com/esnefedroetem/meteordefense/screen/ArmoryScreen.java