Merge pull request #134 from nickescallon/dev

Added Image Scraper
Fixed rdio skipping songs
Merge branch 'rdio' into dev
Merge pull request #136 from deini/dev

Fixed Rdio skipping songs
Fixed bug for player timer
Merge pull request #137 from malucky/dev

Fixed bug for player timer and if not authenticated for rdio, set duration to 30 seconds
Check if rdio authenticated. if not change duration to 30 seconds sample
changed 418 to 401 for /user
Fixed search not showing Rdio
updated search controller to correctly monitor SearchService
Merge pull request #138 from deini/dev

Fixed search not showing Rdio
Merge branch 'loginButton' into dev

Conflicts:
	public/scripts/services/search.js
Merge pull request #139 from alexmckenley/dev

Fix login/logout button
Make share link using $location.host()
Check if rdio authenticated. if not change duration to 30 seconds sample
Merge branch 'sharing' into dev
Merge pull request #141 from malucky/dev

Changed sharing time to use $location.host() and fixed rdio duration when not logged in
Disabled Deezer temporarily (until available in the US)
Merge pull request #142 from deini/dev

Disabled Deezer temporarily (until available in the US)