mn
Merge branch 'master' into tims

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Added json parser and adding markers to map
Merge branch 'master' into tims

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
Synched with master branch
Added methods to get more MiData. And get cityName from coordinates method to utillity
Merge branch 'tims'