Merge branch 'master' into feature/stabilization
Crowdin injection w4 - Update Norwegian files on 20140121 and 20140122
Crowdin injection w6 - Update Russian files from 20140204 to 20140205
UI-2815: update anwsers icon
INTEG-283  Issues with Comment of content/file activity
Problem analysis: Changing value of constant MESSAGE from "message" to "MESSAGE" causes to unable get edit message activity.
Fix solution: Value "message" is used for ecms edit file activity, "MESSAGE" is specific for Social usage
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/stabilization
Merge branch 'master' into feature/stabilization
Merge remote-tracking branch 'origin/feature/stabilization'
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'
Fix the versions for projects after merging
Merge master into feature/weemo-addon branch