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

Conflicts:
	conf/app.ini