SDPII-56/70 refactor tickets controller
fix conflict
fix merge conflict
Merge branch 'master' of github.com:StrataLabs/service_desk