Fixing some bad content cleanup…. str_replace resulted in empty content in certain situations...
Merge branch 'cole' - Fixing some bad content cleanup…. str_replace resulted in empty content...

Conflicts:
	plugins/public-pages/makers.php
Swapping the meta query for the taxonomy in signage reports.
Placement for NY.
Fixing things @whyisjake did. He owes me a candy bar.
Merge branch 'master' of https://github.com/Make-Magazine/makerfaire
Adding video embeds to presenters and performers.
Adding a schedule new event button to applications. Fixing display issue with the locations metabox
Merge branch 'cole'
Removing debugging code
Handling the viewing of event items to redirect to their assign application instead
Adding an exit() and updating to wp_safe_redirect() for event items via Mo #21536
Updating the JDB Sync option to only get posts from the latest faire
Adding the global variable for the current faire.
Merge branch 'bolson'

Conflicts:
	js/expand-post-edit.js
Adding twitter fields to CSV reports
Merge branch 'master' of https://github.com/Make-Magazine/makerfaire
Deleted comment
Fixing stage manager reports. Some applications were coming in one column
Merge branch 'master' of https://github.com/Make-Magazine/makerfaire