Fixed item constraint.
Merge branch 'develop' of https://github.com/mrwinton/TheExcellentAdventure into develop

Conflicts:
	src/gameworld/rooms/GenericRoom2.java