start GameServer
start GameServer
i++
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/ordonteam/hackzurich/mode/CreateGameSelectLayout.groovy
	app/src/main/java/com/ordonteam/hackzurich/mode/JoinGameSelectLayout.groovy
Megre