Merge branch 'android' of https://github.com/ampatalas/MyGuide into android
Merge branch 'android' of https://github.com/blstream/MyGuide into android
implement showing ways (paths) and junctions on the map
make option to tun on/off these layers
add keys in Settings.java
implement showing ways (paths) and junctions on the map
MYGUIDE-132
implement showing ways (paths) and junctions on the map
make option to tun on/off these layers
add keys in Settings.java
implement showing ways (paths) and junctions on the map
make option to tun on/off these layers
add keys in Settings.java
Merge remote-tracking branch 'upstream/android' into upstream

Conflicts:
	src/com/blstream/myguide/SightseeingActivity.java
	src/com/blstream/myguide/settings/Settings.java
Merge branch 'upstream' into android

Conflicts:
	src/com/blstream/myguide/SightseeingActivity.java
Merge pull request #44 from ampatalas/android

MYGUIDE-132
Merge branch 'android' of https://github.com/robin92/MyGuide into android

Conflicts:
	res/raw/config.xml
	src/com/blstream/myguide/SightseeingActivity.java
	src/com/blstream/myguide/settings/Settings.java