Fixed typo
Added generated dist files
Merge branch 'develop'

Conflicts:
	README.md
	package.json