Added query layout and way to set playlist
Merge branch 'master' of https://github.com/DeltaWhy/aamp-android

Conflicts:
	libs/aamp-server-common.jar
	src/net/miscjunk/aamp/ProxyUIBridge.java