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

Conflicts:
	templates/repo/single_file.tmpl