Travis Fix
Merge branches 'master' and 'master' of github.com:StrataLabs/service_desk
SDPII-193