fix(discovery): remove its own address from peer list to join
fix(tests/multi_node_kill_all_and_recovery): wait for cluter to build over
fix(transporter): CancelRequest doesn't work on HTTPS connections blocked

Currently this is a workaround. And it should be fixed in Go1.3.
chore(server): remove useless CancelWhenTimeout

Setting request timeout is covered by go-httpclient now.
Merge pull request #598 from unihorn/19

fix bugs that are found in issue #579
fix(Documentation/*): fix various typos
Merge pull request #604 from ccding/master

fix trivial issues as I see them
docs(errorcode.md): add the EcodeRootROnly error
Add PHP library.

We implement the api client useing php.
Merge pull request #612 from congpeijun/master

Add PHP library.
Merge pull request #607 from Asmod4n/patch-1

Added Error 107 to Documentation
docs(CONTRIBUTING): add code style section
Merge pull request #613 from unihorn/29

docs(CONTRIBUTING): add code style section
fix(CONTRIBUTING): minor grammar fixes
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  fix(CONTRIBUTING): minor grammar fixes
  docs(CONTRIBUTING): add code style section
  Add PHP library.
  docs(errorcode.md): add the EcodeRootROnly error
  fix(Documentation/*): fix various typos
  chore(server): remove useless CancelWhenTimeout
  fix(transporter): CancelRequest doesn't work on HTTPS connections blocked
  fix(tests/multi_node_kill_all_and_recovery): wait for cluter to build over
  fix(discovery): remove its own address from peer list to join