Resolved merge conflicts

package.json

src/node/bin/README.md

src/node/bin/service_packager

src/node/cli/service_packager.js

src/node/cli/service_packager/index.js

src/node/cli/service_packager/package.json.template

src/node/examples/stock.proto

src/node/examples/stock_client.js

src/node/examples/stock_server.js

src/node/performance/perf_test.js

src/node/performance/qps_test.js

src/node/test/async_test.js

src/node/test/math/math.proto

src/node/test/math/math_server.js

src/node/test/math_client_test.js

src/node/test/surface_test.js

src/php/ext/grpc/php_grpc.c