Shit has hit the fan
email template fixes
Merge branch 'master' of https://github.com/mgpepe/aalblast

Conflicts:
	app/View/Newsletters/code.ctp