Comment work
Merge branch 'djere_branch'
Comments controller and tickets controller conflict fix