touch appcache
updated manifest
Merge branch 'master' into gh-pages

Conflicts:
	application.appcache