Merge RFBee and RFBee_Old