Fix calc
Merge branch 'master' of git://github.com/osmandapp/OsmAnd-core