Merge branch 'master' into release

diff --cc .gitignore
index 3f3dfdc3df1eb0a6387b9d769b248de891293bf0,69f0e2909a00e186026d2f62c46286459d74e675..65c56ebbb64c7f1d1df9dbcb0b0ad09a944c7138
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -5,9 -5,8 +5,8 @@@ Homestead.yam
  /public/dist
  .idea
  /public/plugins
 -/public/css
 -/public/js
 +/public/css/*.map
 +/public/js/*.map
- /public/uploads
  /public/bower
  /storage/images
  _ide_helper.php