Restored conditional openssl include that was accidentally removed
Merge pull request #204 from BugFreeSoftware/minimize_source_includes

Minimize source includes
New OTRecord necessary for Bitmessage integration

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
Merge pull request #207 from FellowTraveler/develop

New OTRecord necessary for Bitmessage integration
Added named symmetric keys for encrypting Bitmsg
connect strings and other connect strings. (BTC,
Namecoin, etc...)

Signed-off-by: FellowTraveler <F3llowTraveler@gmail.com>
Merge pull request #208 from FellowTraveler/develop

Added named symmetric keys for encrypting Bitmsg
Version bump v0.93
Update mint series, sample-data.
Merge pull request #209 from randy-waterhouse/develop

Update mint, sample-data, version.
Merge pull request #210 from Open-Transactions/develop

Develop
Merge remote-tracking branch 'upstream/master' into develop

Merging bitmessage changes.

Conflicts:
	include/otlib/OTSymmetricKey.hpp
	sample-data/ot-sample-data/server_data/mints/r1fUoHwJOWCuK3WBAAySjmKYqsG6G2TYIxdqY6YNuuG/7f8nlUn795x8931JParRnmKAyw8cegRyBMcFg9FccaF
	sample-data/ot-sample-data/server_data/mints/r1fUoHwJOWCuK3WBAAySjmKYqsG6G2TYIxdqY6YNuuG/7f8nlUn795x8931JParRnmKAyw8cegRyBMcFg9FccaF.PUBLIC
	sample-data/ot-sample-data/server_data/mints/r1fUoHwJOWCuK3WBAAySjmKYqsG6G2TYIxdqY6YNuuG/EYGad9FjZWgGKeVbgh2FbA0Hf8oP0XlnRyYCsvSIYKL
	sample-data/ot-sample-data/server_data/mints/r1fUoHwJOWCuK3WBAAySjmKYqsG6G2TYIxdqY6YNuuG/EYGad9FjZWgGKeVbgh2FbA0Hf8oP0XlnRyYCsvSIYKL.PUBLIC
	sample-data/ot-sample-data/server_data/mints/r1fUoHwJOWCuK3WBAAySjmKYqsG6G2TYIxdqY6YNuuG/JY7kEFnm2c50CGNphdpgnlVo2hOZuLrBua5cFqWWR9Q
	sample-data/ot-sample-data/server_data/mints/r1fUoHwJOWCuK3WBAAySjmKYqsG6G2TYIxdqY6YNuuG/JY7kEFnm2c50CGNphdpgnlVo2hOZuLrBua5cFqWWR9Q.PUBLIC
	sample-data/ot-sample-data/server_data/mints/r1fUoHwJOWCuK3WBAAySjmKYqsG6G2TYIxdqY6YNuuG/XU1Gu6sjcLxg260FmRgrSvRz9L0OohXRSEhlkeSd9j2
	sample-data/ot-sample-data/server_data/mints/r1fUoHwJOWCuK3WBAAySjmKYqsG6G2TYIxdqY6YNuuG/XU1Gu6sjcLxg260FmRgrSvRz9L0OohXRSEhlkeSd9j2.PUBLIC
	sample-data/user-samples.tar.gz
	src/otlib/OTCachedKey.cpp