Merge remote-tracking branch 'upstream/master' into feat/homepage-redesign

# Conflicts:
#	src/app/common/components/marketing/footer.component.html
#	src/app/common/components/marketing/footer.component.scss
#	src/app/common/components/marketing/styles/general.scss
#	src/app/common/components/marketing/styles/style-2.scss
#	src/app/common/components/marketing/styles/style-3.scss
#	src/app/common/components/marketing/styles/style-4.scss
#	src/app/common/components/marketing/styles/style-tail.scss
#	src/app/modules/blockchain/marketing/token.component.html
#	src/app/modules/blockchain/marketing/token.component.scss
#	src/app/modules/blockchain/marketing/token.component.ts
#	src/app/modules/blockchain/token-purchase/purchase.component.html
#	src/app/modules/blockchain/token-purchase/purchase.component.scss
#	src/app/modules/nodes/marketing/marketing.component.html
#	src/app/modules/plus/marketing.component.html
#	src/app/modules/pro/marketing.component.html
#	src/app/modules/upgrades/upgrade-options.component.html
#	src/app/modules/wire/marketing/marketing.component.html
#	src/assets/product-pages/nodes/nodes-3.jpg
#	src/assets/product-pages/pay/pay-3.jpg
#	src/assets/product-pages/plus/plus-3.jpg
#	src/assets/product-pages/pro/pro-2-ux.png
#	src/assets/product-pages/pro/pro-3.jpg
#	src/assets/product-pages/token/token-4-ux.png