Fixed the map gesture bug...sort of.
Fixed the map gesture bug...sort of.
Merge remote-tracking branch 'origin/Nathalie'

Conflicts:
	app/src/main/res/layout/activity_main.xml
Merge with natalie