correcting the custom list view
removed the helpdesk functionality as $helpdesk_available never evaluates to true
removed the nested if's in favor of a simple switch statement
removed the clash checks since we don't support it anymore
setting up the database for email templates
simplifying the email tests
changing the email manager to use the templater for everything
updated more of the email manager to use the templater
Merge remote-tracking branch 'upstream/master'