Merge branch 'master' into dev

conf/supervisor.ini

@@ -0,0 +1,8 @@
+[program:gogs]
+user=git
+command = /home/git/gogs/start.sh
+directory = /home/git/gogs
+autostart = true
+stdout_logfile = /var/gogs.log
+stderr_logfile = /var/gogs-error.log
+environment=HOME="/home/git"