Merge branch 'master' into develop

Conflicts:
	Builds/VisualStudio2012/RippleD.vcxproj
	modules/ripple_app/ripple_app.cpp
	modules/ripple_websocket/ripple_websocket.cpp
	src/cpp/ripple/NetworkOPs.cpp
	src/cpp/ripple/ripple_Application.cpp
	src/cpp/ripple/ripple_Peer.cpp

src/cpp/ripple/LedgerMaster.h

@@ -64,6 +64,7 @@ public:
         return mPubLedger;
     }
     int getValidatedLedgerAge ();
+    bool isCaughtUp(std::string& reason);
 
     TER doTransaction (SerializedTransaction::ref txn, TransactionEngineParams params, bool& didApply);