PLF-5236 :"Who Is Online" portlet took a lot of time when user login
INTEG-194 | Some Unit Testcases failed by component configuration wrong.
Merge remote-tracking branch 'origin/master' into feature/generic-user-popup
Merge remote-tracking branch 'origin/master' into feature/generic-user-popup
Merge branch 'master' of github.com:exodev/integration into feature/generic-user-popup
Merge branch 'master' into feature/generic-user-popup
Merge remote-tracking branch 'origin/master' into feature/generic-user-popup
Merge branch 'master' into feature/generic-user-popup
Merge remote-tracking branch 'origin/master' into feature/generic-user-popup
Crowdin injections w38 (from 20130915 to 20130922)
de injection on 20130927-050715
Merge remote-tracking branch 'origin/feature/generic-user-popup'
Merge feature/generic-user-popup into master: Revert pom's version
Merge feature/generic-user-popup into master: Revert pom's version
INTEG-216: [integ-forum] i18n for the message of number of replies in Topic Activity

Fix description:
* Define new keys for that message depending on the number value
* Use these keys to get the appropriate localized message

Conflicts:

	integ-forum/integ-forum-social/src/main/java/org/exoplatform/forum/ext/impl/ForumUIActivity.java
	integ-forum/integ-forum-social/src/main/resources/locale/forum/integration/integration_en.properties
Merge branch 'feature/stabilization'
Merge branch 'master' into feature/ckeditor-upgrade