#561 add editor refresh
Merge branch 'staging'