Merge 1

Conflicts:
	Lab/SR_Game/src/edu/game/client/gui/ClientGUI.java