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

Conflicts:
	target/classes/org/itech/klinika/Medicine.class
Merge branch 'master' of https://github.com/capodanno/Klinika

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/klinika/ClinicDetail.class
	target-eclipse/classes/org/itech/klinika/ClinicDetailController.class
	target-eclipse/classes/org/itech/klinika/ClinicDetailControllerTests.class
	target-eclipse/classes/org/itech/klinika/ClinicDetailTests.class
	target-eclipse/classes/org/itech/klinika/Doctor.class
	target-eclipse/classes/org/itech/klinika/DoctorController.class
	target-eclipse/classes/org/itech/klinika/DoctorControllerTests.class
	target-eclipse/classes/org/itech/klinika/DoctorProfile.class
	target-eclipse/classes/org/itech/klinika/DoctorProfileController.class
	target-eclipse/classes/org/itech/klinika/DoctorProfileControllerTests.class
	target-eclipse/classes/org/itech/klinika/DoctorProfileTests.class
	target-eclipse/classes/org/itech/klinika/DoctorTests.class
	target-eclipse/classes/org/itech/klinika/Item.class
	target-eclipse/classes/org/itech/klinika/ItemTests.class
	target-eclipse/classes/org/itech/klinika/Medicine.class
	target-eclipse/classes/org/itech/klinika/MedicineController.class
	target-eclipse/classes/org/itech/klinika/MedicineControllerTests.class
	target-eclipse/classes/org/itech/klinika/MedicineTests.class
	target-eclipse/classes/org/itech/klinika/NormalUser.class
	target-eclipse/classes/org/itech/klinika/NormalUserTests.class
	target-eclipse/classes/org/itech/klinika/Patient.class
	target-eclipse/classes/org/itech/klinika/PatientRecord.class
	target-eclipse/classes/org/itech/klinika/PatientRecordTests.class
	target-eclipse/classes/org/itech/klinika/PatientTests.class
	target-eclipse/classes/org/itech/klinika/Profile.class
	target-eclipse/classes/org/itech/klinika/ProfileTests.class
	target-eclipse/classes/org/itech/klinika/Receptionist.class
	target-eclipse/classes/org/itech/klinika/ReceptionistController.class
	target-eclipse/classes/org/itech/klinika/ReceptionistControllerTests.class
	target-eclipse/classes/org/itech/klinika/ReceptionistProfile.class
	target-eclipse/classes/org/itech/klinika/ReceptionistProfileController.class
	target-eclipse/classes/org/itech/klinika/ReceptionistProfileControllerTests.class
	target-eclipse/classes/org/itech/klinika/ReceptionistProfileTests.class
	target-eclipse/classes/org/itech/klinika/ReceptionistTests.class
	target-eclipse/classes/org/itech/klinika/User.class
	target-eclipse/classes/org/itech/klinika/UserTests.class
	target/classes/org/itech/klinika/DoctorController.class
	target/classes/org/itech/klinika/DoctorProfile.class
	target/classes/org/itech/klinika/DoctorProfileController.class
	target/classes/org/itech/klinika/Medicine.class
	target/classes/org/itech/klinika/NormalUser.class
	target/classes/org/itech/klinika/Profile.class
	target/classes/org/itech/klinika/ReceptionistController.class
	target/classes/org/itech/klinika/ReceptionistProfile.class
	target/classes/org/itech/klinika/ReceptionistProfileController.class
	target/classes/org/itech/klinika/User.class