Nightly changes
Bla
Merge branch 'master' of
https://github.com/Mowalle/MurderDeskRepository.git

Conflicts:
	murder-desk/src/net/goupfive/murderdesk/model/Door.java
	murder-desk/src/net/goupfive/murderdesk/model/Player.java
	murder-desk/src/net/goupfive/murderdesk/model/Room.java
	murder-desk/src/net/goupfive/murderdesk/model/Trap.java
	murder-desk/src/net/goupfive/murderdesk/model/TrapdoorTrap.java
	murder-desk/src/net/goupfive/murderdesk/model/World.java
	murder-desk/src/net/groupfive/murderdesk/controller/PlayerController.java
	murder-desk/src/net/groupfive/murderdesk/controller/RoomController.java
	murder-desk/src/net/groupfive/murderdesk/view/WorldRenderer.java