changed icons for export and stop vote, changed bottom bar buttons to single line
Remove NPE in ApWifiManager
merge from master
NPE in AdHocWifiManager
Merge branch 'master' of https://github.com/jritter/VoterApp.git
Merge branch 'master' into hkrs12
XML modification