changed email templating system

Signed-off-by: alkaest2002 <p.calanna@gmail.com>
took off linebreaks in email templates

Signed-off-by: alkaest2002 <p.calanna@gmail.com>
Merge branch 'new_email_template' of https://github.com/alkaest2002/risky into new_email_template

Signed-off-by: alkaest2002 <p.calanna@gmail.com>

Conflicts:
	site/plugins/emailPrep.php