updated blacksmith
WIP: both lightnings appear but they are harmless
Merge branch 'cutscene' into cutscene_blacksmith
set up black smith room, uses tmx to choose object heights
Merge branch 'master' into cutscene_merge

Conflicts:
	src/controls.lua
	src/level.lua
	src/nodes/key.lua
	src/nodes/material.lua
	src/player.lua
Merge branch 'cutscene_merge' into cutscene

Conflicts:
	src/controls.lua
	src/level.lua
cleanup merge
fixed scene typo
added comments for proposed invocation
fixed blacksmith alignment
added new activenpc actions; removed weapon from blacksmith's
fixed profileaway, though it's unused
Merge branch 'shopping' into cutscene_blacksmith
removed comments, made shopping branch compatible with blacksmith
ignore npc/door interactions
WIP
WIP
prevents scenenpcs from affecting door collisions
partial cutscene complete for blacksmith
WIP: throw the torch