Fix some version problems

Merged David Sikter requested to merge fix-some-version-problems into develop

Fixes some version conflicts in the main requirements.txt

Edited by David Sikter

Merge request reports