Merge origin/master

Conflicts:
	superAdventure/nbproject/project.properties
	superAdventure/src/byui/cit260/superAdventure/control/RoomObjectControl.java