update base.html
Merge branch 'templates'