Merge branch 'Will' of https://github.com/thestaceface/lennoxaddington into Will

Conflicts:
	CTA/wl_cta_donate.ascx
	CTA/wl_cta_faq.ascx
	CTA/wl_cta_flushot.ascx
	CTA/wl_cta_newsletter.ascx
Revert "Merge branch 'Will' of https://github.com/thestaceface/lennoxaddington into Will"

This reverts commit 25e0c178e4a216f3fb89d3cc02230b7cca1d2833.