Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/src/main/AndroidManifest.xml
Add action bar menu items

Add action bar items and made action bar persistent across views
removed unnecessary comments
Merge pull request #1 from westjour/jourdans

Jourdans
app.iml changed itself
Merge branch 'master' of https://github.com/westjour/CodeMichApp

# 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.
Resolved conflicts
Merge branch 'tims'

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

MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapAct
ivity.java
detect user current GPS location
Merge branch 'master' of https://github.com/westjour/CodeMichApp into jourdans

Conflicts:
	MyApplication/app/src/main/java/com/example/jourdan/myapplication/MapActivity.java
resolve conflicts
Added more logging and removed unused code
Merge pull request #3 from westjour/jourdans

detect user current GPS location
fixed action bar in Map Activity
optimize imports
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
more conf
Created AppData class to store information relevant for all activities. Created MyApplication class to rule them all