v0.2.1
Merge branch 'release/0.2.1'
Merge branch 'develop'
Merge origin/master into master
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge develop into master
Merge branch 'master' into develop

Conflicts:
	package.json