begin 1.8 update
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/lenis0012/bukkit/npc/NPCFactory.java
	src/main/java/com/lenis0012/bukkit/npc/NPCNetworkManager.java
reformat