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)
unused import
incorrect merge
Merge pull request #604 from krabaey/feature-audiofocus

add option to keep playing music