Merge branch 'feature/air' into dev

Conflicts:
	AndroidManifest.xml
	src/by/istin/android/vkmusic/CommonPlayerActivity.java
	src/by/istin/android/vkmusic/v2/media/PlaylistHelper.java