Remove .htaccess and appcache.
Merge branch 'master' into gh-pages
add .htaccess and cache.appcache.