door changes
Merge branch 'feature/items' into feature/doors

Conflicts:
	Zorkey/Zorkey/Door.h