Remove NPE in ApWifiManager
NPE in AdHocWifiManager
Merge branch 'master' of https://github.com/jritter/VoterApp.git
Merge branch 'master' into CGS97