Merge branch 'develop' into feature/meal-planning

# Conflicts:
#	requirements.txt

cookbook/urls.py

@@ -14,6 +14,7 @@ router.register(r'meal-type', api.MealTypeViewSet)
 urlpatterns = [
     path('', views.index, name='index'),
     path('setup/', views.setup, name='view_setup'),
+    path('system/', views.system, name='view_system'),
     path('search/', views.search, name='view_search'),
     path('books/', views.books, name='view_books'),
     path('plan/', views.meal_plan, name='view_plan'),