Merge remote-tracking branch 'upstream/master'

DBASE/HMS/GEN/KPP_Spring_2017/calib_303.param

DBASE/HMS/GEN/KPP_Spring_2017/general.param

DBASE/HMS/GEN/default_det_calib_files.param

DBASE/HMS/GEN/general.param

DBASE/HMS/STD/standard.database

DBASE/HMS/general.param

DBASE/HMS/standard.database

DBASE/HMS/standard.kinematics

DBASE/SHMS/GEN/Fall_Comm_2017/calib_1583.param

DBASE/SHMS/GEN/Fall_Comm_2017/calib_1585.param

DBASE/SHMS/GEN/Fall_Comm_2017/calib_1586.param

DBASE/SHMS/GEN/KPP_Spring_2017/calib_464.param

DBASE/SHMS/GEN/KPP_Spring_2017/calib_469.param

DBASE/SHMS/GEN/KPP_Spring_2017/calib_475.param

DBASE/SHMS/GEN/KPP_Spring_2017/calib_478.param

DBASE/SHMS/GEN/KPP_Spring_2017/calib_479.param

DBASE/SHMS/GEN/KPP_Spring_2017/calib_480.param

DBASE/SHMS/GEN/KPP_Spring_2017/calib_481.param

DBASE/SHMS/GEN/KPP_Spring_2017/calib_483.param

DBASE/SHMS/GEN/KPP_Spring_2017/calib_484.param