Merge branch 'develop'

* develop:
  remove lists of types and categories

Resources/Private/Templates/Dashboard/Index.html

@@ -46,44 +46,6 @@
   </table>
 
 
-  <hr style="width: 100%; border: 1px solid black; margin: 20px 0;">
-
-  <h2>List of types</h2>
-  <table id="typesTable" style="width: 210px;">
-    <thead>
-    <tr>
-      <th onclick="sortTable('typesTable',0)" additionalAttributes="{style: 'width: 10px;'}">ID</th>
-      <th onclick="sortTable('typesTable',1)" additionalAttributes="{style: 'width: 200px;'}">Title</th>
-    </tr>
-    </thead>
-    <tbody>
-    <f:for each="{types}" as="type">
-      <tr>
-        <td>{type.uid}</td>
-        <td>{type.title}</td>
-      </tr>
-    </f:for>
-    </tbody>
-  </table>
-
-  <hr style="width: 100%; border: 1px solid black; margin: 20px 0;">
-  <h2>List of categories</h2>
-  <table id="categoriesTable" style="width: 210px;">
-    <thead>
-    <tr>
-      <th onclick="sortTable('categoriesTable',0)" additionalAttributes="{style: 'width: 10px;'}">ID</th>
-      <th onclick="sortTable('categoriesTable',1)" additionalAttributes="{style: 'width: 200px;'}">Title</th>
-    </tr>
-    </thead>
-    <tbody>
-    <f:for each="{categories}" as="category">
-      <tr>
-        <td>{category.uid}</td>
-        <td>{category.title}</td>
-      </tr>
-    </f:for>
-    </tbody>
-  </table>
 
   <hr style="width: 100%; border: 1px solid black; margin: 20px 0;">
   <h2>Add words (semicolon-separated) with a type</h2>