Merge branch 'dev' into 'gallery'
Nikola Chuchukovski authored
# Conflicts:
#   AdminPanel-Marinov/app/Http/Controllers/Admin/ProductController.php
#   AdminPanel-Marinov/resources/views/layouts/navigation.blade.php
#   AdminPanel-Marinov/routes/web.php
f0836ec3