Merge branch 'dev' of https://github.com/LuisNunez/XCCDF-Remediation

Conflicts:
	XCCDF-dev/xccdf_dev.xsd
Merge branch 'master' of https://github.com/LuisNunez/XCCDF-Remediation

Conflicts:
	XCCDF-dev/xccdf_dev.xsd
Merge branch 'master' of https://github.com/c3isecurity/XCCDF-Remediation