Merge branch 'master' into test

* master:
  update: dist
  update: dist

# Conflicts:
#	dist/index.html
#	dist/static/css/app.06aaddd0a0d5cd58132565d996a7f711.css
#	dist/static/css/app.6bafe942e739c8f42027235f8b6f6588.css
#	dist/static/css/app.6fee16a43eaca6bc84a6019d3c6bed13.css
#	dist/static/js/2.3fe422e8635cb4c02a22.js
#	dist/static/js/2.4a5f70a855d2eb6a0db5.js
#	dist/static/js/2.965b51a1eda6328c6dfd.js
#	dist/static/js/manifest.a4bddb26cf7a3ade2c9a.js
#	dist/static/js/manifest.c8586fe57e9fd5dc11a2.js
#	dist/static/js/manifest.f26fa18e57bb4494c173.js