Fixes supervisors from here fiasco
Merge branch 'development' of https://github.com/yousraHazem/Topsoft-14 into development