Merge branch 'master' of https://github.com/hillelcoren/invoice-ninja

composer.json

@@ -33,7 +33,7 @@
         "coatesap/omnipay-realex": "~2.0",
         "fruitcakestudio/omnipay-sisow": "~2.0",
         "alfaproject/omnipay-skrill": "dev-master",
-        "illuminate/html": "5.*",
+		"laravelcollective/html": "~5.0",
         "omnipay/bitpay": "dev-master"
 	},
 	"require-dev": {

config/app.php

@@ -146,7 +146,7 @@ return [
 		'Intervention\Image\ImageServiceProvider',
     	'Webpatser\Countries\CountriesServiceProvider',
     	'Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider',
-    	'Illuminate\Html\HtmlServiceProvider',
+		'Collective\Html\HtmlServiceProvider',
 
 		/*
 		 * Application Service Providers...
@@ -244,8 +244,8 @@ return [
 		// Added Class Aliases
 
 		'Utils'			  => 'App\Libraries\Utils',
-		'Form'			  => 'Illuminate\Html\FormFacade',
-		'HTML'			  => 'Illuminate\Html\HtmlFacade',
+		'Form'			  => 'Collective\Html\FormFacade',
+		'Html'			  => 'Collective\Html\HtmlFacade',
 		'SSH' 			  => 'Illuminate\Support\Facades\SSH',
 		'Alert'           => 'Bootstrapper\Facades\Alert',
 		'Badge'           => 'Bootstrapper\Facades\Badge',

resources/views/master.blade.php

@@ -15,7 +15,7 @@
     <meta property="og:description" content="Simple, Intuitive Invoicing." />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="csrf-token" content="<?= csrf_token() ?>">
+    <meta name="csrf-token" content="{!! csrf_field() !!}">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
     <link href="//fonts.googleapis.com/css?family=Roboto:400,700,900,100" rel="stylesheet" type="text/css">