- Added DAO; - Improved entities;
- NOW added DAO
- Resolved conflicts