https://git.trustie.net/fhx569287825/aggregation-platform into web_backend_develope Conflicts: src/com/platform/oracle/OracleConnector.java