Merge branch 'master' into B1

Conflicts:
	index.html
Merge remote-tracking branch 'origin/B1' into B1
Getting the hang of it?