Merge branch 'master' of https://github.com/kvahdati/DoctorPatientOffice

Conflicts:
	src/office/view/OfficePanel.java