Made a ui that works mostly
Merge branch 'master' of https://github.com/DeltaWhy/aamp-android

Conflicts:
	src/net/miscjunk/aamp/MainActivity.java