mappaaaaaaaaaaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/beyondto/MapActivity.java