Merge branch 'HEAD' of git@github.com:FennyFatal/android-grooveapi.git

Conflicts:
	src/com/fennyfatal/GrooveApi/Client.java