Merge branch 'master' into develop
case 1778 - Reservation deletion option setting.
Merge branch 'case-1778' into develop
case 2131 - Fixed logic for reservation update.
Merge branch 'case-2131' into develop
Merge remote-tracking branch 'origin/develop'