readded the blacksmith as an activenpc
improve category selection border
removed torch, visually tweaked shopping gamestate, changed prices of materials
Merge branch 'master' into blacksmith_active_npc

Conflicts:
	src/level.lua
switch jump back to attack
Merge pull request #1030 from NimbusBP1729/blacksmith_active_npc

readded the blacksmith as an activenpc