Merge branch 'master' into distinct

Author: darakhbharat

ERCs/ERC721/ERC721-TokenScript.xml

@@ -71,7 +71,7 @@
 
         <ts:card type="activity" name="ownerApproved">
             <ts:origins>
-                <ethereum:event type="Approval" filter="${from}=${ownerAddress}"/>
+                <ethereum:event type="Approval" filter="owner=${ownerAddress}"/>
             </ts:origins>
             <ts:item-view xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
                 <style type="text/css">&style;</style>
@@ -85,7 +85,7 @@
 
         <ts:card type="activity" name="approvalObtained">
             <ts:origins>
-                <ethereum:event type="Approval" filter="${to}=${ownerAddress}"/>
+                <ethereum:event type="Approval" filter="approved=${ownerAddress}"/>
             </ts:origins>
             <ts:item-view xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
                 <style type="text/css">&style;</style>

ERCs/ERC721/layouts/gaveApproval.en.js

@@ -51,8 +51,9 @@
                 <element minOccurs="0" maxOccurs="unbounded" ref="dsig:Signature"/>
             </sequence>
             <attribute name="custodian" type="boolean" default="false"/>
-			<assert test="count(ts:attribute[string(@distinct) = 'true']) le 1"/>
-			<assert test="if(not(ts:origins)) then count(ts:attribute[string(@distinct) = 'true']) = 1 else true()"/>
+            <attribute name="name" type="NCName"/>
+      			<assert test="count(ts:attribute[string(@distinct) = 'true']) le 1"/>
+			      <assert test="if(not(ts:origins)) then count(ts:attribute[string(@distinct) = 'true']) = 1 else true()"/>
         </complexType>
         <keyref name="typeRef" refer="ts:namedTypeName">
             <selector xpath=".//ts:origins/ethereum:event|.//ts:origins/ethereum:call"></selector>