This commit is half broken.
I have to leave and don't want to redo what I have done so far.
Will squash later.
Merge branch 'master' of git@github.com:FennyFatal/android-grooveapi.git
Revert Temp Commit