Fixes to template via email from @ivan-basekit
Merge branch 'develop' of github.com:basekit-templates/azabache into develop