add dmtf
add dmtf
Merge branch 'branch2'

Conflicts:
	template/standards/index.html