servergui
...
Merge branch 'mbaeuml' of https://github.com/kkalicki/panelizer.git into
mbaeuml

Conflicts:
	src/hilfsklassen/NetzwerkConfig.java