configure DataSource.groovy
FollowUpAppointment.groovy
Merge branch 'master' of https://github.com/jonahktjala/Klinikav2

Conflicts:
	target/classes/ApplicationResources.class
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Config.class
	target/classes/DataSource.class
	target/classes/UrlMappings$__clinit__closure1.class
	target/classes/UrlMappings$__clinit__closure1_closure2.class
	target/classes/UrlMappings.class
	target/classes/application.properties
	target/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLog.class
	target/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLogController.class
	target/classes/org/itech/klinikav2/domain/CheckUpLog.class
	target/classes/org/itech/klinikav2/domain/CheckUpPaymentLog.class
	target/classes/org/itech/klinikav2/domain/Clinic.class
	target/classes/org/itech/klinikav2/domain/Diagnosis.class
	target/classes/org/itech/klinikav2/domain/FollowUpCheckUpLog.class
	target/classes/org/itech/klinikav2/domain/Inventory.class
	target/classes/org/itech/klinikav2/domain/Item.class
	target/classes/org/itech/klinikav2/domain/ItemController.class
	target/classes/org/itech/klinikav2/domain/ItemNotifier.class
	target/classes/org/itech/klinikav2/domain/LabRequestFormLog.class
	target/classes/org/itech/klinikav2/domain/LaboratoryResult.class
	target/classes/org/itech/klinikav2/domain/Log.class
	target/classes/org/itech/klinikav2/domain/LogCreator.class
	target/classes/org/itech/klinikav2/domain/LogInLog.class
	target/classes/org/itech/klinikav2/domain/LogOutLog.class
	target/classes/org/itech/klinikav2/domain/MedicalHistory.class
	target/classes/org/itech/klinikav2/domain/Patient.class
	target/classes/org/itech/klinikav2/domain/PatientController.class
	target/classes/org/itech/klinikav2/domain/Payment.class
	target/classes/org/itech/klinikav2/domain/Prescription.class
	target/classes/org/itech/klinikav2/domain/PrescriptionFormLog.class
	target/classes/org/itech/klinikav2/domain/PurchaseLog.class
	target/classes/org/itech/klinikav2/domain/Referral.class
	target/classes/org/itech/klinikav2/domain/ReportGenerator.class
	target/classes/org/itech/klinikav2/domain/VitalSigns.class
	target/classes/org/itech/klinikav2/enums/ActivityType.class
	target/classes/org/itech/klinikav2/enums/Gender.class
	target/classes/org/itech/klinikav2/enums/ItemType.class
	target/classes/org/itech/klinikav2/enums/MaritalStatus.class
	target/classes/org/itech/klinikav2/enums/PaymentOption.class
	target/classes/resources$_run_closure1.class
	target/classes/resources.class