test
merge
merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	BookingEJB/.classpath
	BookingEJB/ejbModule/utilities/DateTimeHandler.java