Merge branch 'master' into release

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

diff --combined version
index 1c29999c8dc9d14ec52c9bfbe5f178f3ae25040d,de0ad77915bab6a1a85aa60ba37a325637f2ada4..2a8eccd9e299167bc71f7356c2065200bed903f2
--- 1/version
--- 2/version
+++ b/version
@@@ -1,1 -1,1 +1,1 @@@
- v0.17.4
 -v0.18-dev
++v0.18