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

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

Conflicts:
	.idea/workspace.xml
	WaterFountain.iml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'
Started MapFragment integration
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	.idea/workspace.xml
Added permissions