Added an id member to the Content struct of the EPN and the FrameBuilder
Fixed regression that caused sending/receiving on FLP and EPN to fail