Merge branch 'case-2045' into develop
Merge branch 'develop' of github.com:artesis/ding_reservation into develop
Merge branch 'master' into develop
case 2045 - Fix unsupported operand types PHP error.
Merge branch 'develop' of github.com:artesis/ding_reservation into develop
Merge branch 'case-2045' into develop

Conflicts:
	ding_reservation.module
case 2305 - Change date format.
Merge branch 'case-2305' into develop
Merge remote-tracking branch 'origin/develop'