Merge branch 'fhirt_development' of https://github.com/fhirt/dungeon_escape

Conflicts:
	dungeon_escape/baseroom.pyc
	dungeon_escape/engine.pyc
	dungeon_escape/gameobject.pyc
	dungeon_escape/item.pyc
	dungeon_escape/lexicon.pyc
	dungeon_escape/parser.pyc
	dungeon_escape/player.pyc
Merge branch 'master' of https://github.com/fhirt/dungeon_escape
Merge branch 'master' of https://github.com/fhirt/dungeon_escape into fhirt_development