Create ColonyRewards.sol, reorganize ColonyFunding, allow funding with multiple tokens at once

Author: kronosapiens

contracts/colony/Colony.sol

@@ -26,10 +26,10 @@ import "./ColonyStorage.sol";
 
 contract Colony is BasicMetaTransaction, ColonyStorage, PatriciaTreeProofs {
 
-  // V8: Ebony Lightweight Spaceship
+  // V10: Ginger Lightweight Spaceship
   // This function, exactly as defined, is used in build scripts. Take care when updating.
   // Version number should be upped with every change in Colony or its dependency contracts or libraries.
-  function version() public pure returns (uint256 colonyVersion) { return 9; }
+  function version() public pure returns (uint256 colonyVersion) { return 10; }
 
   function getColonyNetwork() public view returns (address) {
     return colonyNetworkAddress;

contracts/colony/ColonyAuthority.sol

@@ -125,8 +125,9 @@ contract ColonyAuthority is CommonAuthority {
     addRoleCapability(ARCHITECTURE_ROLE, "deprecateDomain(uint256,uint256,uint256,bool)");
     addRoleCapability(ROOT_ROLE, "editColonyByDelta(string)");
 
-    // Added in colony v10 (g-lwss)
+    // Added in colony v10 (ginger-lwss)
     addRoleCapability(ARBITRATION_ROLE, "setExpenditurePayouts(uint256,uint256,uint256,uint256[],address,uint256[])");
+    addRoleCapability(FUNDING_ROLE, "moveFundsBetweenPots(uint256,uint256,uint256,uint256,uint256,uint256,uint256,uint256[],address[])");
   }
 
   function addRoleCapability(uint8 role, bytes memory sig) private {

contracts/colony/ColonyExpenditure.sol

@@ -283,7 +283,8 @@ contract ColonyExpenditure is ColonyStorage {
     expenditureExists(_id)
     authDomain(_permissionDomainId, _childSkillIndex, expenditures[_id].domainId)
   {
-    // Only allow editing expenditure status, owner, and finalizedTimestamp
+    // Only allow editing expenditure status, owner, finalizedTimestamp, and globalClaimDelay
+    //  Do not allow editing of fundingPotId or domainId
     //  Note that status + owner occupy one slot
     if (_storageSlot == EXPENDITURES_SLOT) {
       require(_keys.length == 1, "colony-expenditure-bad-keys");