Add comment view controller changes..
Merge remote-tracking branch 'origin/master'