Updates to sample data.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
Merge branch 'master' of github.com:FellowTraveler/Open-Transactions

Conflicts:
	sample-data/ot-sample-data/client_data/nyms/DYEB6U7dcpbwdGrftPnslNKz76BDuBTFAjiAgKaiY2n
	sample-data/ot-sample-data/client_data/wallet.xml
	sample-data/ot-sample-data/server_data/notaryServer.xml
	sample-data/ot-sample-data/server_data/nymbox/r1fUoHwJOWCuK3WBAAySjmKYqsG6G2TYIxdqY6YNuuG/DYEB6U7dcpbwdGrftPnslNKz76BDuBTFAjiAgKaiY2n
	sample-data/ot-sample-data/server_data/nyms/DYEB6U7dcpbwdGrftPnslNKz76BDuBTFAjiAgKaiY2n

Finished merging by hand.