NPE solving in ElectorateActivity under certain conditions (forward and
back in Network config)
NPE bug end
Merge branch 'master' of https://github.com/jritter/VoterApp.git
Merge branch 'master' of github.com:jritter/VoterApp
Merge branch 'master' into CGS97