Adding content in mako template files (body and footer).
Merge remote-tracking branch 'origin/master'