Button Icons Changed
Font Updated
Places Visited, Current Location Activities Created
Merge https://github.com/jtait/MobileProject

Conflicts:
	.idea/.name
	.idea/gradle.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	app/app.iml
	app/build.gradle
	app/proguard-rules.pro
	app/src/main/AndroidManifest.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
	settings.gradle