Merge branch 'master' into dev

# Conflicts:
#	controllers/account.go

controllers/account.go

@@ -328,7 +328,7 @@ func (c *AccountController) Logout(){
 	c.SetMember(models.Member{});
 
 	c.SetSecureCookie(conf.GetAppKey(),"login","",-3600)
-
+	
 	c.Redirect(beego.URLFor("AccountController.Login"),302)
 }