Rebase
Fix rebase issues
Merge pull request #68 from armandopmj/feat/PubNubServer-Merge

(feat) Add pubnub to server