Merge branch 'master' of http://115.159.76.241/marketing-web/marketing

# Conflicts:
#	dist/index.html
#	dist/static/css/main.35b5ff025b4d54e9c01de91dab923bc8.css
#	dist/static/css/main.675b3b8cbe39453a837c45c73bbe330b.css
#	dist/static/css/main.a133375d8f5538a1db50850095cd8c05.css
#	dist/static/js/manifest.d824dd9a9f21a1f1d363.js
#	src/views/card/form.js