Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	templates/issue/view.tmpl

diff --cc templates/issue/view.tmpl
index 36b0ce2eee19a762d0fc5c29c86aeb9358297d0a,1cc7209752a1c8a21ba844a5d19f3b8cd11800df..4d053930b944e785d608c3fbc596b45752293658
--- 1/templates/issue/view.tmpl
--- 2/templates/issue/view.tmpl
+++ b/templates/issue/view.tmpl
@@@ -18,7 -22,10 +22,10 @@@
              <div class="issue-main">
                 <div class="panel panel-default issue-content">
                     <div class="panel-body markdown">
-                       {{str2html .Issue.Content}}
+                        <div class="content">
 -                           {{.Issue.Content}}
++                           {{str2html .Issue.Content}}
+                        </div>
+                        <textarea class="form-control hidden" name="content" id="issue-edit-content" rows="10" data-ajax-rel="issue-save">content</textarea>
                     </div>
                 </div>
                 {{range .Comments}}
@@@ -27,9 -34,12 +34,12 @@@
                     <div class="issue-content panel panel-default">
                         <div class="panel-heading">
                             <a href="/user/{{.Poster.Name}}" class="user">{{.Poster.Name}}</a> commented <span class="time">{{TimeSince .Created}}</span>
+                            <a class="issue-comment-del pull-right issue-action" href="#" title="Edit Comment"><i class="fa fa-times-circle"></i></a>
+                            <a class="issue-comment-edit pull-right issue-action" href="#" title="Remove Comment" data-url="{remove-link}"><i class="fa fa-edit"></i></a>
+                            <span class="role label label-default pull-right">Owner</span>
                         </div>
                         <div class="panel-body markdown">
 -                           <p>{{.Content}}</p>
 +                          {{str2html .Content}}
                         </div>
                     </div>
                  </div>