Merge branch 'master' into develop

# Conflicts:
#	jenkins/Jenkinsfile
#	jenkins/env/ganache.production.jenkins.env
#	packages/concordia-app/package.json
#	packages/concordia-app/src/redux/sagas/orbitSaga.js
#	yarn.lock

jenkins/Jenkinsfile

@@ -527,7 +527,7 @@ pipeline {
                   ecentrics/concordia-ganache:latest')
 
                 // Ganache image might take a while to come alive
-                sleep 10
+                sleep 15
 
                 sh 'mkdir -p ./ganache/ && docker cp concordia-ganache-staging:/mnt/concordia/ganache_keys/keys.json ./ganache/'
                 freshGanacheStagingRunning = true
@@ -695,7 +695,7 @@ pipeline {
                   ecentrics/concordia-ganache:latest')
 
                 // Ganache image might take a while to come alive
-                sleep 10
+                sleep 15
 
                 sh 'mkdir -p ./ganache/ && docker cp concordia-ganache-production:/mnt/concordia/ganache_keys/keys.json ./ganache/'
                 freshGanacheProductionRunning = true

jenkins/env/ganache.production.jenkins.env

@@ -1,6 +1,6 @@
 VIRTUAL_HOST=ganache.ecentrics.net,www.ganache.ecentrics.net
 VIRTUAL_PORT=8545
-LETSENCRYPT_HOST=ganache.ecentrics.net,www.LETSENCRYPT_HOST
+LETSENCRYPT_HOST=ganache.ecentrics.net,www.ganache.ecentrics.net
 LETSENCRYPT_EMAIL=ecentricsgr@gmail.com
 
 ACCOUNTS_NUMBER=1000