Merge branch 'develop' of github.com:laravel/laravel into develop

Conflicts:
	gulpfile.js

gulpfile.js

@@ -12,7 +12,7 @@ var elixir = require('laravel-elixir');
  */
 
 elixir(function(mix) {
-    mix.sass("app.scss")
+    mix.sass('app.scss')
        .publish(
             'jquery/dist/jquery.min.js',
             'public/js/vendor/jquery.js'