Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/com/cr/resource/image/frame.psd
	bin/com/cr/resource/image/knife.png
	src/com/cr/combat/attack/OneHandAttack.java
	src/com/cr/crafting/material/essences/StrangePowder.java
	src/com/cr/crafting/material/minerals/Quartz.java
	src/com/cr/crafting/pattern/HelmPattern.java
	src/com/cr/crafting/pattern/KnifePattern.java
	src/com/cr/entity/Mob.java
	src/com/cr/entity/hero/Hero.java
	src/com/cr/entity/hero/StatsSheet.java
	src/com/cr/entity/hero/inventory/Button.java
	src/com/cr/entity/hero/inventory/Inventory.java
	src/com/cr/entity/hero/materials/BaseSlot.java
	src/com/cr/entity/hero/materials/EssenceSlot.java
	src/com/cr/entity/hero/materials/MaterialSlot.java
	src/com/cr/entity/hero/materials/Materials.java
	src/com/cr/entity/hero/materials/MineralSlot.java
	src/com/cr/game/EntityManager.java
	src/com/cr/item/Item.java
	src/com/cr/item/armor/head/CopperHelm.java
	src/com/cr/item/stats/AffectTargetOnHit.java
	src/com/cr/item/stats/AffectsDamageTaken.java
	src/com/cr/item/stats/basic/Armor.java
	src/com/cr/item/stats/basic/Damage.java
	src/com/cr/item/stats/basic/FlatDamage.java
	src/com/cr/item/stats/basic/Haste.java
	src/com/cr/item/stats/regen/LifeOnHit.java
	src/com/cr/item/stats/regen/LifeRegain.java
	src/com/cr/item/weapon/CopperKnife.java
	src/com/cr/item/weapon/Hammer.java
	src/com/cr/item/weapon/Weapon.java
	src/com/cr/resource/ImageLoader.java
	src/com/cr/resource/image/frame.psd
	src/com/cr/resource/image/knife.png
	src/com/cr/resource/image/knifeicon.png
	src/com/cr/states/CraftingState.java