Factored out archive page rework
Swapped references to single link refactor back to original single link
Merge branch 'dev.switch-to-old-archive' into develop

Conflicts:
	perma_web/perma/templates/single-link.html