added return (rtn) parameter to candidate and resolution, and adjusted ballot_item_form
Merging Dave's work on master into my work on branch ues, so I can keep up.
note for later
update block display code to use ues semesters