Merge commit 'ee1bb1fc9695b131beb15c3c24705cea4e8094cd' into develop

Conflicts:
	culturefeed_social/theme/culturefeed-social-page-activity-summary.tpl.php