implemented activation dialog
Merge branch 'feature-activation' into develop