ticket:45 hot fix
Merge branch 'master' into t45_fix_update_event
ticket:45 correct SERVER_URL (should be staging in master branch)