Merge remote-tracking branch 'origin/master' into user-icons

src/views/500.tpl

@@ -1,3 +1,4 @@
+<script type="text/tpl" data-template="500">
 <div class="alert alert-danger">
 	<strong>[[global:500.title]]</strong>
 	<p>[[global:500.message]]</p>
@@ -5,3 +6,4 @@
 	<!-- IF error --><p>{error}</p><!-- ENDIF error -->
 
 </div>
+</script>

src/views/admin/partials/categories/category-rows.tpl

@@ -26,4 +26,7 @@
         </div>
     </li>
 <!-- END categories -->
+
+<li class="children-placeholder"></li>
+
 </ul>