fixed merge
fixed merge

jamesward/pubnub-api,jamesward/pubnub-api,jamesward/pubnub-api,jamesward/pubnub-api,jamesward/pubnub-api,jamesward/pubnub-api,jamesward/pubnub-api,jamesward/pubnub-api,jamesward/pubnub-api