TC-1090: updating notifications to add number of commentors, show the parent subject and separate the comment
Merge branch 'TC-1090' into dev

Conflicts:
	js/apps/thirdchannel/templates/hbs-compiled.js