Merge branch 'develop'
fix a typo
fix app cache
Merge branch 'develop'
fix app cache
Merge branch 'master' into gh-pages