Merge branch 'dev' into 'master'

refactor: integrated new site.xml api - child-type

See merge request !3

site.xml

@@ -2,14 +2,14 @@
 <site>
 
     <types>
-        <type type="types/list" icon="fa fa-list-alt">
+        <type type="types/list" icon="fa fa-list-alt" child-type="quiqqer/faq:types/category">
             <locale group="quiqqer/faq" var="admin.types.faq.list" />
             <desc>
                 <locale group="quiqqer/faq" var="admin.types.faq.list.desc" />
             </desc>
         </type>
 
-        <type type="types/category" icon="fa fa-question-circle">
+        <type type="types/category" icon="fa fa-question-circle" child-type="quiqqer/faq:types/entry">
             <locale group="quiqqer/faq" var="admin.types.faq.category" />
             <desc>
                 <locale group="quiqqer/faq" var="admin.types.faq.category.desc" />