Fixed bug where wifi was being disabled twice. Added function to disable bluetooth.
Merge branch 'master' of https://github.com/MichaelLeith/Android-Wireless