merge from develop to kss
Merge branch 'develop' into kss
teaser img restored
Merge remote-tracking branch 'origin/master' into kss
PLANET-95 big merge from master
Merge branch 'develop' into kss
PLANET-95 img folder in styleguide and header removed
PLANET-95 trials with new header
merge master to kss
PLANET-95 New nav in heading-second, resizing fixed, kss-content fixed
PLANET-95 media querie for large desktop in kss-content
PLANET-95 css.html and js.html created
p3.validation - 0.4.0 - Adapted form finding to suit stranger DOM structures
p3.pledge_with_email_only - 0.4.2 - Adapted form finding to suit strange DOM structure, switched API request to use $.Deferred
Updated structure and Gruntfile to improve watch speed, removed dist builds from normal workflow, removed test directory, rewrote src HTML urls to suit testing inside src, added replace rules to minified in /dist
PLANET-136 Updated structure and Gruntfile to improve watch speed, removed dist builds from normal workflow, removed test directory, rewrote src HTML urls to suit testing inside src, added replace rules to minified in /dist
Merge origin/master - change license formatting to space instead of tab

Conflicts:
	Gruntfile.js
	dist/js/action-template-full.min.js
	dist/js/action-template-ocean-thankyou.min.js
	dist/js/action-template-ocean.min.js
	dist/js/action-template-thankyou.min.js
	dist/js/action-template.min.js
	dist/js/compat/json.min.js
	dist/js/p3.lib.js
	dist/js/p3.lib.min.js
	dist/js/site.min.js
	dist/js/vendor.min.js
merge from kss to develop
merge from master to develop