gien commit
Merge branch 'master' of https://github.com/jonahktjala/Klinikav2

Conflicts:
	target-eclipse/classes/JQueryResourceTagLib.class
	target-eclipse/classes/JQueryTagLib.class
	target-eclipse/classes/grails/plugin/cache/CacheTagLib.class
	target-eclipse/classes/grails/plugin/databasemigration/DbdocController.class
	target-eclipse/classes/org/grails/plugin/resource/ResourceTagLib.class
	target-eclipse/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLogController.class
	target-eclipse/classes/org/itech/klinikav2/domain/AppointmentBalancePaymentLogControllerTests.class
	target-eclipse/classes/org/itech/klinikav2/domain/CheckUpLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/CheckUpPaymentLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/Clinic.class
	target-eclipse/classes/org/itech/klinikav2/domain/Diagnosis.class
	target-eclipse/classes/org/itech/klinikav2/domain/FollowUpCheckUpLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/Inventory.class
	target-eclipse/classes/org/itech/klinikav2/domain/Item.class
	target-eclipse/classes/org/itech/klinikav2/domain/ItemNotifier.class
	target-eclipse/classes/org/itech/klinikav2/domain/LabRequestFormLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/LaboratoryResult.class
	target-eclipse/classes/org/itech/klinikav2/domain/Log.class
	target-eclipse/classes/org/itech/klinikav2/domain/LogCreator.class
	target-eclipse/classes/org/itech/klinikav2/domain/LogInLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/LogOutLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/MedicalHistory.class
	target-eclipse/classes/org/itech/klinikav2/domain/Patient.class
	target-eclipse/classes/org/itech/klinikav2/domain/Payment.class
	target-eclipse/classes/org/itech/klinikav2/domain/Prescription.class
	target-eclipse/classes/org/itech/klinikav2/domain/PrescriptionFormLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/PurchaseLog.class
	target-eclipse/classes/org/itech/klinikav2/domain/Referral.class
	target-eclipse/classes/org/itech/klinikav2/domain/ReportGenerator.class
	target-eclipse/classes/org/itech/klinikav2/domain/VitalSigns.class
	target/classes/org/itech/klinikav2/domain/Patient.class
Merge branch 'master' of https://github.com/jonahktjala/Klinikav2
gienie view v1.0
gienie v1.1