Merge branch 'master' of github.com:StrataLabs/service_desk into usage1