pre-merge
Merge branch 'master' of https://github.com/rob-med/AndroidSRO

Conflicts:
	src/com/sro/activity/MyGeolocationMap.java
none
Merge branch 'master' of https://github.com/rob-med/AndroidSRO

Conflicts:
	src/com/sro/activity/MyGeolocationMap.java