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

Updates