Commits

Merge branch 'master' into develop # Conflicts: # api.flarecast/scripts/algorithm_selection.js # api.flarecast/scripts/script.js # maintenance_scripts/restart/cluster.yml Merge SSA-Api into develop branch
Merge branch 'master' into develop # Conflicts: # api.flarecast/scripts/algorithm_selection.js # api.flarecast/scripts/script.js # maintenance_scripts/restart/cluster.yml Merge SSA-Api into develop branch