Fix bad link
Merge branch 'master' into gh-pages

Conflicts:
	cache.appcache