OsmAnd-SDIS29 1.0

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	OsmAnd/src/net/osmand/plus/OsmandApplication.java
#	OsmAnd/src/net/osmand/plus/settings/datastorage/task/MoveFilesTask.java