Changes in gui
Merge branch 'master' of https://github.com/iwob/BlueAndGray

Conflicts:
	src/blueandgray/logic/concrete/BlueAndGrayRules.java