basic html editor
Merge branch 'master' into pages_html
html editor fixes
adds to database correctly
Merge branch 'master' into pages_html
fixed makefile