setgenerate creates multiple blocks in -regtest mode

I'm writing some wallet regression tests using -regtest mode, and
need to generate an initial multi-hundred-block chain. Repeatedly
calling setgenerate to generate one block is slow and doesn't
work properly, because block creation happens asynchronously.

This adds two features to setgenerate in -regtest mode:

1) Instead of being interpreted as number of threads to start, the
third argument is the number of blocks to generate.

2) setgenerate will not return until the block creation threads
have created the requested number of blocks.
cleanup error message consistency

  relicts from the CTransaction refactor.
Move types.h include before ifaddres.h for u_int declaration
Merge pull request #3300

848fe68 cleanup error message consistency (Julian Langschaedel)
contrib: add sipa's github-merge script
Merge pull request #3302

e5adec3 contrib: add sipa's github-merge script (Wladimir J. van der Laan)
Merge pull request #3294

c8b7425 setgenerate creates multiple blocks in -regtest mode (Gavin Andresen)
Fix uninitialized variable added in b33b9a6fe

After discussing with BlueMatt, this appears to be harmless in its
current state since it's always set before it's used. Initialize it
anyway for readability and future safety.
Merge pull request #3316

106f133 Fix uninitialized variable added in b33b9a6fe (theuni)
Add some additional logging to give extra network insight.
Store and use a sanitized subVer
qt: restore icon dock menu

This was removed by 25c0cce7f. It was apparently removed in qt5, but
may return for 5.1.
Integration tests via RPC calls

qa/rpc-tests/wallet.sh runs a three-node -regtest network,
generates a fresh blockchain, and then exercises basic wallet
sending/receiving functionality using command-line RPC.
Split up bitcoinrpc (code movement only)

Split bitcoinrpc up into

- rpcserver: bitcoind RPC server
- rpcclient: bitcoin-cli RPC client
- rpcprotocol: shared common HTTP/JSON-RPC protocol code

One step towards making bitcoin-cli independent from the rest
of the code, and thus a smaller executable that doesn't have to
be linked against leveldb.

This commit only does code movement, there are no functional changes.
Merge pull request #3319

871ac37 qt: restore icon dock menu (theuni)
Merge pull request #3296

a946aa8 Store and use a sanitized subVer (Mike Hearn)
ba6a4ea Add some additional logging to give extra network insight. (Mike Hearn)
Merge pull request #3284

fb78cc2 Split up bitcoinrpc (code movement only) (Wladimir J. van der Laan)
prevent Windows redefinition warning cause by compat.h
Merge pull request #3321

0078841 prevent Windows redefinition warning cause by compat.h (Philip Kaufmann)
bitcoin-cli: Add missing SelectParamsFromCommandLine

The SelectParamsFromCommandLine call was missing in bitcoin-cli,
which caused `-testnet` and `-regtest` to be ignored. Add this
call just like in bitcoind.cpp.