(1) base.php: removed comment at line 34; (2) Removed "comments" include at line 13
Merge branch 'templating'