Merge branch 'master' into 'status-plots'

# Conflicts:
#   atdb/taskdatabase/templates/taskdatabase/graphs/status_graph.html
#   atdb/taskdatabase/templates/taskdatabase/graphs/status_graph_input_form.html
#   atdb/taskdatabase/templates/taskdatabase/index.html