Added copyright statement, Java-style copyright statement, and XML-style copyright statement
Removed unused imports from SoundStream
Merge branch 'master' of https://github.com/TheLastCrusade/fanClub
Merged in some changes, fixed some Eclipse not-niceness
Fixed typo to change Javadoc to normal comment
finally got the song elements expanding correctly all the time
Merge branch 'master' of https://github.com/TheLastCrusade/fanClub into import_cleanup

Had a few build errors due to a merge hiccup
Negated changes to musicLibraryLocator in ConnectFragment.java
Fixed reconnect bug on Guest, after host has gone down and come back up.
Fixed bug where messages were getting stuck in the messenger, due to
introduction of a blocking read call
Changed fix to conform with previously established method contract.  Unit tests
now run and pass.
First cut at transfering song:

Renamed Song to PlaylistEntry, and refactored Playlist to use this class, which
will contain information about whether the file was loaded and whether the song
was played.

Introduced PlaylistDataManager, which runs in a thread to monitor and load
playlist entires that live on remote systems.

Implemented TransferSongMessage and RequestSongMessage, for requesting and
transfering song data.

Fixed small bugs in the playlist when sending messages to update guests on play
status.

Refactored code that used Playlist to instead use accessor methods in
PlaylistService
Merge branch 'master' into menu_disable
disabled the menu while in the connect fragment
Merged from trunk
Removed merge annotations in BluetoothDiscoveryHandler
Merge pull request #73 from dgreenhalgh/import_cleanup

GPL copyright statements and import cleanup
Merge pull request #74 from theJenix/bug_fixes

Bug fixes
Merge pull request #75 from ejohnson44/menu_disable

Menu disable
Moved song play/pause/skip actions sent by playlist into a wrapper
AudioPlayerWithEvents, to simplify the logic in PlaylistService

Moved other play related events into the appropriate audio player

Modified PlaylistService to readd songs to playlist data manager after playlist
has been reset

Added error when trying to play and the playlist does not have any loaded songs