Merge branch 'manage-categories' of github.com:dballard/transmet into manage-categories

Conflicts:
	route_handlers.go
	templates/pages/categories.html

route_handlers.go

@@ -243,7 +243,6 @@ func addedHandler(w http.ResponseWriter, r *http.Request, user *user.User) {
     ShowTemplate("added", w, map[string]interface{}{"user": user, "flashes": flashes})
 }
 
-
 func ServeFileHandler(res http.ResponseWriter, req *http.Request) {  
       fname := path.Base(req.URL.Path)  
       http.ServeFile(res, req, "./"+fname)  

templates/pages/categories.html

@@ -19,6 +19,7 @@
     {{else}}
         <div class="col-xs-12 category-row">
     {{end}}
+
     {{.Name}} <a href="/categories/delete?id={{.Id}}">delete</a>
     
     <select class="form-control category-change-parent" name="category-change-parent-{{.Id}}" >
@@ -30,9 +31,11 @@
     
     </div>
 
+    
     {{range $child := .Children}}
         {{template "row-category" $child}}
      {{end}}    
+
 {{end}}
 
 {{define "option-category"}}
@@ -40,4 +43,6 @@
     {{range $child := .Children}}
         {{template "option-category" $child}}
      {{end}}            
+=======
+>>>>>>> fea21c9d10d89f90b71988dcb41722527b947f60
 {{end}}