Adding template-popover directive
Merge
Regen after merge