merge conflict resolved
merge conflict resolved

ramrexx/CloudForms_Essentials,ramrexx/CloudForms_Essentials,weslleyrosalem/CloudForms_Essentials,weslleyrosalem/CloudForms_Essentials,weslleyrosalem/CloudForms_Essentials