fix bug for missing tpl files
fix for template bug
set default value for measurements to 0
remove old required asterisk
Merge pull request #9 from talarico43/development

Merge master and development branches