-. use criteria instead query in HibernateDao#findAll
Merge remote-tracking branch 'origin/master'