Fix android 2.2
Fix scrolling in the POI editor
Fix rotation on MapActivity resume
Only turn off the screen if map is shown (wake on voice)
Merge pull request #955 from Zahnstocher/noScreenOff-patch

Only turn off the screen if map is shown (wake on voice)
Translated using Weblate (Norwegian Bokmål)

Currently translated at 64.7% (1010 of 1559 strings)
Translated using Weblate (Russian)

Currently translated at 100.0% (1559 of 1559 strings)
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
Merge pull request #954 from Zahnstocher/fixRotation-patch

Fix rotation on MapActivity resume
Merge pull request #951 from philippelatulippe/fix-poi-editor-scrolling

Fix scrolling in the POI editor
Fix
Merge branch 'master' of ssh://github.com/osmandapp/Osmand
Merge pull request #1 from osmandapp/master

Updating my fork, if this will go wrong than sorry ;/