Fixed karaoke lyrics delay when the whole words are assigned the same time.
Fixed broken karaoke import due to change in songview
[musicdb] combine triggers so we have a single trigger per table - mysql requires this
platinum: fix parsing of upnp:actor in PltMediaItem
Work around groovy failure with some JRE-s

by compiling some .groovy files instead of interpreting them
Add comment to workaround
Merge pull request #3907 from rbalint/groovy-workaround

Work around groovy failure with some JRE-s
ActiveAE: Fix some print cosmetics in ActiveAESink
ActiveAE: Don't compare m_frames in CompareFormat (it's given via samplerate anyways and zero for silence)
FIX: [droid] handle usb storage
Merge pull request #3908 from fritsch/aefixes

ActiveAE: Fix Fixed Mode and some cosmetics
FIX: [droid] cpu load info with vanilla ndk
Merge pull request #3911 from koying/fixdroidusbstorage

FIX: [droid] handle usb storage
Merge pull request #3917 from koying/fixdroidcpuload

FIX: [droid] cpu load info with vanilla ndk
[musicdb] use a temporary table for the updating of strJoinPhrase in song_artist and album_artist, as mysql can't handle (potentially) circular updates
Merge pull request #3905 from jmarshallnz/music_triggers

[musicdb] combine triggers so we have a single trigger per table - mysql requirement
videodb: fix SQL query in GetMatchingMusicVideo