Merge origin/master

Conflicts:
	OnlineDoctorWebApp/src/main/resources/META-INF/persistence.xml