Small refactoring
Fix issue not remember state of group (small issue on server left)
Merge branch 'master' of ssh://github.com/osmandapp/Osmand