Merge pull request #153 from Eric-Brison/3.2-R4273

fixme odthtml
Merge pull request #154 from Eric-Brison/3.2-R4273

remove Trash en add content to Archive directory
delete et pre/postImport