Merge remote-tracking branch 'origin/master'

3 files changed, 32 insertions, 0 deletions

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b4d6f41b..e783d641 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -481,6 +481,8 @@
 	<string name="settings.shuffle_by_album">Shuffle By Album</string>
 	<string name="settings.shuffle_by_album.true">Shuffle order of albums</string>
 	<string name="settings.shuffle_by_album.false">Shuffle all songs together</string>
+	<string name="settings.casting_stream_original">Stream original</string>
+	<string name="settings.casting_stream_original_summary">Stream original files where supported by cast device</string>
 
 	<string name="shuffle.title">Shuffle By</string>
 	<string name="shuffle.startYear">Start Year:</string>
diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml
index 81ea22b8..9ec84bcf 100644
--- a/app/src/main/res/xml/changelog.xml
+++ b/app/src/main/res/xml/changelog.xml
@@ -1,5 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
+	<release version="5.1.5" versioncode="173" releasedate="2/11/2016">
+		<change>Toggle for Batch Mode on Now Playing</change>
+		<change>Admin tab: view/update music folders (Subsonic 5.2+)</change>
+		<change>Tag Browsing: can specify Music Folder (Subsonic 6.0+)</change>
+		<change>Show shuffle/radio mode in title bar</change>
+		<change>Madsonic only: Songs lists on Home tab</change>
+		<change>Clicking songs adds songs before it as well</change>
+		<change>Similar Artists: show missing artists below main list</change>
+		<change>Improve offline search (thanks fxthomas)</change>
+		<change>Improve podcast date formatting</change>
+		<change>Increase max sleep timer to 1 hour</change>
+		<change>Cast: added setting to disable DLNA gapless playback</change>
+		<change>Cast: added setting to stream original source files</change>
+		<change>Long press details dialogs to copy information</change>
+		<change>Android Auto improvements</change>
+		<change>Top Tracks: display #</change>
+		<change>Require current password when changing password</change>
+		<change>Improved Share Details dialog</change>
+		<change>Sort Music Folders alphabetically</change>
+		<change>Fix repeating same song if multiples copies in play queue</change>
+		<change>Fix freeze on Play x from Google Now</change>
+		<change>Fix Show Artist/Album back behavior</change>
+		<change>Minor Chromecast fixes</change>
+	</release>
 	<release version="5.1.4" versioncode="172" releasedate="1/17/2016">
 		<change>Minor theme improvements</change>
 	</release>
diff --git a/app/src/main/res/xml/settings_cast.xml b/app/src/main/res/xml/settings_cast.xml
index 058255c2..45766162 100644
--- a/app/src/main/res/xml/settings_cast.xml
+++ b/app/src/main/res/xml/settings_cast.xml
@@ -15,5 +15,11 @@
 			android:summary="@string/settings.gapless_playback_summary"
 			android:key="castingGaplessPlayback"
 			android:defaultValue="true"/>
+
+		<CheckBoxPreference
+			android:title="@string/settings.casting_stream_original"
+			android:summary="@string/settings.casting_stream_original_summary"
+			android:key="castStreamOriginal"
+			android:defaultValue="true"/>
 	</PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file