Changes
Merge branch 'development' of https://github.com/nisevi/bondimalo into development

Conflicts:
	src/main/java/org/bondimalo/persistence/UserDao.java