#123 fixed zombie instance
Merge branch 'feature/123-password-switcher-dialog' into dev

Conflicts:
	src/main/java/de/cismet/cids/custom/utils/PasswordSwitcherAdminDialog.java