fixed rdio connect bug
Merge branch 'dev' into dan-dev
Merge pull request #14 from exfm/dan-dev

Dan dev
Merge branch 'dev' into maj-dev