Merge branch 'refs/heads/master' into dev-faculty-journal
dev-faculty-journal End of Life

dev-faculty-journal has become its own repo: [smtech/smcanvas-faculty-journal](https://github.com/smtech/smcanvas-faculty-journal).

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