Mappings
Merge branch 'master' of http://github.com/avarisc/Mythic

Conflicts:
	src/main/java/com/mythicmc/mythic/utils/CompositeHelper.java
	src/main/java/com/mythicmc/mythic/utils/ServerComposite.java