AM-139: Expose core Appointment module objects via REST
Added query method for AppointmentBlock
Also changed AppointmentBlock service method so that it does not return voided appointments
Merge branch 'master' of https://github.com/PIH/openmrs-module-appointment

Conflicts:
	api/src/test/java/org/openmrs/module/appointmentscheduling/api/AppointmentBlockServiceTest.java
	omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/AppointmentResource1_9.java
	omod/src/main/java/org/openmrs/module/appointmentscheduling/rest/resource/openmrs1_9/TimeSlotResource1_9.java