Third wave of code clean: comment only appear inside detailview
Merge remote-tracking branch 'origin/master'