Merge branch 'master' of https://github.com/ioBroker/ioBroker.javascript

Conflicts:
	io-package.json