Changed transactional annotation in hibernate DAO.
Merge branch 'develop'