qMerge branch 'staging' of https://github.com/Make-Magazine/makercon
Revert "url update 02"

This reverts commit fc4c7ffcbf2d89f7e06bce24d24cafd0f65632f4.
url update 02
url update
short code update for video
url update
Embed playlist
Open Graph image for home page
Live video link
video feed update
Video update
Video feed update
Merge branch 'master' into develop

Conflicts:
	content-home.php
updated video url
URL Update
Video url update
template
Video URL update
Merge branch 'template'
New York Videos Page