commit before merge
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/pj2014/patrepo/implementations/PatientRepository.java