merged: Log NodeIds for easier diagnosis of debug.log
Assign a NodeId to each peer
Add -proxytoo option, which allows proxy use non-exclusively, unlike the -proxy option.

Conflicts:

	src/init.cpp
	src/netbase.cpp

Conflicts:

	.gitignore
	src/init.cpp

Conflicts:

	src/init.cpp
	src/netbase.cpp
Sync from many nodes
Improved getblocks logging.
Inform other peers when they are misbehaving.
Display days instead of hours nodes last seen.
Add masternodes to address database
Debug when OneShot node is about to disconnect.