Added string codes for i18n template strings. Added base.html file for future generation of HTML files.
Resolved merge conflicts.