Merge pull request #42 from tenkfm/fork-master

Fork master
Merge branch 'master' of git://github.com/osmandapp/OsmAnd-ios into fork-master