-
Merge branch 'development' of https://github.com/benedictpaten/cactus
into development

Conflicts:
	cactus_progressive_config.xml
Changing default treatment of headers.