Fix for lingering popover
Merge Main/master

Conflicts:
	client/openstorefront/app/scripts/directives/svcv4archdiagram.js
Merge pull request #129 from dshurt/master

Master