Merge branch 'master' into rorden

# Conflicts:
#	1.sources/MyHealth/src/ejb/common/CommonFacadeBean.java

1.sources/MyHealth/src/jpa/VisitJPA.java

@@ -49,8 +49,7 @@ public class VisitJPA implements Serializable {
 		super();
 	}
 
-	public VisitJPA(Integer id, Date date, LocalTime time, String observations, String result, PatientJPA patient, FamilyDoctorJPA familydoctor) {
-		this.id = id;
+	public VisitJPA(Date date, LocalTime time, String observations, String result, PatientJPA patient, FamilyDoctorJPA familydoctor) {
 		this.date = date;
 		this.time = time;
 		this.observations = observations;