Merge branch 'master' into release

diff --combined .gitignore
index 00602d29a4fa1ffe58536a29c9492dc053b77dc2,be86e5a039260cdbfa6aa32f667e5c1db286d201..a080d4df78b2c8010490a696d429bb8014fe649b
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -2,11 -2,13 +2,13 @@@
  /node_modules
  Homestead.yaml
  .env
- /public/dist
  .idea
+ npm-debug.log
+ yarn-error.log
+ /public/dist
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
  /public/build/
  /storage/images
@@@ -18,5 -20,4 +20,4 @@@ yarn.loc
  nbproject
  .buildpath
  .project
- .settings/org.eclipse.wst.common.project.facet.core.xml
- .settings/org.eclipse.php.core.prefs
+ .settings/