Update
update
Merge branch 'master' of https://github.com/Deery50/EasyMobArmory.git

Conflicts:
	EasyMobArmory/src/main/java/com/runetooncraft/plugins/EasyMobArmory/EMAListener.java