MapFragment setup
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/src/main/res/values/strings.xml
UUID and util class defined
UUID and util class defined
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	WaterFountain.iml
UUID and util class defined
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
UUID and util class defined
UUID and util class defined
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into aws_gradle

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	WaterFountain.iml
Added permissions
Started MapFragment integration
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
basic check connectivity
Added permissions
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Added permissions
better connectivity method
Merge branch 'aws_gradle'

Conflicts:
	.idea/misc.xml
	.idea/workspace.xml
	WaterFountain.iml
	app/app.iml
	app/build.gradle
	app/src/main/AndroidManifest.xml