html cleaned
Merge branch 'master' into cleaning_html
fixed db mismatches