Merge branch 'WI-0081-Smart_Device_Template_4_0' of git.onem2m.org:MAS/SDT into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png