Merge branch 'tims'

Conflicts:
	MyApplication/app/src/main/AndroidManifest.xml

MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapAct
ivity.java
Added more logging and removed unused code
Merge pull request #3 from westjour/jourdans

detect user current GPS location
Merge branch 'master' of https://github.com/westjour/CodeMichApp

Resolved Conflicts:
	MyApplication/app/app.iml
	MyApplication/app/src/main/AndroidManifest.xml

MyApplication/app/src/main/java/com/example/jourdan/myapplication/AsyncT
askParseJson.java

MyApplication/app/src/main/java/com/example/jourdan/myapplication/JsonPa
rser.java

MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapAct
ivity.java
fixed imports
Merge branch 'master' of https://github.com/westjour/CodeMichApp into jourdans

Conflicts:
	MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapActivity.java