Catch html insert
Merge branch 'form_errors' into Development