PUSH
Merge branch 'develop' of https://github.com/Study-Master/Client into develop

Conflicts:

examinee/src/main/java/studymaster/examinee/ViewController/ExamView.java