Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

src/amqp/amqpabstractnotifier.cpp

@@ -0,0 +1,21 @@
+// Copyright (c) 2017 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#include "amqpabstractnotifier.h"
+#include "util.h"
+
+
+AMQPAbstractNotifier::~AMQPAbstractNotifier()
+{
+}
+
+bool AMQPAbstractNotifier::NotifyBlock(const CBlockIndex * /*CBlockIndex*/)
+{
+    return true;
+}
+
+bool AMQPAbstractNotifier::NotifyTransaction(const CTransaction &/*transaction*/)
+{
+    return true;
+}