Merge branch 'master' of github.com:gogits/gogs into dev
Merge branch 'dev' of github.com:gogits/gogs into dev
Merge branch 'dev' of github.com:gogits/gogs into dev
bug fixed #193