Merge branch 'master' into feature/stabilization
WIKI-939 Wiki application is not stable on IE11
PLF-6082 Upgrade version of maven-parent-pom to 14-SNAPSHOT
WIKI-959 Escape illegal characters when searching
WIKI-486 Fill wiki page title and content correctly when navigating from Group wiki to Portal wiki
WIKI-957 Syntax error displays when moving wiki page with blank title
Reason: We allow space charactors when edit/add a wiki page.
Solution: Not allow title of wiki page only space charactors
I had been added a popup message when title of wiki page is empty after called trim function.
WIKI-969 Fix the usage of OrganizationService
Merge branch 'feature/stabilization'
Use maven-parent-pom 14
SWF-3078: Let's start 4.2.x developments
WIKI-959: CLONE - [Unified search] Cannot search Event/Task with special characters
Causes: We missing character "\" when escape in query
Solutin: I had been included "\" character when escape keyword
WIKI-973 Duplicated Comment shown when moving a wiki page

Solution: Remove 1 redundant call of WikiService.postUpdatePage() in UIWikiMovePageForm
Revert "WIKI-969 Fix the usage of OrganizationService"

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

Conflicts:
	pom.xml
	wiki-extension/pom.xml
	wiki-extension/wiki-extension-webapp/pom.xml
	wiki-injector/pom.xml
	wiki-macros/pom.xml
	wiki-macros/wiki-macros-iframe/pom.xml
	wiki-renderer/pom.xml
	wiki-service/pom.xml
	wiki-upgrade-plugins/pom.xml
	wiki-webapp/pom.xml
	wiki-webui/pom.xml