fixed broken merge
fixed broken 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