Factoring:
- Layer DAO
- Ejb
Merge origin/develop into develop
fix bugs