Merge branch 'master' into feature/space-switcher

Conflicts:
	commons-webui-resources/src/main/webapp/WEB-INF/gatein-resources.xml
WIKI-125 fix merge
WIKI-125 Fix bug size of space-switcher component
Merge branch 'feature/space-switcher' into feature/navigation

Conflicts:
	commons-webui-resources/src/main/webapp/WEB-INF/gatein-resources.xml