Merge branch 'master' into release ready for v0.14

diff --combined .gitignore
index 919b3e75d252eb4df0ccaec5818d65afe1fabfd7,83b754c04dd64c9ba813f6bacb933a1d3a58faec..15b034ad6a793ca9c5bc966312d47e8564ad5b68
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -5,11 -5,12 +5,12 @@@ 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