deleted   t.commit();
Merge remote-tracking branch 'origin/SomeNewBranch'

Conflicts:
	src/main/java/com/nixsolutions/dao/AbstractDao.java