templates and paths
Merge pull request #1 from citylims/working

templates and paths