Merge branch 'master' into feature/across-space
WIKI-311 Check behaviors when long space name in Page Layout
Merge branch 'master' into feature/across-space
Merge branch 'master' into feature/across-space

Conflicts:
	wiki-service/src/main/java/org/exoplatform/wiki/service/impl/WikiServiceImpl.java
WIKI-125 WIKI-335 Space names displayed in location labels should be user friendly and not technical
WIKI-125 WIKI-333 Search should not take into account spaces at the end of a text inputted
WIKI-123 WIKI-332 Check changes in Page info layout
Merge branch 'feature/across-space' into feature/navigation