Merge branch 'develop' into fix/menu-header

Author: geoffguillain

.gitignore

@@ -29,6 +29,8 @@ themes/*
 upgrade/*
 uploads/*
 languages/*
+database/*
+db.php
 
 # Created by https://www.toptal.com/developers/gitignore/api/macos,linux,windows,node,yarn,composer,phpstorm+all,visualstudiocode,sublimetext
 # Edit at https://www.toptal.com/developers/gitignore?templates=macos,linux,windows,node,yarn,composer,phpstorm+all,visualstudiocode,sublimetext