Merge branch 'master' of https://github.com/ReikaKalseki/DragonAPI

Conflicts:
	Libraries/ReikaEntityHelper.java
Merge branch 'master' of https://github.com/ReikaKalseki/DragonAPI