Whitespace fix
Add EmailUtil and generic email templates
Update for fypo_annotation.mhtml from Midori
Create annotation_type_list.mhtml
Update to version v561