Includes

Tweaking includes to match improvements in dev-calendar-ics.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-calendar-ics' into dev-blackboard-import
Merge branch 'refs/heads/master' into dev-archive-discussions
Merge branch 'refs/heads/master' into dev-blackboard-import
Merge branch 'refs/heads/master' into dev-archive-discussions

Bringing up-to-date.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/master' into dev-blackboard-import

Bringing up-to-date.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
RequirEments

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/master' into dev-archive-discussions
Merge branch 'refs/heads/master' into dev-blackboard-import

Signed-off-by: Seth Battis <seth@battis.net>
Merge branch 'refs/heads/dev-canvas-api' into dev-calendar-ics

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>

Conflicts:
	www/api/canvas-api.inc.php
Typos!

Somehow I inserted an S into a function name as I committed (I envision a command-S, without the S moment).

Also: now catching exceptions in sync (which should be trivial, had been ignored, but were how I discovered the typo).
Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-calendar-ics'
Merge branch 'refs/heads/dev-blackboard-import'
Merge branch 'refs/heads/dev-archive-discussions'

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>

Conflicts:
	README.md