Merge branch 'GGMAC' into 'master'

update

See merge request !1535

src/container/Progress/TableProgressReport.js

+import React, { Component } from "react";
 import { createMuiTheme, FormControlLabel, Input, MuiThemeProvider, TableCell, Typography } from "@material-ui/core";
 import MUIDataTable from "mui-datatables";
-import React, { Component } from "react";
 import NumberFormat from "react-number-format";
 import * as R from "ramda";
 

src/library/CustomTable.js

+import React from 'react';
+
 var mainColor = "#fff"
 var secondColor = "#f6f6f6"