WIKI-125 Change the url of social rest service
Merge remote-tracking branch 'origin/master' into feature/across-space

Conflicts:
	commons-webui-resources/src/main/webapp/WEB-INF/gatein-resources.xml
WIKI-125 Fix the js to adapt with gatein 3.5.0
Merge branch 'feature/space-switcher' into feature/navigation

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