Updated default subtitle selection logic
Merge pull request #818 from thogil/subtitle_selection

Updated default subtitle selection logic
add new subtitle preferences
Merge remote-tracking branch 'upstream/master'