Music player
Merge branch 'master' of https://github.com/DeltaWhy/aamp-common

Conflicts:
	src/net/miscjunk/aamp/common/MusicQueue.java
	src/net/miscjunk/aamp/common/PlayerHandler.java