add
Merge branch 'master' of https://github.com/capodanno/Klinika

Conflicts:
	grails-app/domain/org/itech/klinika/Item.groovy
	target/classes/ApplicationResources.class
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Config.class
	target/classes/DataSource.class
	target/classes/UrlMappings.class
	target/classes/org/itech/klinika/Admin.class
	target/classes/org/itech/klinika/AdminController.class
	target/classes/org/itech/klinika/CheckupInvoice.class
	target/classes/org/itech/klinika/Doctor.class
	target/classes/org/itech/klinika/EventSchedule.class
	target/classes/org/itech/klinika/Invoice$__clinit__closure1.class
	target/classes/org/itech/klinika/Invoice.class
	target/classes/org/itech/klinika/InvoiceController.class
	target/classes/org/itech/klinika/Item$__clinit__closure1.class
	target/classes/org/itech/klinika/Item.class
	target/classes/org/itech/klinika/ItemInvoice.class
	target/classes/org/itech/klinika/Medicine.class
	target/classes/org/itech/klinika/MedicineController.class
	target/classes/org/itech/klinika/NormalUser.class
	target/classes/org/itech/klinika/Patient$__clinit__closure1.class
	target/classes/org/itech/klinika/Patient.class
	target/classes/org/itech/klinika/PatientController.class
	target/classes/org/itech/klinika/Payment.class
	target/classes/org/itech/klinika/Prescription.class
	target/classes/org/itech/klinika/Queue$__clinit__closure1.class
	target/classes/org/itech/klinika/Receptionist.class
	target/classes/org/itech/klinika/ReceptionistController.class
	target/classes/org/itech/klinika/User$__clinit__closure1.class
	target/classes/org/itech/klinika/User.class
	target/classes/resources.class