Merge branch 'master' of https://gitlab.com/dreal-datalab/datalibaba

# Conflicts:
#	R/check_server_renviron.R
#	man/check_server_renviron.Rd