Merge branch 'ide_m25' of https://github.com/yann300/cpp-ethereum into

mix_editor

Conflicts:
	mix/AppContext.h
	mix/AssemblyDebuggerModel.cpp

mix/AssemblyDebuggerModel.cpp

@@ -45,7 +45,6 @@ AssemblyDebuggerModel::AssemblyDebuggerModel():
 DebuggingContent AssemblyDebuggerModel::executeTransaction(bytesConstRef const& _rawTransaction)
 {
 	QList<DebuggingState> machineStates;
-	// Reset the state back to our clean premine.
 	eth::Executive  execution(m_executiveState, LastHashes(), 0);
 	execution.setup(_rawTransaction);
 	std::vector<DebuggingState const*> levels;

mix/Extension.cpp

@@ -21,6 +21,7 @@
 #include <QDebug>
 #include <QQmlApplicationEngine>
 #include <libevm/VM.h>
+#include <libwebthree/WebThree.h>
 #include "Extension.h"
 #include "AppContext.h"
 using namespace dev;