Merge pull request #187 from xifeiwu/master

networkDiscovery+xifei: add test_device.js->jimmie
Merge pull request #189 from xifeiwu/master

fix feedback for device discovery -> Jimmie
Merge pull request #211 from xifeiwu/master

add more info in devicecallback ->wangfeng