minor changes 6.0
merge

Conflicts:
	css/site-custom.css