Merge branch 'refs/heads/master' into dev-blackboard-import
Merge branch 'refs/heads/master' into dev-faculty-journal
Merge branch 'refs/heads/master' into dev-javascript
Merge branch 'refs/heads/master' into dev-resources-menu
Merge branch 'refs/heads/dev-canvas-api'
Merge branch 'refs/heads/dev-support' into dev-grading-analytics
Restructured dev-grading-analytics

Restructured to use the new dev-support branch and more reliable includes and HREF paths (which feel a little hack-y).

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-support' into dev-grading-analytics
Link to Known Issues

There are some, just not yet documented...

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Restructure dev-blackboard-import

Restructured Blackboard Import to reflect new structure of dev-support.

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

Restructure Calendar <—> ICS to reflect updated dev-support structure.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-support' into dev-faculty-journal
Restructure dev-faculty-journal

Restructured to Faculty Journal to reflect updated dev-support branch.

Signed-off-by: Seth Battis <SethBattis@stmarksschool.org>
Merge branch 'refs/heads/dev-support' into dev-javascript
Merge branch 'refs/heads/dev-support' into dev-resources-menu
Collect Files

Bring all dev-blackboard-import files into one directory.

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