Added new demo for custom template groups
Merge from lndash