Removing system template code
Merge pull request #1769 from daviddavis/rm_system_templates

Removing system templates
Content views: fixed double included
Merge pull request #1776 from daviddavis/cv_double_include

Content views: fixed double included