update delegate names
switching to 30 second interval
change delegate count to 101
Convert node_id from a random number to public_key
New port behavior: default to port 8764 but gracefully choose another random port if it's busy.  If the user specifies --p2p-port, don't fall back to another port if busy, just retry.  Now we do UPNP slightly later in the process so we can map a randomly-assigned port if necessary.

Conflicts:
	libraries/net/node.cpp
Merge branch 'master' into dryrun3
fix crash due to change in number of delegates, adding extra test private keys
Merge branch 'dryrun3' of github.com:BitShares/bitshares_toolkit into dryrun3
removing extra wdump
initialize genesis delegates with votes_against rather than votes_for
Issue #343: Add network_get_upnp_info RPC call

The call is now created, and should be working, but I haven't tested it
yet.
Merge branch 'dryrun3' of github.com:BitShares/bitshares_toolkit into dryrun3

Conflicts:
	libraries/client/client.cpp
Issue #344: Update some log lines to the new style

Replaced display_status_message calls with ulog.
Issue #355: Trim whitespace on wallet names when creating new wallets
Issue #355: Trim whitespace on wallet names when opening wallets
Issue #345: Do not allow import of private key belonging to another
account

If user attempts to import a private key whose public key is registered
to another account on the blockchain, do not allow that key to be
imported.
new genesis.json
change default port
Merge branch 'dryrun3' of github.com:BitShares/bitshares_toolkit into dryrun3
move boost regex header to cpp