merge with branch master

diff --cc models/user.go
Simple merge

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

diff --cc web.go
index 637ee7ce95708c40a4b77bb1ac28824ce1d1fa1b,9d90851c96aac169a7dc6b2255fdf1b80a1e3ae6..d055c3940e246d3cd12a5a63bbaf4f74449e9bc3
--- 1/web.go
--- 2/web.go
+++ b/web.go
@@@ -96,18 -91,28 +92,31 @@@ func runWeb(*cli.Context) 
        m.Get("/issues", reqSignIn, user.Issues)
        m.Get("/pulls", reqSignIn, user.Pulls)
        m.Get("/stars", reqSignIn, user.Stars)
-       m.Any("/user/login", reqSignOut, binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
-       m.Any("/user/logout", reqSignIn, user.SignOut)
-       m.Any("/user/sign_up", reqSignOut, binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
-       m.Any("/user/delete", reqSignIn, user.Delete)
-       m.Get("/user/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
-       m.Get("/user/activate", user.Activate)
- 
-       m.Any("/user/setting", reqSignIn, binding.BindIgnErr(auth.UpdateProfileForm{}), user.Setting)
-       m.Any("/user/setting/password", reqSignIn, binding.BindIgnErr(auth.UpdatePasswdForm{}), user.SettingPassword)
-       m.Any("/user/setting/ssh", reqSignIn, binding.BindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys)
-       m.Any("/user/setting/notification", reqSignIn, user.SettingNotification)
-       m.Any("/user/setting/security", reqSignIn, user.SettingSecurity)
+       m.Get("/help", routers.Help)
+ 
++      avatarCache := avatar.HttpHandler("public/img/avatar/", "public/img/avatar/default.jpg")
++      m.Get("/avatar/:hash", avatarCache.ServeHTTP)
++
+       m.Group("/user", func(r martini.Router) {
+               r.Any("/login", binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
+               r.Any("/sign_up", binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
+       }, reqSignOut)
+       m.Group("/user", func(r martini.Router) {
+               r.Any("/logout", user.SignOut)
+               r.Any("/delete", user.Delete)
+               r.Any("/setting", binding.BindIgnErr(auth.UpdateProfileForm{}), user.Setting)
+       }, reqSignIn)
+       m.Group("/user", func(r martini.Router) {
+               r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
+               r.Get("/activate", user.Activate)
+       })
+ 
+       m.Group("/user/setting", func(r martini.Router) {
+               r.Any("/password", binding.BindIgnErr(auth.UpdatePasswdForm{}), user.SettingPassword)
+               r.Any("/ssh", binding.BindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys)
+               r.Any("/notification", user.SettingNotification)
+               r.Any("/security", user.SettingSecurity)
+       }, reqSignIn)
  
        m.Get("/user/:username", ignSignIn, user.Profile)