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

Conflicts:
	setup.js
(Bluefox) merge request from hq
(Bluefox) create by default enums.rooms
Merge remote-tracking branch 'remotes/upstream/master'
(BLuefox) support of different repositories.
(Bluefox) move some objects definitions to io-package.json
Merge pull request #90 from GermanBluefox/master

(BLuefox) support of different repositories