Merge branch 'develop' into ldap

.env.template

@@ -1,6 +1,7 @@
 # only set this to true when testing/debugging
 # when unset: 1 (true) - dont unset this, just for development
 DEBUG=0
+SQL_DEBUG=0
 
 # hosts the application can run under e.g. recipes.mydomain.com,cooking.mydomain.com,...
 ALLOWED_HOSTS=*
@@ -78,6 +79,8 @@ GUNICORN_MEDIA=0
 # when unset: 0 (false)
 REVERSE_PROXY_AUTH=0
 
+# If base URL is something other than just /  (you are serving a subfolder in your proxy for instance http://recipe_app/recipes/)
+# SCRIPT_NAME=/recipes
 # Default settings for spaces, apply per space and can be changed in the admin view
 # SPACE_DEFAULT_MAX_RECIPES=0 # 0=unlimited recipes
 # SPACE_DEFAULT_MAX_USERS=0 # 0=unlimited users per space
@@ -117,8 +120,14 @@ REVERSE_PROXY_AUTH=0
 # Django session cookie settings. Can be changed to allow a single django application to authenticate several applications
 # when running under the same database
 # SESSION_COOKIE_DOMAIN=.example.com
-# SESSION_COOKIE_NAME=sessionid # use this only to not interfere with non unified django applications under the same top level domain
 
+# by default SORT_TREE_BY_NAME is disabled this will store all Keywords and Food in the order they are created
+# enabling this setting makes saving new keywords and foods very slow, which doesn't matter in most usecases.
+# however, when doing large imports of recipes that will create new objects, can increase total run time by 10-15x
+# Keywords and Food can be manually sorted by name in Admin
+# This value can also be temporarily changed in Admin, it will revert the next time the application is started
+# This will be fixed/changed in the future by changing the implementation or finding a better workaround for sorting
+# SORT_TREE_BY_NAME=0
 # LDAP authentication
 # default 0 (false), when 1 (true) list of allowed users will be fetched from LDAP server
 #LDAP_AUTH=