add option to keep playing music
Merge branch 'master' into feature-audiofocus

Conflicts:
	OsmAnd/src/net/osmand/plus/api/AudioFocusHelperImpl.java
add option to keep playing music (cherry picked from commit 1be1c0e)
import gpx
unused import
show imported gpx file
incorrect merge
- use AsyncTask
- only show gpx route
- move map to first waypoint of imported track
- import reordering
- improvements : import from dropbox ; ES-FileExplorer local&cloud
Need to override onNewIntent otherwise old intent is returned since activity is declared singleTop
update names
Use timestamp instead of date
Rename to follow file name convention
Merge pull request #612 from krabaey/feature-import-gpx

Feature to import gpx file
Small change of map position
Update position
Merge pull request #604 from krabaey/feature-audiofocus

add option to keep playing music
Make interrupt music global