WIKI-125 Navigate Link Move a page across spaces
WIKI-219: Upgrade to next SNAPSHOT version of CF modules
Merge branch 'master' into feature/across-space

Conflicts:
	pom.xml
	wiki-service/src/main/java/org/exoplatform/wiki/service/WikiService.java
	wiki-service/src/main/java/org/exoplatform/wiki/service/impl/WikiRestServiceImpl.java
	wiki-webapp/src/main/java/org/exoplatform/wiki/commons/Utils.java
	wiki-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet.properties
	wiki-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet_de.properties
	wiki-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet_en.properties
	wiki-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet_fr.properties
	wiki-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet_it.properties
	wiki-webapp/src/main/resources/locale/portlet/wiki/WikiPortlet_nl.properties
	wiki-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
	wiki-webapp/src/main/webapp/templates/wiki/webui/UIWikiBreadCrumb.gtmpl
Fix merge missing gatein-resources
Merge branch 'master' into feature/across-space
PLF-3971 : change WAR dependencies to use the pom
PLF-3971 : upgrade parent pom to 9-SNAPSHOT
Merge branch 'master' into feature/across-space
WIKI-125 Move component 'Space switcher' to common
WIKI-125 Change version to 4.0.0.Alpha1-across-spaces-SNAPSHOT
Revert "WIKI-125 Change version to 4.0.0.Alpha1-across-spaces-SNAPSHOT"

This reverts commit 0e9a7fdfb7d2cf0e893c1e4f2ca585db81c48733.
WIKI-125 Change version of common to 4.0.0.Alpha1-SNAPSHOT
WIKI-125 Move component 'Space switcher' to common
WIKI-125 Move component 'Space switcher' to common
WIKI-125 Move component 'Space switcher' to common
WIKI-215 Fix bug wrong resource bundle key
Merge branch 'master' into feature/across-space
WIKI-125 Create new rest service to use in WYSIWYG editor
Merge branch 'master' into feature/across-space

Conflicts:
	wiki-service/pom.xml
	wiki-webapp/src/main/java/org/exoplatform/wiki/webui/popup/UIWikiMovePageForm.java
	wiki-webapp/src/main/java/org/exoplatform/wiki/webui/popup/UIWikiSelectPageForm.java
WIKI-125 Fix the dependency groupId of portal webui