fix manifest
Merge branch 'master' into styles

Conflicts:
	UnpackedFiles.zip