Merge branch 'dev'
Minor fix on the apps' templates
Merge branch 'master' of https://github.com/Jeymisson/app-tabletranscriber
Merge branch 'dev'