added first test for merging reserved time slots in with the default time slots
Merge branch 'develop' of https://github.com/objectpartners/cloaked-archer into develop

Conflicts:
	grails-app/services/com/objectpartners/rezr/TimeSlotService.groovy
	test/unit/com/objectpartners/rezr/TimeSlotServiceSpec.groovy
Merge branch 'develop' of https://github.com/objectpartners/cloaked-archer into develop