hehehe
fixed
test
hehehe
fixed

(cherry picked from commit 3085fbee1dcea9457e7fc9f065462ac004182374)

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