Updated new firefox desktop and tour pages.
Merge branch 'master' of github.com:elin-moco/bedrock

Conflicts:
	bedrock/firefox/templates/firefox/desktop/desktop-base.html