merge and resolve conflict

.gitignore

BUILD

Makefile

binding.gyp

build.yaml

config.m4

examples/node/greeter_client.js

examples/node/greeter_server.js

examples/node/helloworld_grpc_pb.js

examples/node/helloworld_pb.js

examples/node/package.json

gRPC.podspec

grpc.def

grpc.gemspec

include/grpc++/impl/codegen/client_context.h

include/grpc++/impl/codegen/create_auth_context.h

include/grpc++/impl/codegen/server_context.h

include/grpc++/security/server_credentials.h

include/grpc/grpc_security.h

include/grpc/grpc_security_constants.h