Merge branch 'master' into 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
INTEG-370 [Unified Search] Cannot search with text containing dot character
Reason: DOT character will be ingnored by indexer
Solution:
- Talk to indexer which will separater all spacial characters
- Replace all special characters to blank character.
INTEG-370 [Unified Search] Cannot search with text containing dot character
Reason: DOT character will be ingnored by indexer
Solution:
- Talk to indexer which will separater all spacial characters
- Replace all special characters to blank character.
INTEG-370 [Unified Search] Update regex string
INTEG-370 [Unified Search] Update regex string
INTEG-374 Fix the usage of OrganizationService
Merge branch 'feature/stabilization'
Use maven-parent-pom 14
SWF-3078: Let's start 4.2.x developments
INTEG-376 CLONE - [Unified search] Cannot search Event/Task with special characters
Revert "INTEG-374 Fix the usage of OrganizationService"

This reverts commit f79475313b9c875ff0a89a844dbae6122bd107ee.
Merge branch 'develop' into feature/skin-module

Conflicts:
	integ-calendar/integ-calendar-social/pom.xml
	integ-calendar/pom.xml
	integ-ecms/integ-ecms-social/pom.xml
	integ-ecms/pom.xml
	integ-forum/integ-forum-social/pom.xml
	integ-forum/pom.xml
	integ-gatein/pom.xml
	integ-search-portlet/pom.xml
	integ-search-service/pom.xml
	integ-social/integ-social-ecms/pom.xml
	integ-social/pom.xml
	integ-wiki/integ-wiki-social/pom.xml
	integ-wiki/pom.xml
	pom.xml