updating test server files
69.85.85.87 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCiiatQdPflAYg3cekJtPYnlSmzJ46f7NmzDSdtZyAThIHdDUQ0mz7nHGLOVeFrGJB9utdBRvT/Xx0ueMGn2PA4I6UhY/Xy4Wrtg73old60+uX3m7zI6oIIjpiQtLkPtffFBLXKnHyotZ1ZZPCGvCXi1yOmkc34oUBLnk7RbwoWLLjR+41wR1Cm7Lk86wHovCb6cADTfyfpuv5xvVU9UjI6v3xUSM8mDvrZfcyvqnMcb5/+PWVTyUtLlUFfQG5vwUgRzCZLPJPMqhqmpnsC10YepktdyMHUUfrjj7JRpfYUaWnf7cSJy6ETBEvWPJhNTlCzymI17ke0IlQtpne+1BKT
Merge branch 'master' of github.com:stretch/OT-BitcoinServer

Conflicts:
	test-contracts/ASSET-DigitalBitcoinTokens.xml
Merge branch 'master' of github.com:stretch/OT-BitcoinServer