Improved popups
Merge branch 'development' of https://github.com/lucaspi/AndroidRally into development