merged and corrected repo
fixed securitymanager problems after model-update