WIKI-282 Prepare the function search in wiki for unified search
WIKI-282 Use wiki search method in unified search function
WIKI-282 Unified Search connector implementation
COMMONS-190:  change all versions in all projects to use : 4.0.0.Alpha1-unified-search-SNAPSHOT
COMMONS-190 - maven versions change
WIKI-282 Change the using constructor of SearchResult
WIKI-282 Fix bug wrong url in sandbox
WIKI-282 Fix bug wrong url in sandbox
WIKI-282 Fix bug search in wiki content
WIKI-282 Increate the performance for wiki search
WIKI-282 Add a icon for wiki search result
WIKI-282 Fix bug exception when searching in spaces
WIKI-282 Modify to use the excerpt of jcr
Merge remote-tracking branch 'origin/master' into feature/unified-search
Merge branch 'master' into feature/unified-search
Merge branch 'master' into feature/unified-search
Merge branch 'master' into feature/unified-search
Merge branch 'master' into feature/unified-search

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-webapp/pom.xml
COMMONS-190: merge master into feature branch
Merge unified search on master