Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml
#	resources/views/main.blade.php

resources/views/layouts/user_new.blade.php

@@ -58,7 +58,7 @@
         <strong>Fazoshop</strong>
     </a>
     <nav class="my-2 my-md-0 mr-md-3 top-menu">
-        <a class="p-2 text-dark" href="#">На главную</a>
+        <a class="p-2 text-dark" href="/main">На главную</a>
         <a class="p-2 text-dark" href="{{ route('package') }}">Посылки</a>
         <a class="p-2 text-dark" href="{{ route('address') }}">Адреса</a>
         <a class="p-2 text-dark" href="{{ url('/profile') }}">Профиль</a>
@@ -95,8 +95,8 @@
         <div class="container">
             <div class="row">
                 <div class="col-12 col-md">
-                    <img class="mb-2" src="/docs/4.3/assets/brand/bootstrap-solid.svg" alt="" width="24" height="24">
-                    <small class="d-block mb-3 text-muted">&copy; 2017-2019</small>
+                    <img class="mb-2" src="{{ url('/assets/img/icon/logo.png') }}" alt="" width="24" height="24">
+                    <small class="d-block mb-3 text-muted">&copy; 2019</small>
                 </div>
                 <div class="col-6 col-md">
                     <h5>Клиентам</h5>

resources/views/pages/tarifs/index.blade.php

-@extends('layouts.app')
+@extends('layouts.user')
 @section('page-title', 'Мои посылки')
 @section('content')