exchange popup refactored in advertisement view
Merge branch 'develop'