Fix Room crash; allow placing Item in room
Merge branch 'master' of https://github.com/nsgomez/txtmagicka

Conflicts:
	Player.java