Combobox popup fix
Merge branch 'front-end' into staging

Conflicts:
	master/buildbot/status/web/files/prod/script/project/popup.js