Merge branch 'development' into 'master'

Development

See merge request warricksothr/Atheneum!3

.gitlab-ci.yml

@@ -18,11 +18,10 @@ Atheneum:Pages:
   stage: pages
   script:
   - python3 -m pip install pipenv
-  - pipenv install --dev
-  - pipenv shell
-  - cd server/documentation
-  - apt --no-cache install make
-  - make html
+  - cd server
+  - pipenv install --dev --system
+  - cd documentation
+  - sphinx-build -M html "." "_build"
   - mv _build/html/ ../../public/
   artifacts:
     paths: