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

Conflicts:
	conf/app.ini

diff --cc conf/app.ini
index 4c2398dd6874b4feae1bc9450dbee31198b18462,916079ed8971663dceeabefb05ac10e6abc777bd..1a96ebeab6d022339e5c63405b0f5ca016d008c0
--- 1/conf/app.ini
--- 2/conf/app.ini
+++ b/conf/app.ini
@@@ -1,8 -1,8 +1,8 @@@
  ; App name that shows on every page title
  APP_NAME = Gogs: Go Git Service
  APP_LOGO = img/favicon.png
- ; Check it if you run locally
 -; !!MUST CHANGE TO YOUR USER NAME!!
 -RUN_USER = skyblue
++; Change it if you run locally
 +RUN_USER = git
  ; Either "dev", "prod" or "test", default is "dev"
  RUN_MODE = dev
  

diff --cc modules/base/conf.go
Simple merge

diff --cc templates/user/delete.tmpl
Simple merge