add update functionality from sdum
Merge branch 'security-integration' into mobility-context