Merge branch 'master' into develop
case 2985 - Proper way to display ready for pickup reservations.
case 2985 - Corrected reservation period update. Corrected reservation deletion check.
Merge branch 'hotfix'