Armory drag and drop bugfix
fixed merge conflict

Conflicts:
	MeteorDefense/src/com/esnefedroetem/meteordefense/WeaponFactory.java