no message
Merge branch 'master' of https://github.com/Esri/social-media-map-template-js

Conflicts:
	SocialMedia/index.html
	SocialMedia/preview.html