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

Conflicts:
	README.md
Merge branch 'master' of https://github.com/ioBroker/ioBroker

Conflicts:
	README.md
Merge pull request #5 from hobbyquaker/master

...