Links on category pages
Merge remote-tracking branch 'staging/master' into staging

Conflicts:
	_generated_media/board-6521122d1492efdff8d0e7851f6a056a1824c85f.css
	_generated_media/board-828ba12f9c812064e33b905eabb06bc31d60e00c.css
	_generated_media/board-83af2fcae73c46b0c5bcc8dd280d14d58c817923.css
	_generated_media_names.py
Correct structure of shop pages
Merge remote-tracking branch 'staging/master' into staging
various fixes
Merge branch 'master' of heroku.com:simply-centered-staging
settings
correct shop cats
correct logo positioning
media
footer styling
media
change center, hide popover
media
improve readme