manifest update (with internet/wifi/gps_locator)
Merge remote-tracking branch 'origin/master'