try new wifi/gps fix
Merge branch 'jb-mr1' of github.com:airfluip1/android_device_samsung_galaxys4gmtd into jb-mr1