Added GPS & User Setting
Merge branch 'develop' of https://github.com/Family-of-loves/Android_App into develop

Conflicts:
	.classpath
	.project
	AndroidManifest.xml
	README.md
	bin/AndroidManifest.xml
	bin/R.txt
	bin/WeAreTheRunningMan.apk
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$attr.class
	bin/classes/android/support/v7/appcompat/R$bool.class
	bin/classes/android/support/v7/appcompat/R$color.class
	bin/classes/android/support/v7/appcompat/R$dimen.class
	bin/classes/android/support/v7/appcompat/R$id.class
	bin/classes/android/support/v7/appcompat/R$integer.class
	bin/classes/android/support/v7/appcompat/R$string.class
	bin/classes/android/support/v7/appcompat/R$styleable.class
	bin/classes/com/example/wearetherunningman/MainActivity$PlaceholderFragment.class
	bin/classes/com/example/wearetherunningman/MainActivity.class
	bin/classes/com/example/wearetherunningman/R$attr.class
	bin/classes/com/example/wearetherunningman/R$bool.class
	bin/classes/com/example/wearetherunningman/R$color.class
	bin/classes/com/example/wearetherunningman/R$dimen.class
	bin/classes/com/example/wearetherunningman/R$drawable.class
	bin/classes/com/example/wearetherunningman/R$id.class
	bin/classes/com/example/wearetherunningman/R$integer.class
	bin/classes/com/example/wearetherunningman/R$layout.class
	bin/classes/com/example/wearetherunningman/R$menu.class
	bin/classes/com/example/wearetherunningman/R$string.class
	bin/classes/com/example/wearetherunningman/R$style.class
	bin/classes/com/example/wearetherunningman/R$styleable.class
	bin/classes/com/example/wearetherunningman/WsCallback.class
	bin/classes/com/example/wearetherunningman/WsConn.class
	bin/dexedLibs/android-support-v4-c6d94456118c0c0da7b6034fda43da0f.jar
	bin/dexedLibs/android-support-v7-appcompat-bf8182901bdd7a7cf5c47e7d14328e93.jar
	bin/dexedLibs/appcompat_v7_3-92aece886529f8a802c7b6e42abcefa5.jar
	bin/dexedLibs/socketio-b08d78ca8ad4750626c73df01153f4fd.jar
	bin/jarlist.cache
	bin/res/crunch/drawable-hdpi/ic_launcher.png
	bin/res/crunch/drawable-mdpi/ic_launcher.png
	bin/res/crunch/drawable-xhdpi/ic_launcher.png
	bin/res/crunch/drawable-xxhdpi/ic_launcher.png
	bin/resources.ap_
	gen/android/support/v7/appcompat/R.java
	gen/com/example/wearetherunningman/R.java
	ic_launcher-web.png
	libs/android-support-v4.jar
	libs/socketio.jar
	proguard-project.txt
	project.properties
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/drawable-xxhdpi/ic_launcher.png
	res/layout/activity_main.xml
	res/layout/fragment_main.xml
	res/menu/main.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values-w820dp/dimens.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/example/wearetherunningman/MainActivity.java
	src/com/example/wearetherunningman/WsCallback.java
	src/com/example/wearetherunningman/WsCallbackInterface.java
	src/com/example/wearetherunningman/WsConn.java