stuff
Merge branch 'master' into work
convert templates and add indexes