SOS-2156 Remove leave site button in sites directory when member is associated via user group/organization
SOS-2156 Remove join site button when member is associated via user group/organization
SOS-2156 Source formatting
SOS-2156 Fix compilation error
SOS-2156 Adjust UI display

Conflicts:
	portlets/so-portlet/docroot/WEB-INF/src/content/Language.properties
	portlets/so-portlet/docroot/sites/view_sites.jsp
SOS-2156 Add organization member check
SOS-2156 Lang keys