Spec Fix
Merge branch 'sprint6' of github.com:StrataLabs/service_desk into sprint6