0.0.2
Merge branch 'develop'

Conflicts:
	package.json
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'