fix rms
complete module booking
merge hung vs khanh