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

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

Pull from origin