Merge branch 'master' into spencer/pwa

# Conflicts:
#	angular.json
#	package.json

src/environments/environment.dev.ts

@@ -0,0 +1,16 @@
+import {NgxLoggerLevel} from 'ngx-logger';
+
+export const environment = {
+  production: false,
+  bloxbergChainId: 8996,
+  logLevel: NgxLoggerLevel.ERROR,
+  serverLogLevel: NgxLoggerLevel.OFF,
+  loggingUrl: '',
+  cicMetaUrl: 'https://meta.dev.grassrootseconomics.net',
+  publicKeysUrl: 'https://dev.grassrootseconomics.net/.well-known/publickeys/',
+  cicCacheUrl: 'https://cache.dev.grassrootseconomics.net',
+  web3Provider: 'wss://bloxberg-ws.dev.grassrootseconomics.net',
+  cicUssdUrl: 'https://ussd.dev.grassrootseconomics.net',
+  registryAddress: '0xAf1B487491073C2d49136Db3FD87E293302CF839',
+  trustedDeclaratorAddress: '0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C'
+};

src/environments/environment.prod.ts

@@ -1,3 +1,16 @@
+import {NgxLoggerLevel} from 'ngx-logger';
+
 export const environment = {
-  production: true
+  production: true,
+  bloxbergChainId: 8996,
+  logLevel: NgxLoggerLevel.ERROR,
+  serverLogLevel: NgxLoggerLevel.OFF,
+  loggingUrl: '',
+  cicMetaUrl: 'https://meta.dev.grassrootseconomics.net',
+  publicKeysUrl: 'https://dev.grassrootseconomics.net/.well-known/publickeys/',
+  cicCacheUrl: 'https://cache.dev.grassrootseconomics.net',
+  web3Provider: 'wss://bloxberg-ws.dev.grassrootseconomics.net',
+  cicUssdUrl: 'https://ussd.dev.grassrootseconomics.net',
+  registryAddress: '0xAf1B487491073C2d49136Db3FD87E293302CF839',
+  trustedDeclaratorAddress: '0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C'
 };

src/environments/environment.ts

@@ -1,3 +1,16 @@
+import {NgxLoggerLevel} from 'ngx-logger';
+
 export const environment = {
-  production: false
+  production: false,
+  bloxbergChainId: 8996,
+  logLevel: NgxLoggerLevel.ERROR,
+  serverLogLevel: NgxLoggerLevel.OFF,
+  loggingUrl: 'http://localhost:8000',
+  cicMetaUrl: 'https://meta.dev.grassrootseconomics.net',
+  publicKeysUrl: 'http://localhost:8000/keys.asc',
+  cicCacheUrl: 'https://cache.dev.grassrootseconomics.net',
+  web3Provider: 'ws://localhost:63546',
+  cicUssdUrl: 'https://ussd.dev.grassrootseconomics.net',
+  registryAddress: '0x6Ca3cB14aA6F761712E1C18646AfBA4d5Ae249E8',
+  trustedDeclaratorAddress: '0xEb3907eCad74a0013c259D5874AE7f22DcBcC95C'
 };