Lavet activate user funktion
Merge branch 'master' of https://github.com/SDKR/Gruppe-XB-04-Server

Conflicts:
	src/GUILogic/Logic.java
	src/keyKeeper/KeyGetter.java
Merge branch 'master' of https://github.com/SDKR/Gruppe-XB-04-Server

Conflicts:
	src/DatabaseLogic/DatabaseConnection.java