html beautify
merge conflicts
html beautify2
merge conflicts
More html fixes