merge develop

Conflicts:
	.gitignore
	package.json
	preinstall.sh