Merge branch 'master' into feature/stabilization
FORUM-884 | [IE]Show <p> tag in comments content when add comment in Activity stream
Merge branch 'feature/stabilization'
PLF-6082 Upgrade version of maven-parent-pom to 14-SNAPSHOT
FORUM-1008 | Answers of a question is shown incorrectly on Activity Stream
Merge branch 'master' into feature/skin-module

Conflicts:
	pom.xml