Merge branch 'master' into settings

Conflicts:
	mitmproxy/web/static/app.css
	mitmproxy/web/static/app.js
	web/src/js/components/ProxyApp.jsx

1 files changed, 16 insertions, 0 deletions

diff --git a/web/src/js/components/common/Button.jsx b/web/src/js/components/common/Button.jsx
new file mode 100644
index 00000000..cc2fe9dd
--- /dev/null
+++ b/web/src/js/components/common/Button.jsx
@@ -0,0 +1,16 @@
+import React, { PropTypes } from 'react'
+
+Button.propTypes = {
+    onClick: PropTypes.func.isRequired,
+    text: PropTypes.string.isRequired
+}
+
+export default function Button({ onClick, text, icon }) {
+    return (
+        <div className={"btn btn-default"} onClick={onClick}>
+            <i className={"fa fa-fw " + icon}/>
+            &nbsp;
+            {text}
+        </div>
+    )
+}