Manual merge with khalid's changes, fixed hibernate config, and the prototype of physician availability added