Merge branch 'master' into release

diff --combined .gitignore
index 15b034ad6a793ca9c5bc966312d47e8564ad5b68,5f41a864e58092fd0467efe1ffbeac7c6dd8558c..d7281b29ce7564631d16e346ed2686cf7c6430ca
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -5,12 -5,19 +5,19 @@@ Homestead.yam
  /public/dist
  .idea
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
  /public/bower
  /storage/images
  _ide_helper.php
  /storage/debugbar
  .phpstorm.meta.php
  yarn.lock
- /bin
+ /bin
+ .buildpath
+ 
+ .project
+ 
+ .settings/org.eclipse.wst.common.project.facet.core.xml
+ 
+ .settings/org.eclipse.php.core.prefs