Merge remote-tracking branch 'origin/dev_database' into dev_database

# Conflicts:
#	scripts/transfers/ccscript.bash
#	scripts/transfers/refresh_mat_views.bash
#	scripts/transfers/register_transfer.bash