Removed template content
Merge branch 'dev'