Add beta recent locations

(only shows 4 for now)
Merge remote-tracking branch 'origin/master'

Conflicts:
	ErrandsApp/app/src/main/java/errandsapp/errandsapp/MainScreen.java