Templating
Merge branch 'develop' of https://github.com/RufusMbugua/essential into imci
Updated template module
Merge branch 'release/3.9.1'