renamed jar dependency
updated osmdroid library
merged from dev branch