Resolved conflict hibernate.cfg.xml
Merged
Merge branch 'master' of https://github.com/RoOoBerT/awar-server.git