Html deserialization handling img, color and custom tags.
Merge remote-tracking branch 'origin/master' into master_local