more fixes
Merge branch 'font-updates' of github.com:ASCTech/asc_qs into font-updates

Conflicts:
	styles/override.css