properties
Merge origin/master
dao refatoring
Merge origin/master
dao refatoring
I dont know
Merge origin/master