Daily update
Merge remote-tracking branch 'origin/Patrick-Branch' into
RuleModel-Branch

Conflicts:
	Blockadia/bin/framework/GameSidePanel.class
	Blockadia/src/framework/GameSidePanel.java