add cancel button for comment
Merge branch 'master' into story_598