LPS-44954 Simplify logic
LPS-44954
LPS-44954 Should be warn? minor SF
LPS-44954 SF
LPS-43419 AMS just wasn't set up to use the new code
LPS-43419 Source formatting
LPS-44689 Make it more generic
SOS-2090 Announcements won't be displayed immediately after publishing
SOS-2090 SF
SOS-2090 SF
For proxy-vole.jar
LRDCOM-8565: Update labs status
add de, pt_BR and zh_CN translations
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