Merge branch 'master' of https://github.com/Syndace/xeps into feature/xep-0030

xep-0030.xml

@@ -874,8 +874,20 @@ xmpp:romeo@montague.net?disco;type=get;request=items
   <xs:element name='query'>
     <xs:complexType>
       <xs:sequence minOccurs='0'>
-        <xs:element ref='identity' maxOccurs='unbounded'/>
-        <xs:element ref='feature' maxOccurs='unbounded'/>
+        <xs:choice>
+          <xs:sequence>
+            <xs:element ref='feature' maxOccurs='unbounded'/>
+            <xs:element ref='identity'/>
+          </xs:sequence>
+          <xs:sequence>
+            <xs:element ref='identity' maxOccurs='unbounded'/>
+            <xs:element ref='feature'/>
+          </xs:sequence>
+        </xs:choice>
+        <xs:choice minOccurs='0' maxOccurs='unbounded'>
+          <xs:element ref='identity'/>
+          <xs:element ref='feature'/>
+        </xs:choice>
       </xs:sequence>
       <xs:attribute name='node' type='xs:string' use='optional'/>
     </xs:complexType>