Add firefly/templtes to manifest
Merge remote-tracking branch 'spatel/add-templates-to-manifest'