Remove redundant wpa_supplicant.conf
Blob updates from MJ7
Merge pull request #328 from arco/cm-10.2

Updates
Merge branch 'cm-10.2' of git://github.com/TheMuppets/proprietary_vendor_samsung into cm-10.2