added more template stuff
Merge branch 'master' of github.com:earasoft/mod-earasoft-site1