Merge branch 'master' into design_merge
Fix html on single post page, add tag modals again

No idea where they disappeared to
Merge branch 'design_merge'