Merge branch 'master' of git://github.com/TheLastCrusade/fanClub
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub into message_handling
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub into message_handling
Modifications to MusicLibraryService to support receiving a library update
message, and storing the data appropriately.

Integration tests to make sure we can manipulate the library service in the way
the message handler would.

Added library message broadcast action and extra strings to MessagingService

Base class for service integration tests.
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub into message_handling
Added network code to connect and network fragment

Implemented use of LibraryMessage to send library to host when a fan has
connected
We have a real menu now!
cleaned up some things
Merge branch 'master' into menu_refactor
Added code to manage user list when users connect and disconnect
(ConnectionService, MessagingService, MessageThread)

Added connection code to NetworkFragment and ConnectFragment

Added code to music library service to remove entries when a fan disconnects
Test suite for message tests
Created general purpose reusable Parcelable.Creator implementation, which uses
reflection to create arbitrary objects and populate them from a Parcel
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub into transfer_library

Conflicts:
	fanClub/src/com/lastcrusade/fanclub/CoreActivity.java
	fanClub/src/com/lastcrusade/fanclub/model/UserList.java
	fanClub/src/com/lastcrusade/fanclub/util/MusicListAdapter.java
formatting
Merge pull request #47 from theJenix/transfer_library

Transfer library
Merge branch 'master' of https://github.com/TheLastCrusade/fanClub into menu_refactor

Conflicts:
	fanClub/src/com/lastcrusade/fanclub/CoreActivity.java
	fanClub/src/com/lastcrusade/fanclub/components/NetworkFragment.java
Merge pull request #45 from ejohnson44/menu_refactor

Menu refactor