Oprydning SwitchMethods
Merge branch 'master' of https://github.com/Nihabr/xb07Server

Conflicts:
	src/databaseMethods/SwitchMethods.java