Use a custom version (4.1.x-forum-social-notifications-SNAPSHOT) to deploy binaries from Jenkins in Nexus + update social/wiki versions to use
SWF-2581 : update commons dependency version for the FB feature/social-notifications
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/social-notifications
FORUM-685 | [Feature][Stabilization] Update CF version
FORUM-654 | Update version of kernel | core | jcr | ws to be compliant with gatein 3.7.x
SWF-2747 : Create upgrade-gatein-3.7.x branch and update projects versions
FORUM-654 : Update version of kernel | core | jcr | ws to be compliant with gatein 3.7.x (((
* Upgrade to use the gatin OSS version : 3.7.0.Alpha02-SNAPSHOT
)))
Merge branch 'master' into feature/social-notifications
Merge remote-tracking branch 'origin/master' into feature/upgrade-gatein-3.7.x-temp

Conflicts:
	answer/service/pom.xml
	answer/webapp/pom.xml
	application/common/pom.xml
	component/bbcode/src/test/resources/conf/standalone/exo.bbcode.test.jcr-configuration.xml
	component/statistics/src/main/java/org/exoplatform/forum/statistics/JCRAPIAspectConfig.java
	extension/webapp/pom.xml
	forum/service/pom.xml
	forum/service/src/test/java/org/exoplatform/forum/search/DiscussionSearchConnectorTestCase.java
	forum/service/src/test/resources/conf/standalone/exo.forum.component.test.jcr-configuration.xml
	forum/service/src/test/resources/conf/standalone/exo.forum.component.test.jcr-repository-configuration.xml
	forumResources/pom.xml
	gadgets/pom.xml
	poll/webapp/pom.xml
	pom.xml
Merge Master in FB
Merge branch 'master' into feature/social-notifications
Merge branch 'master' into feature/upgrade-gatein-3.7.x