Merge branch 'master' into feat/approval-new

# Conflicts:
#	models/issue_comment.go
#	models/migrations/migrations.go
#	models/migrations/v64.go
#	models/models.go
#	public/css/index.css

vendor/github.com/lafriks/xormstore/xormstore.go

@@ -70,7 +70,7 @@ type Store struct {
 }
 
 type xormSession struct {
-	ID          string         `xorm:"VARCHAR(400) PK NAME 'id'"`
+	ID          string         `xorm:"VARCHAR(100) PK NAME 'id'"`
 	Data        string         `xorm:"TEXT"`
 	CreatedUnix util.TimeStamp `xorm:"created"`
 	UpdatedUnix util.TimeStamp `xorm:"updated"`

vendor/vendor.json

@@ -648,10 +648,10 @@
 			"revisionTime": "2016-10-16T15:41:25Z"
 		},
 		{
-			"checksumSHA1": "/X7eCdN7MX8zgCjA9s0ktzgTPlA=",
+			"checksumSHA1": "1zVWfGXRsQi0EuZydyBHgkhl7tU=",
 			"path": "github.com/lafriks/xormstore",
-			"revision": "3a80a383a04b29ec2e1bf61279dd948aa809335b",
-			"revisionTime": "2018-04-09T10:45:24Z"
+			"revision": "9cab149ea91875cf056211bd6ef82379fce9cb67",
+			"revisionTime": "2018-05-10T21:06:47Z"
 		},
 		{
 			"checksumSHA1": "Vxvfs8mukr9GOLSuGIPU4ODyOZc=",