Merge remote-tracking branch 'origin' into bbc

Conflicts:
	site/js/main.js
Merge branch 'bbc' of https://github.com/edlongman/thescoop into bbc

Conflicts:
	site/js/main.js