Merge branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git

Conflicts:
	hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java