Merge branch 'development' into release

diff --combined .gitignore
index ede4fe29601642d47a2c4b0614f20e8020dd934f,55cc0557b8cae37a6d43840238b9eb06cb7b9cc0..a8d2e6af7d581f1fd4b115c3dcfd76d66623abb3
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -7,10 -7,10 +7,10 @@@ Homestead.yam
  .idea
  npm-debug.log
  yarn-error.log
 -/public/dist
 +/public/dist/*.map
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
  /public/build/
  /public/favicon.ico
@@@ -29,4 -29,5 +29,5 @@@ webpack-stats.jso
  .phpunit.result.cache
  .DS_Store
  phpstan.neon
- esbuild-meta.json
+ esbuild-meta.json
+ .phpactor.json