add part of acceptance test
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixed up ui testing
delete fanClub
Merge remote-tracking branch 'upstream/master'
broadcast playlist whenever new guest joins
actually delete fanClub stuff
added testing stuff from master branch
somehow compiled before not sure how this was missed
Merge pull request #89 from bryansills/master

Broadcast playlist when new guest joins
Merge pull request #88 from reidbaker/many_music_librarys

Many music librarys
Merge branch 'master' into discoverable_discount

Conflicts:
	SoundStream/src/com/lastcrusade/soundstream/service/MessagingService.java