changed 418 to 401 for /user
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