npcs now attack you if they're your enemy based on ATTACK action
changed location to ArrayList<NPC>, fixes #183
fixed something silly
fixed compile error in location class
fixed compile error with DeathException
renamed food-liquid to potions and enabled npcs to have items
finished first part of trading: buying from npc
finished trading, buying and selling with npcs
fixed potions so that there can be potions that just restore stats
merged buy,sell,trade into just trade and removed debugging output
Fixed not being able to sell all items and proper gold exchanges are calculated correctly now
added char type conversation condition
removed debugging code
changed profiles to also hold character type levels as well
Merge branch 'trading'
fixed #193 and fixed drinking potions, adds conversation component to npc
added random items in locations
fixed bug picking up public items
re-added test
#167 Fixes storing of Items (now in alphabetic order)

Conflicts:
	src/main/java/com/jadventure/game/navigation/Location.java