Merge branch 'master' into ui-2

# Conflicts:
#	Cargo.lock
#	ethcore/src/evm/instructions.rs
#	js/package.json
#	js/src/modals/CreateAccount/AccountDetails/accountDetails.js
#	js/src/modals/FirstRun/TnC/tnc.js
#	js/src/modals/FirstRun/Welcome/welcome.js
#	js/src/ui/Form/Input/input.js
#	js/src/views/Accounts/accounts.js
#	js/src/views/Settings/Views/defaults.js
#	js/src/views/Settings/Views/views.js
#	js/webpack/app.js
#	js/webpack/libraries.js

js/src/api/contract/contract.js

@@ -177,19 +177,26 @@ export default class Contract {
           return null;
         }
 
-        const decoded = event.decodeLog(log.topics, log.data);
+        try {
+          const decoded = event.decodeLog(log.topics, log.data);
 
-        log.params = {};
-        log.event = event.name;
+          log.params = {};
+          log.event = event.name;
 
-        decoded.params.forEach((param, index) => {
-          const { type, value } = param.token;
-          const key = param.name || index;
+          decoded.params.forEach((param, index) => {
+            const { type, value } = param.token;
+            const key = param.name || index;
 
-          log.params[key] = { type, value };
-        });
+            log.params[key] = { type, value };
+          });
 
-        return log;
+          return log;
+        } catch (error) {
+          console.warn('Error decoding log', log);
+          console.warn(error);
+
+          return null;
+        }
       })
       .filter((log) => log);
   }

js/src/shell/FirstRun/Welcome/welcome.js

@@ -28,7 +28,7 @@ const LOGO_STYLE = {
   margin: '0 1.5em'
 };
 
-export default function FirstRun () {
+export default function Welcome () {
   return (
     <div className={ styles.welcome }>
       <img