Merge branch 'master' into dev

# Conflicts:
#	views/book/setting.tpl

controllers/account.go

@@ -78,6 +78,7 @@ func (c *AccountController) Login()  {
 	}
 }
 
+//用户注册.
 func (c *AccountController) Register()  {
 	c.TplName = "account/register.tpl"
 
@@ -329,6 +330,7 @@ func (c *AccountController) Logout(){
 	c.Redirect(beego.URLFor("AccountController.Login"),302)
 }
 
+//验证码.
 func (c *AccountController) Captcha()  {
 	c.Prepare()
 

controllers/book.go

@@ -557,7 +557,7 @@ func (c *BookController) SaveSort() {
 		beego.Error(err)
 		c.JsonResult(6003,"数据错误")
 	}
-	fmt.Printf("%+v",docs)
+
 	for _,item := range docs {
 		if doc_id,ok := item["id"].(float64);ok {
 			doc,err := models.NewDocument().Find(int(doc_id));