Merge branch '2.0'

resources/views/dashboard/partials/head.blade.php

@@ -18,7 +18,7 @@
     <link rel="apple-touch-icon" sizes="144x144" href="/img/apple-touch-icon-144x144.png">
     <link rel="apple-touch-icon" sizes="152x152" href="/img/apple-touch-icon-152x152.png">
 
-    <title>@yield('pageTitle', $app_name.' | Cachet')</title>
+    <title>{{ $page_title or $app_name.' | Cachet' }}</title>
 
     <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,700" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="{{ elixir('dist/css/all.css') }}">

resources/views/layout/master.blade.php

@@ -44,9 +44,9 @@
 
     @include('partials.crowdin')
 
-    @if($stylesheet = $app_stylesheet)
+    @if($app_stylesheet)
     <style type="text/css">
-    {!! $stylesheet !!}
+    {!! $app_stylesheet !!}
     </style>
     @endif