* upgrade libs, gradle
Merge remote-tracking branch 'origin/master'

Conflicts:
	Server/src/main/java/de/rallye/admin/AdminWebsocketApp.java
	Server/src/main/java/de/rallye/config/RallyeConfig.java
	Server/src/main/java/de/rallye/mapper/GroupPositionsSerializer.java
	Server/src/main/java/de/rallye/model/structures/GameState.java
	Server/src/main/java/de/rallye/model/structures/RallyeGameState.java
	Server/src/main/java/de/rallye/push/PushWebsocketApp.java
	Server/src/test/java/de/rallye/test/GroupsTest.java
	Server/src/test/java/de/rallye/test/db/MockDataAdapter.java
* upgrade libs, gradle