Add special download for sherpafy
Merge branch 'master' of ssh://github.com/osmandapp/Osmand

Conflicts:
	OsmAnd/res/values/strings.xml
	OsmAnd/src/net/osmand/plus/OsmAndAppCustomization.java
	OsmAnd/src/net/osmand/plus/sherpafy/SherpafyCustomization.java