SDPII-126 Email Template Changes
Merge branch 'master' of github.com:StrataLabs/service_desk