Stuff for the pop-up
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/leggo/MainActivity.java