Delete some templates
Add changes from s&H
Add changes for beretning
Merge branch 'master' of https://github.com/bellcom/campo_foundation