Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
GUI messages
Merge branch 'master' of https://github.com/IngoReimund/tk3

Conflicts:
	tk3.labyrinth.gui/src/tk3/labyrinth/gui/Main.java
Merge pull request #8 from pweisenburger/master

Merge