Update shopping activities, player, equipment...
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/longdungeon/item/Potion.java