Fix html encoding once and for all
Rollback commit ea2918ca59 aka patch #25 of http://drupal.org/node/2040511 #2040511
minor fixes
bug fixes, features
two bug fixes and one new feature for improved export support