Merge branch 'newScheduleViewXianhui' into dev
Update Scheduling Preferences in DB
Merge branch 'dev' into newScheduleViewXianhui