Merge branch 'release-2.21.0' into develop
Building new 2.22
Bug @views/raw
Merge branch 'develop' of https://github.com/Leroy-Merlin-France/lm-labs into develop
formattage
add number of files into excel export for pagelist
bug like d'une actu
format
format
espace dediee pour l'ajout de fichiers dans forum et actus
bug : si block ou unblock droits a la page : pas de bouton de validation dans popup
bug : style hidden in page forum  on topic
change piwik url
url piwik
new logo LM
LMCDS-9 - Labs - Pouvoir imprimer des pages à partir des sites du labs 
& LMCDS-92 - LABS - Mise en forme des onglets
Correction encoding multiplateforme (bug à la compil sous windows)
LMCDS-37 - Labs - Lien me désabonner ko
Merge branch 'develop' of https://github.com/Leroy-Merlin-France/lm-labs into br-from-master-2.21.0

Conflicts:
	distribution/pom.xml
	lm-forums/lm-forums-core/pom.xml
	lm-forums/lm-forums-webapp/pom.xml
	lm-forums/pom.xml
	lm-labs-core/pom.xml
	lm-labs-gadgets/pom.xml
	lm-labs-marketplace-sdk/pom.xml
	lm-labs-marketplace/pom.xml
	lm-labs-theme-cosmo/lm-labs-theme-cosmo-marketplace/pom.xml
	lm-labs-theme-cosmo/lm-labs-theme-cosmo/pom.xml
	lm-labs-theme-cosmo/pom.xml
	lm-labs-theme-inspiritas/lm-labs-theme-inspiritas-marketplace/pom.xml
	lm-labs-theme-inspiritas/lm-labs-theme-inspiritas/pom.xml
	lm-labs-theme-inspiritas/pom.xml
	lm-labs-theme-shamrock/lm-labs-theme-shamrock/pom.xml
	lm-labs-theme-shamrock/pom.xml
	lm-labs-themes-pack2/lm-labs-themes-pack2-marketplace/pom.xml
	lm-labs-themes-pack2/lm-labs-themes-pack2/pom.xml
	lm-labs-themes-pack2/pom.xml
	lm-labs-themes/pom.xml
	lm-labs-web/pom.xml
	lm-labs-webapp/pom.xml
	lm-labs-widget-pageinfo/lm-labs-widget-pageinfo-marketplace/pom.xml
	lm-labs-widget-pageinfo/lm-labs-widget-pageinfo/pom.xml
	lm-labs-widget-pageinfo/pom.xml
	nuxeo-labs-theme/pom.xml
	pom.xml
	reloadServer.sh
Merge branch 'br-from-master-2.21.0' of https://github.com/Leroy-Merlin-France/lm-labs into br-from-master-2.21.0

Conflicts:
	lm-labs-webapp/src/main/java/com/leroymerlin/corp/fr/nuxeo/labs/site/webobjects/NotifiablePageResource.java
	lm-labs-webapp/src/main/resources/skin/resources/less/theme/labs-fixed.less
	pom.xml