qMerge branch 'staging' of https://github.com/Make-Magazine/makercon
URL Update
Video url update
template
Video URL update
Merge branch 'template'
New York Videos Page
Merge branch 'template'
modal height fix
Merge branch 'master' of https://github.com/Make-Magazine/makercon

Merge from origin
Fix 2/6 news
Maker-Pro News button
Twitter Box height 550
Session video icon css