Json response
Json response
Merge branch 'master' into rdio

Conflicts:
	app/models/search.rb
do_search returns an simple songs object