Removed .zedstate
0.2.1
Merge branch 'master' into develop

Conflicts:
	.gitignore
	HISTORY.md
	package.json