Merge branch 'development' into release

diff --combined .gitignore
index a8d2e6af7d581f1fd4b115c3dcfd76d66623abb3,3582c410221e9b3c7b532f5f0277f4a5d4121093..15f8eeb6e973632950132b48788aae6fe3987659
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -2,15 -2,16 +2,16 @@@
  /node_modules
  /.vscode
  /composer
+ /coverage
  Homestead.yaml
  .env
  .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