Entities Medication, PatientProgress, MedicationDate, MedicationTime
Merge branch 'master' of
https://github.com/fabaff/ch.bfh.bti7081.s2013.white.git

Conflicts:
	ch.bfh.bti7081.s2013.white/src/main/java/META-INF/persistence.xml