Merge branch 'master' of github.com:IbpTeam/demo-rio into internetdiscoverywangfeng
Merge branch 'InternetDiscovery#8' of github.com:IbpTeam/demo-rio into internetdiscoverywangfeng
internetdiscovery_wangfeng:New API getDeviceDiscoveryService and add module socket.io
Delete nouse code
Merge pull request #16 from v11985/internetdiscoverywangfeng

Internetdiscoverywangfeng->yuanzhe