Merge remote branch 'origin/master' into master_daiane
Merge remote branch 'origin/master' into master_daiane
Added: get disk, get ram and set date.
Merge branch 'master_daiane'