Sp6.sc3.pub sub files merge branch

Updated the files in src/pubsub to be the version they are in the demo branch