Merge branch '44-ensure-all-templates-can-be-resolved-add-solver-script-fix-templates' into 'master' Resolve "Ensure all templates can be resolved, add solver script, fix templates" Closes #44 See merge request !37
