problem git
Merge branch 'master' of git@github.com:eadg/MagazynSWT.git

Conflicts:
	MagazynSWT/src/hibernate.cfg.xml