minor changes
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/pj2014/dbservices/implementations/PatientDBService.java
	src/pj2014/dbservices/interfaces/UserDBServiceRemote.java