Merge branch 'dev-0.4.5'

Conflicts:
	manifest.json
	scripts/interface.js