no message
Merge branch 'master' of https://github.com/redlinx/ems

Conflicts:
	application/views/ballot/ballot_form.php
	database/model/election.mwb
	database/model/election.mwb.bak