organized
Merge commit '8e96'

Conflicts:
	manifest.json
	source/manifest.json
	source/manifest.json~HEAD