SPDIII-91 conflicts removed
Merge branch 'master' of github.com:StrataLabs/service_desk