fix refresh app
Merge branch 'master' into gh-pages