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.
Removed lock files from sample data.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
add better error handling to OTServer.cpp
update for latest version of java
armor server contract
Merge pull request #224 from da2ce7/master

Updated Server Contract to Armored
fix some memory issues in OTPath
load OTCrypto default values from config
Merge pull request #225 from da2ce7/master

Memory Fixes for OTPath and OTSettings, and Configuartion Support for OTCrypto
Update OTCrypto.h

fixed Mac build problem from da2ce7's latest stuff.
Fix assert on newnym with source.

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
Merge branch 'master' of github.com:FellowTraveler/Open-Transactions
 upstream stuff
update windows project file, less noisy
static analysis for supporting libs
Visual Studio Static Analysis fixes for OT

I have used the build-in visual studio static analysis tool
on the OT project and fixed all the results.

In the process I've rewrote OT_ASSERT, and created a new macro
OT_FAIL.  These macros now insert std::terminate, giving a much
stronger assurance that the execution will not continue.

I've also fixed many warnings from the normal compile.

Overall, I hope that OT is more sold from these changes.

Cam.
more warning squashed
new OpenSSL_BIO class, auto cleanup
more warning fixes
even more warning fixes