Merge pull request #79 from GermanBluefox/master

(Bluefox) upgrade adapter function
added websocket to sources.json
Merge branch 'master' of https://github.com/ioBroker/ioBroker.nodejs
fixed defaultObjs
fixed defaultObjs
Merge pull request #80 from hobbyquaker/master

fixed bug in defaultObjs
Merge remote-tracking branch 'remotes/upstream/master'
couchdb restart with upstart
inserted timeout on instance restart - prevent deletion of procs[id] after process is started
inserted timeout on instance restart - prevent deletion of procs[id] after process is started
trimFifo callback with trimmed elements
update version and readme
fixed trimFifo
Merge pull request #81 from hobbyquaker/master

0.0.17 - see changelog
Merge remote-tracking branch 'remotes/upstream/master'
(Bluefox) add update information to io-package.json