Updating templatePopover with stopPropagation and  for controllerAs for easier closing
Merge
Regen after merge