Merge branch 'master' of git://github.com/TheLastCrusade/fanClub

Conflicts:
	SoundStream-test/src/com/lastcrusade/soundstream/net/message/PlayStatusMessageTest.java
Merge branch 'master' of git://github.com/TheLastCrusade/fanClub

Conflicts:
	SoundStream-test/src/com/lastcrusade/soundstream/net/message/PlayStatusMessageTest.java
Merge branch 'master' of git://github.com/TheLastCrusade/SoundStream
initial ui test work
initial ui test work
fixed merge errors
UI tests
Merge changes
Fixed merge issues
fixed merge issues for uiutils.py
completed UI testing
undid formatting changes
undid more formatting changes
My mac now available from userlistservice
add myMac to userlist service
code cleanup, changed log level
removed BluetoothUtils from music library
import cleanup
added empty string
Merge branch 'master' of git://github.com/TheLastCrusade/SoundStream into song_breakup

Conflicts:
	SoundStream-test/src/com/lastcrusade/soundstream/net/message/PlayStatusMessageTest.java

Initial checkin of messenger refactor, to split messages to allow play control
commands to be transmitted/received even while transmitting song data.

Refactored: cleaned up unused imports and variables, and moved Messenger and
supporting classes in .net.wire