First set of testing completed
Api now produces valid JSON
Merge branch 'master' of https://github.com/cesarramirez/SonicFlow

Conflicts:
	api.php
Api now can queue songs
Empty query now is blocd
Added queue-list
Fixed queue-list wrong var
First set of testing completed
Merger fix for wrong JSON format
Api now can queue songs
Empty query now is blocd
Added queue-list
Fixed queue-list wrong var
Merge branch 'master' of github.com:cesarramirez/SonicFlow

Conflicts:
	php-gracenote
Merge pull request #7 from cesarramirez/master

Source rebasing and merging - accepting pull request from cesarramirez