most functionality for maps and gps
Merge commit '3f6f2f6c2291e394645e3b327e9ae8cb16ab8ef5'

Conflicts:
	.gradle/2.1/taskArtifacts/cache.properties.lock
	.gradle/2.1/taskArtifacts/fileHashes.bin
	.gradle/2.1/taskArtifacts/fileSnapshots.bin
	.gradle/2.1/taskArtifacts/outputFileStates.bin
	.gradle/2.1/taskArtifacts/taskArtifacts.bin
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/example/peter/designatedduo/ChatActivity.java
	app/src/main/java/com/example/peter/designatedduo/DrinkLimitActivity.java
	app/src/main/java/com/example/peter/designatedduo/DuoGPSActivity.java
	app/src/main/java/com/example/peter/designatedduo/MyGPSActivity.java
	app/src/main/res/layout/activity_drink_limit.xml
	app/src/main/res/layout/activity_duomenu.xml
	build/intermediates/model_data.bin