Add some default template
Merge branch 'develop'