music tracklist fix
weather fix
new hubs
fixes
Merge remote-tracking branch 'upstream/master'