Conflict hibernate.cfg.xml
Merge branch 'master' of https://github.com/bustanil/minifinance.git