Merge branch 'cts-dev'
Merge branch 'master' of https://github.com/CopticScriptorium/site