css fixes
Merge branch 'live' into dev

Conflicts:
	static/educate/educate.css
Fix for subject subset pages