Merge origin/master

Conflicts:
	delete verteiltesFilesystem_origin/src/network/CheckWhoIsOnline_old.java