Added preference for popups
Merge branch 'master' of
https://github.com/sinnott74/AndroidProject2.git