Merge branch 'dev' into newcollaboration

diff --cc models/models.go
index cf4e291cff74590dce54945b9d6d4234aa7c8fdc,df030e51bbd559a13e097b1c5c8cf3a640f9665c..1a67041b4a7e02139cc0af570a996e3e594ce5da
--- 1/models/models.go
--- 2/models/models.go
+++ b/models/models.go
@@@ -98,21 -97,18 +98,21 @@@ func getEngine() (*xorm.Engine, error) 
  func NewTestEngine(x *xorm.Engine) (err error) {
        x, err = getEngine()
        if err != nil {
-               return fmt.Errorf("models.init(fail to connect to database): %v", err)
+               return fmt.Errorf("connect to database: %v", err)
        }
  
 +      x.SetMapper(core.GonicMapper{})
        return x.Sync(tables...)
  }
  
  func SetEngine() (err error) {
        x, err = getEngine()
        if err != nil {
-               return fmt.Errorf("models.init(fail to connect to database): %v", err)
+               return fmt.Errorf("connect to database: %v", err)
        }
  
 +      x.SetMapper(core.GonicMapper{})
 +
        // WARNING: for serv command, MUST remove the output to os.stdout,
        // so use log file to instead print to stdout.
        logPath := path.Join(setting.LogRootPath, "xorm.log")

diff --cc models/repo.go
Simple merge