Merge pull request #1 from IbpTeam/master

update from lbpTeam
Merge pull request #2 from woqidaideshi/master

Merge pull request #1 from IbpTeam/master
Revert "Merge pull request #1 from IbpTeam/master"
Merge pull request #3 from IbpTeam/revert-2-master

Revert "Merge pull request #1 from IbpTeam/master"
InternetDiscovery#8-yuanzhe: add node_modules mdns
Merge pull request #11 from huyuanzhe/InterDiscovery#8-yuanzhe

InternetDiscovery#8-yuanzhe -> wangfeng
Merge pull request #12 from v11985/internetdiscoverywangfeng

InternetDiscovery#8_wangfeng ->yuanzhe
Merge pull request #13 from v11985/internetdiscoverywangfeng

IbpTeam:InternetDiscovery#8_wangfeng->wangyu
Merge branch 'master' of github.com:IbpTeam/demo-rio into internetdiscoverywangfeng
InternetDiscovery#8+yuanzhe:modify modules mdns
rm mdns/*
add mdns necessary file
Merge branch 'temp' into InterDiscovery#8-yuanzhe
InterDiscovery#8+yuanzhe:add necessary file to mdns modules
InterDiscovery#8+yuanzhe:modify mdns module
Merge pull request #15 from huyuanzhe/InterDiscovery#8-yuanzhe

Inter discovery#8 yuanzhe->wangfeng
Merge branch 'InternetDiscovery#8' of github.com:IbpTeam/demo-rio into internetdiscoverywangfeng
internetdiscovery_wangfeng:New API getDeviceDiscoveryService and add module socket.io