Merge remote branch 'origin/release' into qa
Merge remote branch 'origin/develop' into qa
Correcting changelog
Removing defunct alternate report
Fixing bug when proxy form doesn't include proxy and 'same as proxy' is checked off
Adjustments to quota chart vis
Giving supervisors and coordinators access to the quota report
Updating quota report templates
Merge remote branch 'origin/release' into qa

Conflicts:
	sql/roles.sql
Restricting quota report by cohort for non-admins
Fixing bugs in bad implementation of contact_form::import()
Adding missing check for duplicate cohort-address in contact_form_entry_validate pull
Merge remote branch 'origin/qa' into develop