added some divs
Merge branch 'davington' into dev
Merge branch 'jpeak5' into dev
Merge branch 'jpeak5' into dev
Feature to allow voting only by a per-election configurable list of users. https://trello.com/c/Bm8ngwZl