merging changes for the bluetooth relay server, and google glass support into the glass branch.