Merge branch 'develop'

Application/Home/View/Catalog/edit.html

@@ -1,7 +1,10 @@
 <include file="Common/header" />
 <style type="text/css">
 .single-cat{
-  margin: 10px;
+  margin: 5px;
+}
+.cat-list{
+  max-height: 250px;
 }
 </style>
  <div id="edit-cat" class="modal hide fade">