Merge branch 'develop'
Merge branch 'develop'
Implemented edit action for the TicketsController.
Merge branch 'master' into develop