Ref #496. Fixed a few issues with the evaluations module. Firstly, made sure the organisation ID sticks around when editing questions of the rubric type (and that it doesn't change to the user's current organisation rather than staying at what the question was initially, for all question types), then also made the descriptors api call fail more gracefully if no descriptors exist- while adding in some defaults to the database as well, and finally, removed the requirement for a "request" to exist for evaluations with them enabled, unless it is explicitly required.
Install and upgrade SQL fixes preparing for the 1.6.0 release.
Merge branch 'develop' of github.com:EntradaProject/entrada-1x into develop
Moved James' 1629 into 1600 entrada.sql upgrade file.
Verified that the Entrada 1.6.0 fresh install resulted in the same database as an 1.5.1 to 1.6.0 upgrade.
Added loading indicator to course keyword search.
Removed "Range" column header from the clerkship preceptor pooled evaluations report.
A series of small random fixes and changes from our production environment.
Minor template variable name and string changes to e-mail messages.
Minor observership differences brought back from production.
Minor update to Syllabus generation class, observership reflection class, and draft CSV importer (removes require_once)
Minor updates to agent-feedback.inc.php
Adds some file name error handling to eportfolio API
Merged changes from Queen's local production versions where we fixed things or made updates that should have been applied to Entrada but weren't for whatever reason.
Fixed a bug with the recurring events functionality in which the Free-Text Objectives were not updated in recurring events despite being set to do so.
Merge branch 'develop' of https://github.com/EntradaProject/entrada-1x into develop

# By Ryan Warner (4) and Matt Simpson (2)
# Via Ryan Warner
* 'develop' of https://github.com/EntradaProject/entrada-1x:
  Adds some file name error handling to eportfolio API
  Minor updates to agent-feedback.inc.php
  Minor update to Syllabus generation class, observership reflection class, and draft CSV importer (removes require_once)
  Minor observership differences brought back from production.
  Minor template variable name and string changes to e-mail messages.
  A series of small random fixes and changes from our production environment.

Conflicts:
	www-root/api/calendar.api.php
	www-root/core/modules/admin/courses/reports/index.inc.php
	www-root/core/modules/admin/gradebook/view.inc.php
Fixed bug where checking and unchecking boxes for recurring events caused them to stay checked.

This is referring to the "Recurring Events" sidebar on the Event Details and Event Content pages. When adding a hidden input, the quotes on the id attribute were closed too soon, so instead of being named #update_event_description it would have been named #update_ and wouldn't be removed.
Fixed an issue with the course groups in which users from all organisations were fetched by the queries, regardless of what organisation the course was affiliated with- or what organisations the user making changes had permissions to access.
Merge branch 'develop' of https://github.com/EntradaProject/entrada-1x into develop

# By Robert Fotino
# Via Robert Fotino
* 'develop' of https://github.com/EntradaProject/entrada-1x:
  Fixed bug where checking and unchecking boxes for recurring events caused them to stay checked.
Added missing encounter complexity select box options for the situations where only one student is being evaluated on the patient encounter evaluation type.