Armor now works
Change px to dp.
Merge remote-tracking branch 'origin/armor_implementation'

Conflicts:
	src/com/dit599/customPD/editorUI/EnchantableItemAdapter.java