updating the Presenting UI again
Merge branch 'master' of https://github.com/mozilla/hotdish

Conflicts:
	data/sidebar/js/custom.js