Div box added for rdio
Merge branch 'master' into testplaylist
Annotate models
fixed playlists
Merge conflicts resolved
Merge done
merged