moved templates to namespaces to avoid collision
Merge branch 'master' of github.com:uppercounty/uppercounty