Insertion of JavaDoc in the package dao
Merge origin/master