Merge pull request #29 from theJenix/discovery

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