move templates into app directories
Merge pull request #34 from ChrisCooper/refactor/apptemplates

move templates into apps?
Merge branch 'develop'