merged css changes back into stylus & aligned all page headers (and gallery sorting categories) to the logo
Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	assets/css/core.css