Changes according to review comments.
Finished feature 46177267/badges.

Conflicts:
	firefox/js/windowWatcher.js