add body classes from templates. Refactor templates
remove includes from templates
Merge branch 'devel' into integration