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

Conflicts:
	shortcodes/makercon_schedule.php
	shortcodes/makercon_sessions.php
Merge branch 'staging'

Merge from staging