Merge remote-tracking branch 'origin/master'

Conflicts:
	IdGen/idgen.cpp
	IdGen/idgen.h
	KeyFinder/keyfinder.cpp
	KeyFinder/keyfinder.h
	about/aboutdialog.cpp
	about/aboutdialog.h
	adddetails/additembutton.cpp
	adddetails/additembutton.h
	adddetails/additemwidget.cpp
	adddetails/additemwidget.h
	appointmentbutton.cpp
	appointmentbutton.h
	appointmentlist.cpp
	appointmentlist.h
	changepasswid.cpp
	changepasswid.h
	config/config.cpp
	config/config.h
	configdialog.cpp
	configdialog.h
	deletewid.cpp
	deletewid.h
	errorfiledialog.cpp
	errorfiledialog.h
	fatalmessage.cpp
	fatalmessage.h
	fatalnotavail.cpp
	fatalnotavail.h
	filecreationerr.cpp
	filecreationerr.h
	main.cpp
	mainwidget.cpp
	mainwidget.h
	model/allergen.cpp
	model/allergen.h
	model/appointment.cpp
	model/appointment.h
	model/drug.cpp
	model/drug.h
	model/familyhistory.cpp
	model/familyhistory.h
	model/investigation.cpp
	model/investigation.h
	model/surgery.cpp
	model/surgery.h
	model/symptom.cpp
	model/symptom.h
	model/vaccine.cpp
	model/vaccine.h
	newuserdialog.cpp
	newuserdialog.h
	passdialog.cpp
	passdialog.h
	passdialoginfo.cpp
	passdialoginfo.h
	passman/passman.cpp
	passman/passman.h
	search-engine/addnewdisease.cpp
	search-engine/addnewdisease.h
	search-engine/dialogright.cpp
	search-engine/dialogright.h
	search-engine/engine/engine.cpp
	search-engine/engine/engine.h
	search-engine/engine/indexitem.cpp
	search-engine/engine/indexitem.h
	search-engine/itembutton.cpp
	search-engine/itembutton.h
	search-engine/itemlist.cpp
	search-engine/itemlist.h
	search-engine/linkdiseasedialog.cpp
	search-engine/linkdiseasedialog.h
	search-engine/searchwidget.cpp
	search-engine/searchwidget.h
	search-engine/widgets/filterdialog.cpp
	search-engine/widgets/filterdialog.h
	search-engine/widgets/itemwidget.cpp
	search-engine/widgets/itemwidget.h
	search-engine/widgets/rwid.cpp
	search-engine/widgets/rwid.h
	search-engine/widgets/typedatewid.cpp
	search-engine/widgets/typedatewid.h
	search-engine/xdisease/xdisease.h
	stillcam/stillcam.cpp
	stillcam/stillcam.h
	ui/Allergen/add/addallergenwid.cpp
	ui/Allergen/add/addallergenwid.h
	ui/Allergen/add/bottom.cpp
	ui/Allergen/add/bottom.h
	ui/Allergen/add/middle.cpp
	ui/Allergen/add/middle.h
	ui/Allergen/add/upper.cpp
	ui/Allergen/add/upper.h
	ui/Allergen/display/displayallergenwid.cpp
	ui/Allergen/display/displayallergenwid.h
	ui/Allergen/edit/editallergenwid.cpp
	ui/Allergen/edit/editallergenwid.h
	ui/Allergen/edit/editbottom.cpp
	ui/Allergen/edit/editbottom.h
	ui/Allergen/edit/editmiddle.cpp
	ui/Allergen/edit/editmiddle.h
	ui/Allergen/edit/editupper.cpp
	ui/Allergen/edit/editupper.h
	ui/Appointment/add/addappointmentwid.cpp
	ui/Appointment/add/addappointmentwid.h
	ui/Appointment/add/appointmentbottombar.cpp
	ui/Appointment/add/appointmentbottombar.h
	ui/Appointment/add/appointmentdatetimewid.cpp
	ui/Appointment/add/appointmentdatetimewid.h
	ui/Appointment/add/appointmentlinkwid.cpp
	ui/Appointment/add/appointmentlinkwid.h
	ui/Appointment/add/appointmentnamewid.cpp
	ui/Appointment/add/appointmentnamewid.h
	ui/Appointment/display/displayappointmentwid.cpp
	ui/Appointment/display/displayappointmentwid.h
	ui/Appointment/edit/editappointmentwid.cpp
	ui/Appointment/edit/editappointmentwid.h
	ui/Appointment/edit/editlinksdialog.cpp
	ui/Appointment/edit/editlinksdialog.h
	ui/Drug/add/adddrugwid.cpp
	ui/Drug/add/adddrugwid.h
	ui/Drug/display/displaydrugwid.cpp
	ui/Drug/display/displaydrugwid.h
	ui/Drug/edit/editdrugwid.cpp
	ui/Drug/edit/editdrugwid.h
	ui/FamilyHistory/add/addfamilyhistorywid.cpp
	ui/FamilyHistory/add/addfamilyhistorywid.h
	ui/FamilyHistory/display/displayfamilyhistorywid.cpp
	ui/FamilyHistory/display/displayfamilyhistorywid.h
	ui/FamilyHistory/edit/editfamilyhistorywid.cpp
	ui/FamilyHistory/edit/editfamilyhistorywid.h
	ui/Investigation/add/addinvestigationwid.cpp
	ui/Investigation/add/addinvestigationwid.h
	ui/Investigation/display/displayinvestigationwid.cpp
	ui/Investigation/display/displayinvestigationwid.h
	ui/Investigation/display/displayreportsdialog.cpp
	ui/Investigation/display/displayreportsdialog.h
	ui/Investigation/edit/editinvestigationwid.cpp
	ui/Investigation/edit/editinvestigationwid.h
	ui/SearchDialog/searchdialog.cpp
	ui/SearchDialog/searchdialog.h
	ui/ShowItemsDialog/showitemsdialog.cpp
	ui/ShowItemsDialog/showitemsdialog.h
	ui/Surgery/add/addsurgerywid.cpp
	ui/Surgery/add/addsurgerywid.h
	ui/Surgery/display/displaysurgerywid.cpp
	ui/Surgery/display/displaysurgerywid.h
	ui/Surgery/edit/editsurgerywid.cpp
	ui/Surgery/edit/editsurgerywid.h
	ui/Symptom/add/addsymptomwid.cpp
	ui/Symptom/add/addsymptomwid.h
	ui/Symptom/display/displaysymptomwid.cpp
	ui/Symptom/display/displaysymptomwid.h
	ui/Symptom/edit/editsymptomwid.cpp
	ui/Symptom/edit/editsymptomwid.h
	ui/Vaccine/add/addvaccinewid.cpp
	ui/Vaccine/add/addvaccinewid.h
	ui/Vaccine/add/vaccinebottomwid.cpp
	ui/Vaccine/add/vaccinebottomwid.h
	ui/Vaccine/add/vaccinedetailswid.cpp
	ui/Vaccine/add/vaccinedetailswid.h
	ui/Vaccine/display/displayvaccinewid.cpp
	ui/Vaccine/display/displayvaccinewid.h
	ui/Vaccine/edit/editvaccinewid.cpp
	ui/Vaccine/edit/editvaccinewid.h
	userlistdialog.cpp
	userlistdialog.h
	xml/Allergen/xallergen.cpp
	xml/Allergen/xallergen.h
	xml/Appointment/xappointment.cpp
	xml/Appointment/xappointment.h
	xml/Drug/xdrug.cpp
	xml/Drug/xdrug.h
	xml/FamilyHistory/xfamilyhistory.cpp
	xml/FamilyHistory/xfamilyhistory.h
	xml/Investigation/xinvestigation.cpp
	xml/Investigation/xinvestigation.h
	xml/Surgery/xsurgery.cpp
	xml/Surgery/xsurgery.h
	xml/Symptom/xsymptom.cpp
	xml/Symptom/xsymptom.h
	xml/Vaccine/xvaccine.cpp
	xml/Vaccine/xvaccine.h
Merge branch 'master' of https://github.com/sinjar666/mysehat

Conflicts:
	mysehat.pro.user