Updated npc code
Merge remote-tracking branch 'origin/master'

Conflicts:

	src/main/java/com/dynisdev/bukkit/venturecraft/components/entities/humans/BasicNPC.java