cleanup
cleanup

Conflicts:
	manifest.json