Another merge conflict (+1 squashed commit)
Squashed commits:
[91b1cf8] Fix in which setting the date by dragging onto the calendar resulted in an error.  This was because the reduced_scoring_date was not set correctly.
Merge branch 'ww3-feature/calendar' of https://github.com/pstaabp/webwork2 into ww3-feature/calendar

* 'ww3-feature/calendar' of https://github.com/pstaabp/webwork2:
  Another merge conflict
  Fix in which setting the date by dragging onto the calendar resulted in an error.  This was because the reduced_scoring_date was not set correctly.
  Fix in which setting the date by dragging onto the calendar resulted in an error.  This was because the reduced_scoring_date was not set correctly.