Merge branch 'develop' of https://github.com/Make-Magazine/makercon into staging
Merge branch 'staging' of https://github.com/Make-Magazine/makercon into staging
Merge branch 'staging' of https://github.com/Make-Magazine/makercon into staging

Merge from Origin
Twitter Box Button + 2/6 news
Maker-Pro News button
Twitter Box height 550
Merge branch 'master' into staging

Conflicts:
	js/navigation.js
	page-home.php
Merge branch 'develop' into staging
link update