Scaffold property
Merge branch 'master' into DES_#1
Equalizacao de branchs
Merge 'DES_#1' e DES_#2