finished popup
Merge branch 'feature-popup' into development