Merge branch 'master' of git://github.com/TheLastCrusade/fanClub
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub
not working, method setup for adding to queue and playing
Merge branch 'master' into play_things_from_queue
logging and xml change
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub into message_handling
clean up
This wasnt a pure merge
Merge branch 'master' into play_things_from_queue

Conflicts:
	fanClub/res/layout/content_frame.xml
	fanClub/src/com/lastcrusade/fanclub/components/MusicLibraryFragment.java
	fanClub/src/com/lastcrusade/fanclub/service/PlaylistService.java
play image changes when pressed
buttons were backwards
song plays with updated button
button resets after song is finished
add ability to move through the queue
playlist now updates when song is added
refactor of playlist to use 2 lists to keep history
stop null pointer exceptions and handle more edge cases
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub into play_things_from_queue

Conflicts:
	fanClub/src/com/lastcrusade/fanclub/CoreActivity.java
	fanClub/src/com/lastcrusade/fanclub/components/PlaylistFragment.java
	fanClub/src/com/lastcrusade/fanclub/util/MusicListAdapter.java
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub into message_handling
fix null pointer exception, fix hard coded playlist, add toString to UserList, Possible bugs: getting stuck on pause and skipping two songs