created basic character changing based on killing character
Merge branch 'master' into charchange
fixed bug, expanded transitions, added better error checking
Fixed NullPointerException when equipping items

Fixed bug where items without locations (food or potions) threw a
NullPointerException when being equipped. Fixed client so that multi-word
commands can be used.
changed lock-and-pick to lock and pick
beginning of conversation support
added conversation framework
added conversation display
finished conversation framework
adjusted build.xml to add run-no-tests option to create a workaround for #167
Merge remote-tracking branch 'upstream/master' into conversations
Merge branch 'paddatrapper-conversations'
you can now attack npcs
Merge branch 'master' into charchange

Conflicts:
	src/main/java/com/jadventure/game/entities/NPC.java
	src/main/java/com/jadventure/game/menus/BattleMenu.java
fleshed out conversations for npcs and fixed some bugs
disabled stdout warnings so they don't mess with the player's ingame experience
fix for monster naming bug
Merge pull request #187 from projectdelphai/charchange

Basis for changing characters based on actions.
loading now uses previous location
saves npcs to locations.json