rename and refactor popupactivity
Merge branch 'master' of https://github.com/mnitchie/MobileGroupProjects