Getting ready for NPC merge
Merge remote-tracking branch 'origin/npc-dev' into aside
Merge remote-tracking branch 'origin/npc-dev' into aside
Merge branch 'aside'
Merge remote-tracking branch 'origin/npc-dev' into aside
updated jar file