Changed some methods in UserDAO according to user-manager.
Changed entities User & Role according to Security.