Live server changes for its branch
Back to development server settings
Implemented part of Rdio login
Rdio back-end support finished, front-end sort of implemented
Merge branch 'master' into liveserver

Merging Rdio changes into master branch