Changed hibernate.cfg.xml
Changed hibernate.cfg.xml
Added order details and fix order in db overloading...
Fixed merge conflict