Merge branch 'develop' into debugger

Conflicts:
	alethzero/MainWin.cpp
	alethzero/MainWin.h

alethzero/Main.ui

@@ -59,6 +59,32 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QTabWidget" name="tabWidget">
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <widget class="QWidget" name="tab_3">
+         <attribute name="title">
+          <string>Tab 1</string>
+         </attribute>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <item>
+           <widget class="QLineEdit" name="urlEdit"/>
+          </item>
+          <item>
+           <widget class="QWebView" name="webView">
+            <property name="url">
+             <url>
+              <string>about:blank</string>
+             </url>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
      </layout>
     </item>
    </layout>
@@ -926,6 +952,13 @@
   </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+  <customwidget>
+   <class>QWebView</class>
+   <extends>QWidget</extends>
+   <header>QtWebKitWidgets/QWebView</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>destination</tabstop>
   <tabstop>calculatedName</tabstop>

alethzero/MainWin.cpp

@@ -268,6 +268,8 @@ Main::Main(QWidget *parent) :
 	QMainWindow(parent),
 	ui(new Ui::Main)
 {
+	g_main = this;
+
 	setWindowFlags(Qt::Window);
 	ui->setupUi(this);
 	g_logPost = [=](std::string const& s, char const* c) { simpleDebugOut(s, c); ui->log->addItem(QString::fromStdString(s)); };
@@ -472,6 +474,11 @@ void Main::readSettings()
 	on_urlEdit_editingFinished();
 }
 
+void Main::on_urlEdit_editingFinished()
+{
+	ui->webView->setUrl(ui->urlEdit->text());
+}
+
 void Main::on_nameReg_textChanged()
 {
 	string s = ui->nameReg->text().toStdString();

alethzero/MainWin.h

@@ -338,6 +338,8 @@ private:
 	std::shared_ptr<ExecutionContext> m_currentExecution;
 
 	QNetworkAccessManager m_webCtrl;
+
+	QEthereum* m_ethereum;
 };
 
 #endif // MAIN_H

libethereum/State.h

@@ -59,6 +59,8 @@ public:
 
 private:
 	State& m_s;
+
+
 };
 
 /**
@@ -133,8 +135,7 @@ public:
 	/// This will append @a _t to the transaction list and change the state accordingly.
 	void execute(bytes const& _rlp) { return execute(&_rlp); }
 	void execute(bytesConstRef _rlp);
-
-
+	std::shared_ptr<ExecutionState> executionState(bytesConstRef _rlp);
 
 	/// Check if the address is a valid normal (non-contract) account address.
 	bool isNormalAddress(Address _address) const;