Merge branch 'DDBNEXT-1029' into release/4.2
DDBNEXT-1031: HTTPS for Social Media Connections
Merge branch 'DDBNEXT-1031-hla-facebookhttps' into develop

Conflicts:
	web-app/js/SocialMediaManager.js