fix header
Merge remote-tracking branch 'origin/version_1' into version_1

Conflicts:
	stylesheets/css/style.css
Merge remote-tracking branch 'origin/version_1' into version_1
fix graphics