Updated ballot form
Merge branch 'master' of https://github.com/redlinx/ems

Conflicts:
	application/views/includes/left_nav.php