Fixed comment helper function
Updated comments controller
Fixed comment form
Merge branch 'working'