#1229 added updates to ballots module
Merge branch 'bixly-testing' of https://github.com/tendenci/tendenci into bixly-testing