Merge templates back to develop #207

Closed jna-unikent closed 6 years ago