Some stuff
Merge branch 'master' of https://github.com/Mine15029/Ender-MageEssentials

Conflicts:
	src/net/endermage/EnderEssentials/commands/EnderCommandTest.java