Added the email address into the html email
Added some comments
Broken, meant to attach a file to email but it doesn't
Merge branches 'dev' and 'master' into dev
Moved to mimemail to allow users to attach images to emails
Merge branches 'master' and 'dev'