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

Conflicts:
	public/ng/less/gogs/repository.less
	templates/repo/home.tmpl

diff --cc cmd/web.go
Simple merge

diff --cc public/ng/css/gogs.css
Simple merge

diff --cc templates/repo/home.tmpl
index aa303aaac4eba669d62c53295d8248fbcf9953c9,476277a807c026f89405633f25415a610aba9d09..5914d630cd97033ce4b857d1a2422ddb050d0c2b
--- 1/templates/repo/home.tmpl
--- 2/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@@ -3,10 -3,12 +3,10 @@@
  <div id="repo-wrapper">
      {{template "repo/header" .}}
      <div id="repo-content" class="clear container">
-         <div id="repo-main" class="left grid-4-5">
+         <div id="repo-main" class="left grid-5-6">
 -            <p id="repo-desc">{{if .Repository.DescriptionHtml}}
 -                <span class="description">{{.Repository.DescriptionHtml}}</span>
 -                <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>{{else}}
 -                <span class="no-description text-italic"><i>No Description</i></span>
 -                {{end}}
 +            <p id="repo-desc">
 +                {{if .Repository.DescriptionHtml}}<span class="description">{{.Repository.DescriptionHtml}}</span>{{else}}<span class="no-desc">{{.i18n.Tr "repo.no_desc"}}</span>{{end}}
 +                <a class="link" href="{{.Repository.Website}}">{{.Repository.Website}}</a>
              </p>
              <ul id="repo-file-nav" class="clear menu menu-line">
                  <!-- <li>