# Conflicts:
#	src/motion_ctrl/stagesX/multiStageX.cpp

Addedd closed-loop option to offset_and_scicam template, and updated the parameters in cal_Flux, based on it

# Conflicts:
#	src/scripts/templates/SHINS_SW_TEST/SHINS_TEST_DEBUG.py
#	src/scripts/templates/ob/SHARKNIR_gen_tiptilt_init.xml
#	src/track_ctrl/trackingCtrl.cpp

P2.10 after PSFAlignment tests with centroid and tiptilt. Will have to implement removeHotPixels and CDS stack.

Now SHARKNIR_gen_base is used also for SHARKNIR_*_obs. Changed TelescopeFlatField and InstrumentFlatField to provide just a 5 NREADS ramp. lss_cal templates are now based on the new SHARKNIR_gen_tiptilt_offset_and_scicam template