added slideshow components
fixed merge issues
added slideshow functionality
misc small hack attemts on email forms
I dont know
fixed mege conflicts
Merge pull request #20 from earthspiritart/master

added a slide show and redo on templates for email and newsletter