3rd commit
Merge github.com:capodanno/Klinika

Conflicts:
	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/NormalUser.class
	target-eclipse/classes/org/itech/klinika/NormalUserTests.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/User.class
3.1 commit
3.2 commit