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.
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
Fixed multiple connect dialogs by changing Transitions to reuse fragment
objects.  The bug was caused by multiple registrations; onCreate was called
every time we switched back to the NetworkFragment, but onDestroy was not being
called because we held the fragment on the back stack.
Merge pull request #76 from theJenix/connect_dialog_fix

Connect dialog fix