cfg
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/hibernate.cfg.xml
first commit