Simplify group management

Conflicts:
	OsmAnd/res/values/strings.xml