Merge remote-tracking branch 'origin/master' into feature/stabilization
Crowdin injection w7 (from 20140206 to 20140211)
INTEG-282 When editing a webcontent, comments lines are divided into different activity comments

Fix description: Add only 1 comment when editing the node.

Conflicts:

	integ-ecms/integ-ecms-social/src/main/java/org/exoplatform/wcm/ext/component/activity/listener/Utils.java
Merge branch 'feature/stabilization'