Merge branch 'master' into 3.0/abi

README.mediawiki

@@ -27,12 +27,6 @@ First review [[nep-1.mediawiki|NEP-1]]. Then clone the repository and add your N
 | Standard
 | Final
 |-
-| [[nep-5.mediawiki|5]]
-| Token Standard
-| Tyler Adams, luodanwg, tanyuan, Alan Fong
-| Standard
-| Final
-|-
 | [[nep-6.mediawiki|6]]
 | Wallet Standard
 | Erik Zhang
@@ -45,17 +39,11 @@ First review [[nep-1.mediawiki|NEP-1]]. Then clone the repository and add your N
 | Standard
 | Final
 |-
-| [[nep-10.mediawiki|10]]
-| Composite Smart Contracts
-| Michael Herman
-| Standard
-| Final
-|-
-| [https://github.com/neo-project/proposals/pull/41 11]
+| [[nep-11.mediawiki|11]]
 | Non-fungible Token Standard
-| Joe Stewart, Shane Mann
+| Joe Stewart, Shane Mann, Wyatt Mufson, Erik Zhang
 | Standard
-| Accepted
+| Final
 |-
 | [https://github.com/neo-project/proposals/pull/69 12]
 | dApp Platform Provider Interface
@@ -75,6 +63,30 @@ First review [[nep-1.mediawiki|NEP-1]]. Then clone the repository and add your N
 | Standard
 | Accepted
 |-
+| [https://github.com/neo-project/proposals/pull/114 15]
+| NeoContract Manifest
+| Erik Zhang, Fernando Díaz Toledano, Vitor Nazário Coelho, Igor Machado Coelho, Li Jianying
+| Standard
+| Accepted
+|-
+| [[nep-16.mediawiki|16]]
+| NEO Executable Format (NEF)
+| Fernando Díaz Toledano, Erik Zhang, Igor Machado Coelho, Li Jianying, Vitor Nazário Coelho
+| Standard
+| Final
+|-
+| [[nep-17.mediawiki|17]]
+| Token Standard
+| Erik Zhang
+| Standard
+| Final
+|-
+| [https://github.com/neo-project/proposals/pull/133 18]
+| Neo Address Resolution
+| Erik Zhang
+| Standard
+| Accepted
+|-
 | 
 | Dynamic Sharding
 |