Fix header sizes.
Change placeholder graphic.
Merge remote-tracking branch 'origin' into lesscolour

Conflicts:
	app/snippets/cpMain.html