27/11/14 - Adding findMedicine and findPatient
Merge origin/master into Alex

Conflicts:
	src/java/DatabaseModel/Patient.java
Merge pull request #26 from AlexBrown92/Alex

27/11/14 - Adding findMedicine and findPatient