cleanup, localstorage update and .appcache
Merge branch 'master' into gh-pages