Added base.html includes for auto-generation of HTML files.
Resolved merge conflicts.