Integrate C++11 branch into 5_1-new

src/CryptManager.cpp

@@ -11,7 +11,7 @@
 
 #include "libtomcrypt/src/headers/tomcrypt.h"
 
-CryptManager*	CRYPTMAN	= NULL;	// global and accessible from anywhere in our program
+CryptManager*	CRYPTMAN	= nullptr;	// global and accessible from anywhere in our program
 
 static const RString PRIVATE_KEY_PATH = "Data/private.rsa";
 static const RString PUBLIC_KEY_PATH = "Data/public.rsa";
@@ -79,7 +79,7 @@ static const int KEY_LENGTH = 1024;
  *
  */
 
-static PRNGWrapper *g_pPRNG = NULL;
+static PRNGWrapper *g_pPRNG = nullptr;
 ltc_math_descriptor ltc_mp = ltm_desc;
 
 CryptManager::CryptManager()