Fixed Combination Errors - Added Button?
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/election.php