test
Merge remote-tracking branch 'origin/features/popup' into develop

Conflicts:
	left/tracker/src/main/extensions/src/common/app/popup.js