Merge branch 'hotfix/base-url-fix' into develop
Merge branch 'hotfix/update-web-doc' into develop
Now using Backbone models for songs.
Rest endpoints in node.
Moved public assets to node.
Merge branch 'feature/node-conversion' into develop
Added shebang to getLibs.
Added service routes.
Rest endpoint which allows clients to request a playback key.
Rest endpoint which allows searching of Rdio.
Adding support for playback using the Rdio JQuery lib.
Cleaned up initialization code for the Rdio object.
Merge branch 'develop' of git://github.com/OpenGea/gea into feature/rdio-playback
Added stylus support and converted main stylesheet to stylus.
Merge branch 'develop' of git://github.com/OpenGea/gea into feature/rdio-playback
Changed getLibs to create assets lib directory.
Playback starts by default using hard-coded playbackToken for 'localhost'.
Adding support for playback using the Rdio JQuery lib.
Cleaned up initialization code for the Rdio object.
Merge branch 'develop' into feature/rdio-playback

Conflicts:
	web/getLibs.sh
	web/public/index.html
	web/public/js/app/views/player.js
	web/public/js/main.js