Merge branch 'case-1510' into develop
Merge branch 'develop' of github.com:artesis/ding_reservation into develop