Finish map interface and Pickup dialog fragment. (mega commit warning)
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build.gradle
Omit style for now. Merge in stripe code and fix a missing image.