map and chat fixes
merge
Merge branch 'master' of https://github.com/fokin33/osmodroid

Conflicts:
	GPSLocalService/res/values/strings.xml
	GPSLocalService/src/com/OsMoDroid/IM.java