poly image
Merge branch 'master' of https://github.com/torchbox/wagtail-torchbox into develop
prefixes
poly image test
reverting hard coded images
Merge branch 'develop' of https://github.com/torchbox/wagtail-torchbox into develop

Conflicts:
	torchbox/static/torchbox/css/main.css
hard coding sign up newsletter and paragraphs
Merge branch 'develop' of https://github.com/torchbox/wagtail-torchbox into develop