discover for 30 seconds
fix from bad branch
most things, missing playstatus message
tabs, grr
fixed broken tests unrealated to branch
did break test whoo hoo
test song in playstatusmessage
remove hardcoded strings
enable button after 30 seconds
Merge branch 'master' into discoverable_discount

Conflicts:
	SoundStream/src/com/lastcrusade/soundstream/service/MessagingService.java
Merge pull request #91 from reidbaker/discoverable_discount

Discoverable discount