Merge branch 'master' into bounty_with_factory_merged

contracts/test-helpers/StandardTokenMock.sol

@@ -0,0 +1,11 @@
+pragma solidity ^0.4.0;
+import '../StandardToken.sol';
+
+// mock class using StandardToken
+contract StandardTokenMock is StandardToken {
+
+  function StandardTokenMock(address initialAccount, uint initialBalance) {
+    balances[initialAccount] = initialBalance;
+  }
+
+}

contracts/test-helpers/StoppableMock.sol

@@ -0,0 +1,22 @@
+pragma solidity ^0.4.0;
+import '../Stoppable.sol';
+
+// mock class using Stoppable
+contract StoppableMock is Stoppable(msg.sender) {
+  bool public drasticMeasureTaken;
+  uint public count;
+
+  function StoppableMock() Stoppable(msg.sender){
+    drasticMeasureTaken = false;
+    count = 0;
+  }
+
+  function normalProcess() external stopInEmergency {
+    count++;
+  }
+
+  function drasticMeasure() external onlyInEmergency {
+    drasticMeasureTaken = true;
+  }
+
+}