hehehe
hehehe
fixed
hehehe
fixed

(cherry picked from commit 3085fbee1dcea9457e7fc9f065462ac004182374)

Conflicts:
	src/main/java/com/nixsolutions/dao/AbstractDao.java
deleted  Session session = getSession();
                Transaction t = session.beginTransaction();
                int hehehe=0;
                try {
                    session.save(object);
                    t.commit();
                } catch (Exception e) {
                    if (t != null) {
                        t.rollback();
                    }
                    throw e;
                } finally {
                    if (session != null && session.isOpen()) {
                        session.close();
                    }
                }
deleted   t.commit();
Merge remote-tracking branch 'origin/SomeNewBranch'

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