commit
Merge branch 'master' of https://github.com/bustanil/minifinance.git

Conflicts:
	src/main/resources/hibernate.cfg.xml