Merge branch 'develop'

Conflicts:
	package.json