Fix npe
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
Update cards layout
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
Merge branch 'master' of ssh://github.com/osmandapp/Osmand