Merge branch 'dev-2.1.0' into remove-blocking-MATM

Author: maxsam4

contracts/modules/STO/CappedSTOFactory.sol

@@ -16,7 +16,7 @@ contract CappedSTOFactory is ModuleFactory {
     constructor (address _polyAddress, uint256 _setupCost, uint256 _usageCost, uint256 _subscriptionCost) public
     ModuleFactory(_polyAddress, _setupCost, _usageCost, _subscriptionCost)
     {
-        version = "1.0.0";
+        version = "2.1.0";
         name = "CappedSTO";
         title = "Capped STO";
         description = "This smart contract creates a maximum number of tokens (i.e. hard cap) which the total aggregate of tokens acquired by all investors cannot exceed. Security tokens are sent to the investor upon reception of the funds (ETH or POLY), and any security tokens left upon termination of the offering will not be minted.";

contracts/modules/TransferManager/ManualApprovalTransferManagerFactory.sol

@@ -18,7 +18,7 @@ contract ManualApprovalTransferManagerFactory is ModuleFactory {
     constructor (address _polyAddress, uint256 _setupCost, uint256 _usageCost, uint256 _subscriptionCost) public
     ModuleFactory(_polyAddress, _setupCost, _usageCost, _subscriptionCost)
     {
-        version = "2.0.1";
+        version = "2.1.0";
         name = "ManualApprovalTransferManager";
         title = "Manual Approval Transfer Manager";
         description = "Manage transfers using single approvals";

test/b_capped_sto.js

@@ -868,7 +868,7 @@ contract("CappedSTO", accounts => {
                 );
                 let tags = await I_CappedSTOFactory.getTags.call();
                 assert.equal(web3.utils.hexToString(tags[0]), "Capped");
-                assert.equal(await I_CappedSTOFactory.version.call(), "1.0.0");
+                assert.equal(await I_CappedSTOFactory.version.call(), "2.1.0");
             });
 
             it("Should fail to change the title -- bad owner", async () => {

test/j_manual_approval_transfer_manager.js

@@ -811,7 +811,7 @@ contract("ManualApprovalTransferManager", accounts => {
                 "Allows an issuer to set manual approvals for specific pairs of addresses and amounts. Init function takes no parameters.",
                 "Wrong Module added"
             );
-            assert.equal(await I_ManualApprovalTransferManagerFactory.version.call(), "2.0.1");
+            assert.equal(await I_ManualApprovalTransferManagerFactory.version.call(), "2.1.0");
         });
 
         it("Should get the tags of the factory", async () => {