Merge branch 'hotfix/2.3.6'
working on hourly server uploads
gitignore bat/server_uploads/outputs
Merge branch 'feature/uploads' into hotfix/2.3.7
Merge branch 'hotfix/2.3.7' into develop