Merge branch 'master' into gh-pages

Conflicts:
	SocialWG/AS1-implementations.xml
	SocialWG/AS1-in-AS2.xsl
	WoTIG/WoT-UCR.xml
	WoTIG/WoT-UCR.xsl