Merge branch 'master' into feature/across-space

Conflicts:
	component/webui/src/main/java/org/exoplatform/social/webui/space/access/SpaceAccessApplicationLifecycle.java
	webapp/juzu-portlet/pom.xml
	webapp/juzu-portlet/src/main/java/org/exoplatform/social/portlet/sample/package-info.java
	webapp/juzu-portlet/src/main/webapp/WEB-INF/portlet.xml
	webapp/juzu-portlet/src/main/webapp/WEB-INF/spring.xml
	webapp/juzu-portlet/src/main/webapp/WEB-INF/web.xml
Merge branch 'feature/across-space' of github.com:exodev/social into feature/across-space