Merge branch 'zos-release' of github.com:OpenZeppelin/zeppelin-solidity into zos-release

package.json

@@ -63,6 +63,7 @@
   },
   "dependencies": {
     "dotenv": "^4.0.0",
-    "zos-lib": "git://github.com/zeppelinos/zos-lib.git"
+    "zos": "^0.3.7",
+    "zos-lib": "0.0.5"
   }
 }

package.zos.json

+{
+  "contracts": {
+    "DetailedMintableToken": "DetailedMintableToken",
+    "DetailedPremintedToken": "DetailedPremintedToken",
+    "MintableERC721Token": "MintableERC721Token",
+    "TokenTimelock": "TokenTimelock",
+    "TokenVesting": "TokenVesting"
+  },
+  "name": "openzeppelin-zos"
+}

truffle-config.js

@@ -24,8 +24,11 @@ module.exports = {
       network_id: '*', // eslint-disable-line camelcase
     },
     ropsten: {
-      provider: ropstenProvider,
-      network_id: 3, // eslint-disable-line camelcase
+      host: 'localhost',
+      network_id: '3',
+      port: 8555,
+      gas: 4700000,
+      gasPrice: 10e9,
     },
     coverage: {
       host: 'localhost',