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

Conflicts:
	modules/base/conf.go