merge hibernate and server project