make manifest path, relative to the manifest location
Merge branch 'master' into gh-pages

Conflicts:
	manifest.webapp
Merge branch 'master' into gh-pages