IP: RC Code Review
Merge branch 'master' of github.com:gogits/gogs

Conflicts:
	templates/issue/view.tmpl