Merge branch 'master' into production

VERSION

@@ -1 +1 @@
-0.9.9-155-g41b974b-production
+0.9.9-156-gd167c84-master

orm/school.go

@@ -2,6 +2,7 @@ package orm
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 	"os"
 	"strings"
@@ -69,8 +70,8 @@ type School struct {
 	SelectedRegion map[uint]string `gorm:"-"`
 	AllRegions     []*Region       `gorm:"-"`
 
-	CaptchaID       string `gorm:"-" schema:"-"`
-	CaptchaSolution string `gorm:"-" schema:"-"`
+	CaptchaID       string `gorm:"-"`
+	CaptchaSolution string `gorm:"-"`
 
 	mailSender *mail.MailSender
 }
@@ -196,6 +197,7 @@ func (model *School) Create(db *Database, args map[string]string, w http.Respons
 		school := new(School)
 		err := renderer.Decode(school, r)
 		if err != nil {
+			log.Println("Captcha", r.FormValue("CaptchaID"), r.FormValue("CaptchaSolution"))
 			return nil, err
 		}