Added MapActivity
some commit
Added transition to MapActivity
Added map support and map view to MapActivity

Need google play SDK
SHA-1 fingerprint needs to be registered with google api to connect
Added StatsActivity
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/src/main/AndroidManifest.xml
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