integrated: Click selected to deselect, ok/cancel buttons, change returned contests when there is no focus area associated with section
Merge branch 'integratedProposals2' of https://github.com/CCI-MIT/XCoLab into integratedProposals2