Update version
Merge branch 'master' into v0.2

Conflicts:
	manifest.json