Merge branch 'master' of https://github.com/mozilla/fireplace

Conflicts:
	hearth/index.html
	hearth/media/js/browser.js
	hearth/media/js/common/suggestions.js
	hearth/media/js/consumer_init.js
	hearth/media/js/feedback.js
	hearth/media/js/install.js
	hearth/media/js/navigation.js
	hearth/media/js/notification.js
	hearth/media/js/prefetch.js
	hearth/media/js/tracking.js
	hearth/media/js/utils.js
	hearth/media/js/z.js