Resolved merge conflicts with master

.travis.yml

Makefile

README.md

build.json

examples/pubsub/main.cc

examples/pubsub/publisher_test.cc

examples/pubsub/subscriber_test.cc

include/grpc++/async_unary_call.h

include/grpc++/channel_arguments.h

include/grpc++/channel_interface.h

include/grpc++/client_context.h

include/grpc++/completion_queue.h

include/grpc++/config.h

include/grpc++/create_channel.h

include/grpc++/credentials.h

include/grpc++/impl/call.h

include/grpc++/impl/client_unary_call.h

include/grpc++/impl/rpc_method.h

include/grpc++/impl/rpc_service_method.h

include/grpc++/impl/service_type.h