Committing CSS fixes for header auto sizing.
Changes to legacy.
Merge branch 'master' into viewer_css_fix_20140514

Conflicts:
	tmpl/viewer.tmpl.php
Merge branch 'viewer_css_fix_20140514'