moving templates subject to change into dev
Merge branch 'master' of https://github.com/CNMAT/CNMAT-MMJSS