fix html_entity_decode, output utf8
Merge branch 'feature/MoveToClass' into develop