Fixed problems with Chai merge
Fixed Chai script inclusion when using converted C++ code
Forgot to set the switch to use the new C++ functions by default
Undid some 64/32 bit changes for now
Some fixes to be able to retrieve global ex-Chai variables correctly
Added It() back to OTAPI_Wrap
Fixed showmarkets bug in .ot and .cpp
Merge remote-tracking branch 'erichop/master' into eric

Latest merge of C++ high-level API

Conflicts:
	include/irrxml/irrArray.hpp
	include/irrxml/irrString.hpp
	include/otapi/OT_ME.hpp
	include/otapi/ot_command_ot.hpp
	include/otlib/OTSignature.hpp
	include/otlib/stdafx.hpp
	src/otapi/OTAPI.cpp
	src/otapi/OTClient.cpp
	src/otapi/OTMadeEasy.cpp
	src/otapi/OT_ME.cpp
	src/otapi/OT_ME_NEW.cpp
	src/otapi/ot_commands_ot.cpp
	src/otapi/ot_made_easy_ot.cpp
	src/otapi/ot_opentxs_ot.cpp
	src/otlib/OTScript.cpp