wifi discovery
additional wifi
more wifi
more wifi
Merge branch 'master' into gbellz