add update via web-ui
Merge branch 'master' into testing