944 files changed, 174 insertions, 84 deletions

diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index c15d6810..45719ac7 100644
--- a/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -46,11 +46,11 @@ Please read detailed information on [Wiki](https://github.com/gogits/gogs/wiki/C
 
 ### Ask For Help
 
-Before opening an issue, please make sure your problem isn't already addressed on the [Troubleshooting](http://gogs.io/docs/intro/troubleshooting.md) and [FAQs](http://gogs.io/docs/intro/faqs.html) pages.
+Before opening an issue, please make sure your problem isn't already addressed on the [Troubleshooting](http://gogs.io/docs/intro/troubleshooting.html) and [FAQs](http://gogs.io/docs/intro/faqs.html) pages.
 
 ## Things To Notice
 
-Please take a moment to check that an issue on [GitHub](https://github.com/gogits/gogs/issues) or card on [Trello](https://trello.com/b/uxAoeLUl/gogs-go-git-service) doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
+Please take a moment to check that an issue on [GitHub](https://github.com/gogits/gogs/issues) doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
 
 ## Code of conduct
 
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 00000000..a94f5fe7
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,16 @@
+Please take a moment to search that an issue doesn't already exist.
+
+For bug reports, please give the relevant info:
+
+- Gogs version (or commit ref):
+- Git version:
+- Operating system:
+- Database:
+  - [ ] PostgreSQL
+  - [ ] MySQL
+  - [ ] SQLite
+- Log gist:
+
+## Description
+
+...
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..860eee77
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,4 @@
+Please, make sure you are targeting the `develop` branch!
+
+More instructions about contributing with Gogs code can be found here:
+https://github.com/gogits/gogs/wiki/Contributing-Code
diff --git a/README.md b/README.md
index bb0fff7d..220e31c6 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
 
-##### Current version: 0.8.37
+##### Current version: 0.8.40
 
 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|
@@ -13,7 +13,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 
 ### NOTICES
 
-- :bangbang: You **MUST** read [CONTRIBUTING.md](CONTRIBUTING.md) for bug report and contributing code. :bangbang:
+- :bangbang: You **MUST** read [CONTRIBUTING.md](https://github.com/gogits/gogs/blob/master/.github/CONTRIBUTING.md) for bug report and contributing code. :bangbang:
 - Please [start discussion](http://forum.gogs.io/category/2/general-discussion) or [ask a question](http://forum.gogs.io/category/4/getting-help) on [the forum](http://forum.gogs.io/). GitHub issue tracker only keeps **bugs** and **feature requests**, all other topics will be closed without reason.
 - Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) was reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site.
 - The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch.
diff --git a/cmd/serve.go b/cmd/serve.go
index d8e77dcd..305aaa64 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -104,8 +104,15 @@ func handleUpdateTask(uuid string, user, repoUser *models.User, reponame string,
 		return
 	}
 
-	if err = models.Update(task.RefName, task.OldCommitID, task.NewCommitID,
-		user.Name, repoUser.Name, reponame, user.Id); err != nil {
+	if err = models.PushUpdate(models.PushUpdateOptions{
+		RefName:      task.RefName,
+		OldCommitID:  task.OldCommitID,
+		NewCommitID:  task.NewCommitID,
+		PusherID:     user.Id,
+		PusherName:   user.Name,
+		RepoUserName: repoUser.Name,
+		RepoName:     reponame,
+	}); err != nil {
 		log.GitLogger.Error(2, "Update: %v", err)
 	}
 
diff --git a/cmd/web.go b/cmd/web.go
index 5bfbdb44..072d3191 100644
--- a/cmd/web.go
+++ b/cmd/web.go
@@ -470,7 +470,7 @@ func runWeb(ctx *cli.Context) {
 			m.Post("/delete", repo.DeleteRelease)
 		}, reqRepoAdmin, middleware.RepoRef())
 
-		m.Combo("/compare/*", repo.MustEnablePulls).Get(repo.CompareAndPullRequest).
+		m.Combo("/compare/*", repo.MustAllowPulls).Get(repo.CompareAndPullRequest).
 			Post(bindIgnErr(auth.CreateIssueForm{}), repo.CompareAndPullRequestPost)
 	}, reqSignIn, middleware.RepoAssignment(), repo.MustBeNotBare)
 
@@ -503,7 +503,7 @@ func runWeb(ctx *cli.Context) {
 			m.Get("/commits", middleware.RepoRef(), repo.ViewPullCommits)
 			m.Get("/files", middleware.RepoRef(), repo.ViewPullFiles)
 			m.Post("/merge", reqRepoAdmin, repo.MergePullRequest)
-		}, repo.MustEnablePulls)
+		}, repo.MustAllowPulls)
 
 		m.Group("", func() {
 			m.Get("/src/*", repo.Home)
diff --git a/conf/locale/locale_bg-BG.ini b/conf/locale/locale_bg-BG.ini
index e59ab539..e59ab539 100755..100644
--- a/conf/locale/locale_bg-BG.ini
+++ b/conf/locale/locale_bg-BG.ini
diff --git a/conf/locale/locale_de-DE.ini b/conf/locale/locale_de-DE.ini
index 7f46612f..7f46612f 100755..100644
--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
diff --git a/conf/locale/locale_es-ES.ini b/conf/locale/locale_es-ES.ini
index 38854825..38854825 100755..100644
--- a/conf/locale/locale_es-ES.ini
+++ b/conf/locale/locale_es-ES.ini
diff --git a/conf/locale/locale_fr-FR.ini b/conf/locale/locale_fr-FR.ini
index d2df0966..d2df0966 100755..100644
--- a/conf/locale/locale_fr-FR.ini
+++ b/conf/locale/locale_fr-FR.ini
diff --git a/conf/locale/locale_it-IT.ini b/conf/locale/locale_it-IT.ini
index 16b16275..16b16275 100755..100644
--- a/conf/locale/locale_it-IT.ini
+++ b/conf/locale/locale_it-IT.ini
diff --git a/conf/locale/locale_ja-JP.ini b/conf/locale/locale_ja-JP.ini
index 209e6fa3..209e6fa3 100755..100644
--- a/conf/locale/locale_ja-JP.ini
+++ b/conf/locale/locale_ja-JP.ini
diff --git a/conf/locale/locale_lv-LV.ini b/conf/locale/locale_lv-LV.ini
index fd42b165..fd42b165 100755..100644
--- a/conf/locale/locale_lv-LV.ini
+++ b/conf/locale/locale_lv-LV.ini
diff --git a/conf/locale/locale_nl-NL.ini b/conf/locale/locale_nl-NL.ini
index c9cd7a1c..c9cd7a1c 100755..100644
--- a/conf/locale/locale_nl-NL.ini
+++ b/conf/locale/locale_nl-NL.ini
diff --git a/conf/locale/locale_pl-PL.ini b/conf/locale/locale_pl-PL.ini
index 1bd6c115..1bd6c115 100755..100644
--- a/conf/locale/locale_pl-PL.ini
+++ b/conf/locale/locale_pl-PL.ini
diff --git a/conf/locale/locale_pt-BR.ini b/conf/locale/locale_pt-BR.ini
index d91c393a..d91c393a 100755..100644
--- a/conf/locale/locale_pt-BR.ini
+++ b/conf/locale/locale_pt-BR.ini
diff --git a/conf/locale/locale_ru-RU.ini b/conf/locale/locale_ru-RU.ini
index ead616b6..ead616b6 100755..100644
--- a/conf/locale/locale_ru-RU.ini
+++ b/conf/locale/locale_ru-RU.ini
diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini
index bb0c473b..bb0c473b 100755..100644
--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
diff --git a/conf/locale/locale_zh-HK.ini b/conf/locale/locale_zh-HK.ini
index 377e534c..377e534c 100755..100644
--- a/conf/locale/locale_zh-HK.ini
+++ b/conf/locale/locale_zh-HK.ini
diff --git a/gogs.go b/gogs.go
index 22d36b5b..1e4241fd 100644
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.8.37.0217"
+const APP_VER = "0.8.40.0219"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
diff --git a/models/org.go b/models/org.go
index de66af66..9d86df10 100644
--- a/models/org.go
+++ b/models/org.go
@@ -254,27 +254,25 @@ func IsPublicMembership(orgId, uid int64) bool {
 	return has
 }
 
-func getOrgsByUserID(sess *xorm.Session, userID int64) ([]*User, error) {
+func getOrgsByUserID(sess *xorm.Session, userID int64, showAll bool) ([]*User, error) {
 	orgs := make([]*User, 0, 10)
-	return orgs, sess.Where("`org_user`.uid=?", userID).
+	if !showAll {
+		sess.And("`org_user`.is_public=?", true)
+	}
+	return orgs, sess.And("`org_user`.uid=?", userID).
 		Join("INNER", "`org_user`", "`org_user`.org_id=`user`.id").Find(&orgs)
 }
 
 // GetOrgsByUserID returns a list of organizations that the given user ID
 // has joined.
-func GetOrgsByUserID(userID int64) ([]*User, error) {
-	sess := x.NewSession()
-	return getOrgsByUserID(sess, userID)
+func GetOrgsByUserID(userID int64, showAll bool) ([]*User, error) {
+	return getOrgsByUserID(x.NewSession(), userID, showAll)
 }
 
 // GetOrgsByUserIDDesc returns a list of organizations that the given user ID
 // has joined, ordered descending by the given condition.
-func GetOrgsByUserIDDesc(userID int64, desc string, all bool) ([]*User, error) {
-	sess := x.NewSession()
-	if !all {
-		sess.And("`org_user`.is_public=?", true)
-	}
-	return getOrgsByUserID(sess.Desc(desc), userID)
+func GetOrgsByUserIDDesc(userID int64, desc string, showAll bool) ([]*User, error) {
+	return getOrgsByUserID(x.NewSession().Desc(desc), userID, showAll)
 }
 
 func getOwnedOrgsByUserID(sess *xorm.Session, userID int64) ([]*User, error) {
diff --git a/models/pull.go b/models/pull.go
index 330319f9..bf16d98f 100644
--- a/models/pull.go
+++ b/models/pull.go
@@ -482,6 +482,33 @@ func (pr *PullRequest) UpdatePatch() (err error) {
 	return nil
 }
 
+// PushToBaseRepo pushes commits from branches of head repository to
+// corresponding branches of base repository.
+// FIXME: could fail after user force push head repo, should we always force push here?
+// FIXME: Only push branches that are actually updates?
+func (pr *PullRequest) PushToBaseRepo() (err error) {
+	log.Trace("PushToBaseRepo[%[1]d]: pushing commits to base repo 'refs/pull/%[1]d/head'", pr.ID)
+
+	headRepoPath := pr.HeadRepo.RepoPath()
+	headGitRepo, err := git.OpenRepository(headRepoPath)
+	if err != nil {
+		return fmt.Errorf("OpenRepository: %v", err)
+	}
+
+	tmpRemoteName := fmt.Sprintf("tmp-pull-%d", pr.ID)
+	if err = headGitRepo.AddRemote(tmpRemoteName, pr.BaseRepo.RepoPath(), false); err != nil {
+		return fmt.Errorf("headGitRepo.AddRemote: %v", err)
+	}
+	// Make sure to remove the remote even if the push fails
+	defer headGitRepo.RemoveRemote(tmpRemoteName)
+
+	if err = git.Push(headRepoPath, tmpRemoteName, fmt.Sprintf("%s:refs/pull/%d/head", pr.HeadBranch, pr.Index)); err != nil {
+		return fmt.Errorf("Push: %v", err)
+	}
+
+	return nil
+}
+
 // AddToTaskQueue adds itself to pull request test task queue.
 func (pr *PullRequest) AddToTaskQueue() {
 	go PullRequestQueue.AddFunc(pr.ID, func() {
@@ -498,6 +525,9 @@ func addHeadRepoTasks(prs []*PullRequest) {
 		if err := pr.UpdatePatch(); err != nil {
 			log.Error(4, "UpdatePatch: %v", err)
 			continue
+		} else if err := pr.PushToBaseRepo(); err != nil {
+			log.Error(4, "PushToBaseRepo: %v", err)
+			continue
 		}
 
 		pr.AddToTaskQueue()
diff --git a/models/repo.go b/models/repo.go
index 57014beb..98bb1107 100644
--- a/models/repo.go
+++ b/models/repo.go
@@ -332,7 +332,17 @@ func (repo *Repository) IsOwnedBy(userID int64) bool {
 
 // CanBeForked returns true if repository meets the requirements of being forked.
 func (repo *Repository) CanBeForked() bool {
-	return !repo.IsBare && !repo.IsMirror
+	return !repo.IsBare
+}
+
+// CanEnablePulls returns true if repository meets the requirements of accepting pulls.
+func (repo *Repository) CanEnablePulls() bool {
+	return !repo.IsMirror
+}
+
+// AllowPulls returns true if repository meets the requirements of accepting pulls and has them enabled.
+func (repo *Repository) AllowsPulls() bool {
+	return repo.CanEnablePulls() && repo.EnablePulls;
 }
 
 func (repo *Repository) NextIssueIndex() int64 {
diff --git a/models/update.go b/models/update.go
index 5c6ea7f6..66775ea9 100644
--- a/models/update.go
+++ b/models/update.go
@@ -10,7 +10,7 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/gogits/git-module"
+	git "github.com/gogits/git-module"
 
 	"github.com/gogits/gogs/modules/log"
 )
@@ -65,94 +65,104 @@ func ListToPushCommits(l *list.List) *PushCommits {
 	return &PushCommits{l.Len(), commits, "", nil}
 }
 
-func Update(refName, oldCommitID, newCommitID, userName, repoUserName, repoName string, userID int64) error {
-	isNew := strings.HasPrefix(oldCommitID, "0000000")
-	if isNew &&
-		strings.HasPrefix(newCommitID, "0000000") {
-		return fmt.Errorf("old rev and new rev both 000000")
+type PushUpdateOptions struct {
+	RefName      string
+	OldCommitID  string
+	NewCommitID  string
+	PusherID     int64
+	PusherName   string
+	RepoUserName string
+	RepoName     string
+}
+
+// PushUpdate must be called for any push actions in order to
+// generates necessary push action history feeds.
+func PushUpdate(opts PushUpdateOptions) (err error) {
+	isNewRef := strings.HasPrefix(opts.OldCommitID, "0000000")
+	isDelRef := strings.HasPrefix(opts.NewCommitID, "0000000")
+	if isNewRef && isDelRef {
+		return fmt.Errorf("Old and new revisions both start with 000000")
 	}
 
-	f := RepoPath(repoUserName, repoName)
+	repoPath := RepoPath(opts.RepoUserName, opts.RepoName)
 
 	gitUpdate := exec.Command("git", "update-server-info")
-	gitUpdate.Dir = f
-	gitUpdate.Run()
+	gitUpdate.Dir = repoPath
+	if err = gitUpdate.Run(); err != nil {
+		return fmt.Errorf("Fail to call 'git update-server-info': %v", err)
+	}
 
-	isDel := strings.HasPrefix(newCommitID, "0000000")
-	if isDel {
-		log.GitLogger.Info("del rev", refName, "from", userName+"/"+repoName+".git", "by", userID)
+	if isDelRef {
+		log.GitLogger.Info("Reference '%s' has been deleted from '%s/%s' by %d",
+			opts.RefName, opts.RepoUserName, opts.RepoName, opts.PusherName)
 		return nil
 	}
 
-	gitRepo, err := git.OpenRepository(f)
+	gitRepo, err := git.OpenRepository(repoPath)
 	if err != nil {
-		return fmt.Errorf("runUpdate.Open repoId: %v", err)
+		return fmt.Errorf("OpenRepository: %v", err)
 	}
 
-	user, err := GetUserByName(repoUserName)
+	repoUser, err := GetUserByName(opts.RepoUserName)
 	if err != nil {
-		return fmt.Errorf("runUpdate.GetUserByName: %v", err)
+		return fmt.Errorf("GetUserByName: %v", err)
 	}
 
-	repo, err := GetRepositoryByName(user.Id, repoName)
+	repo, err := GetRepositoryByName(repoUser.Id, opts.RepoName)
 	if err != nil {
-		return fmt.Errorf("runUpdate.GetRepositoryByName userId: %v", err)
+		return fmt.Errorf("GetRepositoryByName: %v", err)
 	}
 
 	// Push tags.
-	if strings.HasPrefix(refName, "refs/tags/") {
-		tagName := git.RefEndName(refName)
-		tag, err := gitRepo.GetTag(tagName)
+	if strings.HasPrefix(opts.RefName, "refs/tags/") {
+		tag, err := gitRepo.GetTag(git.RefEndName(opts.RefName))
 		if err != nil {
-			log.GitLogger.Fatal(4, "runUpdate.GetTag: %v", err)
+			return fmt.Errorf("gitRepo.GetTag: %v", err)
 		}
 
+		// When tagger isn't available, fall back to get committer email.
 		var actEmail string
 		if tag.Tagger != nil {
 			actEmail = tag.Tagger.Email
 		} else {
 			cmt, err := tag.Commit()
 			if err != nil {
-				log.GitLogger.Fatal(4, "runUpdate.GetTag Commit: %v", err)
+				return fmt.Errorf("tag.Commit: %v", err)
 			}
 			actEmail = cmt.Committer.Email
 		}
 
 		commit := &PushCommits{}
-
-		if err = CommitRepoAction(userID, user.Id, userName, actEmail,
-			repo.ID, repoUserName, repoName, refName, commit, oldCommitID, newCommitID); err != nil {
-			log.GitLogger.Fatal(4, "CommitRepoAction: %s/%s:%v", repoUserName, repoName, err)
+		if err = CommitRepoAction(opts.PusherID, repoUser.Id, opts.PusherName, actEmail,
+			repo.ID, opts.RepoUserName, opts.RepoName, opts.RefName, commit, opts.OldCommitID, opts.NewCommitID); err != nil {
+			return fmt.Errorf("CommitRepoAction (tag): %v", err)
 		}
 		return err
 	}
 
-	newCommit, err := gitRepo.GetCommit(newCommitID)
+	newCommit, err := gitRepo.GetCommit(opts.NewCommitID)
 	if err != nil {
-		return fmt.Errorf("runUpdate GetCommit of newCommitId: %v", err)
+		return fmt.Errorf("gitRepo.GetCommit: %v", err)
 	}
 
 	// Push new branch.
 	var l *list.List
-	if isNew {
+	if isNewRef {
 		l, err = newCommit.CommitsBeforeLimit(10)
 		if err != nil {
-			return fmt.Errorf("CommitsBefore: %v", err)
+			return fmt.Errorf("newCommit.CommitsBeforeLimit: %v", err)
 		}
 	} else {
-		l, err = newCommit.CommitsBeforeUntil(oldCommitID)
+		l, err = newCommit.CommitsBeforeUntil(opts.OldCommitID)
 		if err != nil {
-			return fmt.Errorf("CommitsBeforeUntil: %v", err)
+			return fmt.Errorf("newCommit.CommitsBeforeUntil: %v", err)
 		}
 	}
 
-	if err != nil {
-		return fmt.Errorf("runUpdate.Commit repoId: %v", err)
-	}
-
-	if err = CommitRepoAction(userID, user.Id, userName, user.Email,
-		repo.ID, repoUserName, repoName, refName, ListToPushCommits(l), oldCommitID, newCommitID); err != nil {
-		return fmt.Errorf("runUpdate.models.CommitRepoAction: %s/%s:%v", repoUserName, repoName, err)
+	if err = CommitRepoAction(opts.PusherID, repoUser.Id, opts.PusherName, repoUser.Email,
+		repo.ID, opts.RepoUserName, opts.RepoName, opts.RefName, ListToPushCommits(l),
+		opts.OldCommitID, opts.NewCommitID); err != nil {
+		return fmt.Errorf("CommitRepoAction (branch): %v", err)
 	}
 	return nil
 }
diff --git a/modules/base/base.go b/modules/base/base.go
index c9875fb5..45e2151e 100644
--- a/modules/base/base.go
+++ b/modules/base/base.go
@@ -16,8 +16,6 @@ type (
 	TplName string
 )
 
-var GoGetMetas = make(map[string]bool)
-
 // ExecPath returns the executable path.
 func ExecPath() (string, error) {
 	file, err := exec.LookPath(os.Args[0])
diff --git a/modules/base/markdown.go b/modules/base/markdown.go
index dac51ebc..10158edd 100644
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@ -303,10 +303,10 @@ OUTER_LOOP:
 					}
 
 					// If this is the close tag to the outer-most, we are done
-					if token.Type == html.EndTagToken && strings.EqualFold(tagName, token.Data) {
+					if token.Type == html.EndTagToken {
 						stackNum--
 
-						if stackNum == 0 {
+						if stackNum <= 0 && strings.EqualFold(tagName, token.Data) {
 							break
 						}
 					}
diff --git a/modules/mailer/mail.go b/modules/mailer/mail.go
index 456f8503..ca5618f1 100644
--- a/modules/mailer/mail.go
+++ b/modules/mailer/mail.go
@@ -7,6 +7,7 @@ package mailer
 import (
 	"fmt"
 	"path"
+	"strings"
 
 	"gopkg.in/macaron.v1"
 
@@ -125,7 +126,7 @@ func SendIssueNotifyMail(u, owner *models.User, repo *models.Repository, issue *
 
 	subject := fmt.Sprintf("[%s] %s (#%d)", repo.Name, issue.Name, issue.Index)
 	content := fmt.Sprintf("%s<br>-<br> <a href=\"%s%s/%s/issues/%d\">View it on Gogs</a>.",
-		base.RenderSpecialLink([]byte(issue.Content), owner.Name+"/"+repo.Name, repo.ComposeMetas()),
+		base.RenderSpecialLink([]byte(strings.Replace(issue.Content, "\n", "<br>", -1)), owner.Name+"/"+repo.Name, repo.ComposeMetas()),
 		setting.AppUrl, owner.Name, repo.Name, issue.Index)
 	msg := NewMessage(tos, subject, content)
 	msg.Info = fmt.Sprintf("Subject: %s, issue notify", subject)
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 9ceb9903..fb636d93 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -167,7 +167,7 @@ func RepoAssignment(args ...bool) macaron.Handler {
 		ctx.Data["IsRepositoryOwner"] = ctx.Repo.IsOwner()
 		ctx.Data["IsRepositoryAdmin"] = ctx.Repo.IsAdmin()
 		ctx.Data["IsRepositoryPusher"] = ctx.Repo.IsPusher()
-		ctx.Data["CanPullRequest"] = ctx.Repo.IsAdmin() && repo.BaseRepo != nil && repo.BaseRepo.EnablePulls
+		ctx.Data["CanPullRequest"] = ctx.Repo.IsAdmin() && repo.BaseRepo != nil && repo.BaseRepo.AllowsPulls()
 
 		ctx.Data["DisableSSH"] = setting.DisableSSH
 		ctx.Data["CloneLink"] = repo.CloneLink()
diff --git a/public/assets/font-awesome-4.5.0/css/font-awesome.min.css b/public/assets/font-awesome-4.5.0/css/font-awesome.min.css
index d0603cb4..d0603cb4 100755..100644
--- a/public/assets/font-awesome-4.5.0/css/font-awesome.min.css
+++ b/public/assets/font-awesome-4.5.0/css/font-awesome.min.css
diff --git a/public/assets/font-awesome-4.5.0/fonts/FontAwesome.otf b/public/assets/font-awesome-4.5.0/fonts/FontAwesome.otf
index 3ed7f8b4..3ed7f8b4 100755..100644
--- a/public/assets/font-awesome-4.5.0/fonts/FontAwesome.otf
+++ b/public/assets/font-awesome-4.5.0/fonts/FontAwesome.otf
diff --git a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.eot b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.eot
index 9b6afaed..9b6afaed 100755..100644
--- a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.eot
+++ b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.eot
diff --git a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.svg b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.svg
index d05688e9..d05688e9 100755..100644
--- a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.svg
+++ b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.svg
diff --git a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf
index 26dea795..26dea795 100755..100644
--- a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf
+++ b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.ttf
diff --git a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.woff b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.woff
index dc35ce3c..dc35ce3c 100755..100644
--- a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.woff
+++ b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.woff
diff --git a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2 b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2
index 500e5172..500e5172 100755..100644
--- a/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2
+++ b/public/assets/font-awesome-4.5.0/fonts/fontawesome-webfont.woff2
diff --git a/public/config.codekit b/public/config.codekit
index 8c1e16b4..129e373d 100644
--- a/public/config.codekit
+++ b/public/config.codekit
@@ -1,6 +1,6 @@
 {
 "CodeKitInfo": "This is a CodeKit 2.x project configuration file. It is designed to sync project settings across multiple machines. MODIFYING THE CONTENTS OF THIS FILE IS A POOR LIFE DECISION. If you do so, you will likely cause CodeKit to crash. This file is not useful unless accompanied by the project that created it in CodeKit 2. This file is not backwards-compatible with CodeKit 1.x. For more information, see: http:\/\/incident57.com\/codekit",
-"creatorBuild": "19102",
+"creatorBuild": "19115",
 "files": {
 	"\/css\/github.min.css": {
 		"fileType": 16,
diff --git a/public/css/gogs.css b/public/css/gogs.css
index 657de394..ba8a134f 100755..100644
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1129,6 +1129,9 @@ footer .container .links > *:first-child {
   margin-top: -15px;
   padding-top: 15px;
 }
+.repository .header-wrapper .ui.tabs.divider {
+  border-bottom: none;
+}
 .repository .filter.menu .label.color {
   margin-left: 15px;
   padding: 0 8px;
diff --git a/public/css/semantic-2.1.8.min.css b/public/css/semantic-2.1.8.min.css
index 835d6f12..835d6f12 100755..100644
--- a/public/css/semantic-2.1.8.min.css
+++ b/public/css/semantic-2.1.8.min.css
diff --git a/public/css/themes/basic/assets/fonts/icons.eot b/public/css/themes/basic/assets/fonts/icons.eot
index 25066de0..25066de0 100755..100644
--- a/public/css/themes/basic/assets/fonts/icons.eot
+++ b/public/css/themes/basic/assets/fonts/icons.eot
diff --git a/public/css/themes/basic/assets/fonts/icons.svg b/public/css/themes/basic/assets/fonts/icons.svg
index b9c54d02..b9c54d02 100755..100644
--- a/public/css/themes/basic/assets/fonts/icons.svg
+++ b/public/css/themes/basic/assets/fonts/icons.svg
diff --git a/public/css/themes/basic/assets/fonts/icons.ttf b/public/css/themes/basic/assets/fonts/icons.ttf
index 318a2643..318a2643 100755..100644
--- a/public/css/themes/basic/assets/fonts/icons.ttf
+++ b/public/css/themes/basic/assets/fonts/icons.ttf
diff --git a/public/css/themes/basic/assets/fonts/icons.woff b/public/css/themes/basic/assets/fonts/icons.woff
index baba1b5e..baba1b5e 100755..100644
--- a/public/css/themes/basic/assets/fonts/icons.woff
+++ b/public/css/themes/basic/assets/fonts/icons.woff
diff --git a/public/css/themes/default/assets/fonts/icons.eot b/public/css/themes/default/assets/fonts/icons.eot
index 33b2bb80..33b2bb80 100755..100644
--- a/public/css/themes/default/assets/fonts/icons.eot
+++ b/public/css/themes/default/assets/fonts/icons.eot
diff --git a/public/css/themes/default/assets/fonts/icons.otf b/public/css/themes/default/assets/fonts/icons.otf
index f7936cc1..f7936cc1 100755..100644
--- a/public/css/themes/default/assets/fonts/icons.otf
+++ b/public/css/themes/default/assets/fonts/icons.otf
diff --git a/public/css/themes/default/assets/fonts/icons.svg b/public/css/themes/default/assets/fonts/icons.svg
index 1ee89d43..1ee89d43 100755..100644
--- a/public/css/themes/default/assets/fonts/icons.svg
+++ b/public/css/themes/default/assets/fonts/icons.svg
diff --git a/public/css/themes/default/assets/fonts/icons.ttf b/public/css/themes/default/assets/fonts/icons.ttf
index ed9372f8..ed9372f8 100755..100644
--- a/public/css/themes/default/assets/fonts/icons.ttf
+++ b/public/css/themes/default/assets/fonts/icons.ttf
diff --git a/public/css/themes/default/assets/fonts/icons.woff b/public/css/themes/default/assets/fonts/icons.woff
index 8b280b98..8b280b98 100755..100644
--- a/public/css/themes/default/assets/fonts/icons.woff
+++ b/public/css/themes/default/assets/fonts/icons.woff
diff --git a/public/css/themes/default/assets/fonts/icons.woff2 b/public/css/themes/default/assets/fonts/icons.woff2
index 3311d585..3311d585 100755..100644
--- a/public/css/themes/default/assets/fonts/icons.woff2
+++ b/public/css/themes/default/assets/fonts/icons.woff2
diff --git a/public/css/themes/default/assets/images/flags.png b/public/css/themes/default/assets/images/flags.png
index cdd33c3b..cdd33c3b 100755..100644
--- a/public/css/themes/default/assets/images/flags.png
+++ b/public/css/themes/default/assets/images/flags.png
diff --git a/public/css/themes/github/assets/fonts/octicons-local.ttf b/public/css/themes/github/assets/fonts/octicons-local.ttf
index d5f4e2ec..d5f4e2ec 100755..100644
--- a/public/css/themes/github/assets/fonts/octicons-local.ttf
+++ b/public/css/themes/github/assets/fonts/octicons-local.ttf
diff --git a/public/css/themes/github/assets/fonts/octicons.svg b/public/css/themes/github/assets/fonts/octicons.svg
index d3116a69..d3116a69 100755..100644
--- a/public/css/themes/github/assets/fonts/octicons.svg
+++ b/public/css/themes/github/assets/fonts/octicons.svg
diff --git a/public/css/themes/github/assets/fonts/octicons.ttf b/public/css/themes/github/assets/fonts/octicons.ttf
index 9e091053..9e091053 100755..100644
--- a/public/css/themes/github/assets/fonts/octicons.ttf
+++ b/public/css/themes/github/assets/fonts/octicons.ttf
diff --git a/public/css/themes/github/assets/fonts/octicons.woff b/public/css/themes/github/assets/fonts/octicons.woff
index cc3c19f0..cc3c19f0 100755..100644
--- a/public/css/themes/github/assets/fonts/octicons.woff
+++ b/public/css/themes/github/assets/fonts/octicons.woff
diff --git a/public/img/emoji/+1.png b/public/img/emoji/+1.png
index 81786c1d..81786c1d 100755..100644
--- a/public/img/emoji/+1.png
+++ b/public/img/emoji/+1.png
diff --git a/public/img/emoji/-1.png b/public/img/emoji/-1.png
index 41c6b825..41c6b825 100755..100644
--- a/public/img/emoji/-1.png
+++ b/public/img/emoji/-1.png
diff --git a/public/img/emoji/100.png b/public/img/emoji/100.png
index ca3bb9bc..ca3bb9bc 100755..100644
--- a/public/img/emoji/100.png
+++ b/public/img/emoji/100.png
diff --git a/public/img/emoji/1234.png b/public/img/emoji/1234.png
index c47c2e1f..c47c2e1f 100755..100644
--- a/public/img/emoji/1234.png
+++ b/public/img/emoji/1234.png
diff --git a/public/img/emoji/8ball.png b/public/img/emoji/8ball.png
index c2c710d4..c2c710d4 100755..100644
--- a/public/img/emoji/8ball.png
+++ b/public/img/emoji/8ball.png
diff --git a/public/img/emoji/a.png b/public/img/emoji/a.png
index 09ff6d6f..09ff6d6f 100755..100644
--- a/public/img/emoji/a.png
+++ b/public/img/emoji/a.png
diff --git a/public/img/emoji/ab.png b/public/img/emoji/ab.png
index 2a522204..2a522204 100755..100644
--- a/public/img/emoji/ab.png
+++ b/public/img/emoji/ab.png
diff --git a/public/img/emoji/abc.png b/public/img/emoji/abc.png
index 505d40a1..505d40a1 100755..100644
--- a/public/img/emoji/abc.png
+++ b/public/img/emoji/abc.png
diff --git a/public/img/emoji/abcd.png b/public/img/emoji/abcd.png
index 5218470b..5218470b 100755..100644
--- a/public/img/emoji/abcd.png
+++ b/public/img/emoji/abcd.png
diff --git a/public/img/emoji/accept.png b/public/img/emoji/accept.png
index 2d200903..2d200903 100755..100644
--- a/public/img/emoji/accept.png
+++ b/public/img/emoji/accept.png
diff --git a/public/img/emoji/aerial_tramway.png b/public/img/emoji/aerial_tramway.png
index 38f6dfe2..38f6dfe2 100755..100644
--- a/public/img/emoji/aerial_tramway.png
+++ b/public/img/emoji/aerial_tramway.png
diff --git a/public/img/emoji/airplane.png b/public/img/emoji/airplane.png
index 8407cb67..8407cb67 100755..100644
--- a/public/img/emoji/airplane.png
+++ b/public/img/emoji/airplane.png
diff --git a/public/img/emoji/alarm_clock.png b/public/img/emoji/alarm_clock.png
index 86ca8c8e..86ca8c8e 100755..100644
--- a/public/img/emoji/alarm_clock.png
+++ b/public/img/emoji/alarm_clock.png
diff --git a/public/img/emoji/alien.png b/public/img/emoji/alien.png
index 416de47b..416de47b 100755..100644
--- a/public/img/emoji/alien.png
+++ b/public/img/emoji/alien.png
diff --git a/public/img/emoji/ambulance.png b/public/img/emoji/ambulance.png
index b740f45d..b740f45d 100755..100644
--- a/public/img/emoji/ambulance.png
+++ b/public/img/emoji/ambulance.png
diff --git a/public/img/emoji/anchor.png b/public/img/emoji/anchor.png
index 0c5192e6..0c5192e6 100755..100644
--- a/public/img/emoji/anchor.png
+++ b/public/img/emoji/anchor.png
diff --git a/public/img/emoji/angel.png b/public/img/emoji/angel.png
index da52c310..da52c310 100755..100644
--- a/public/img/emoji/angel.png
+++ b/public/img/emoji/angel.png
diff --git a/public/img/emoji/anger.png b/public/img/emoji/anger.png
index 6fb4dca1..6fb4dca1 100755..100644
--- a/public/img/emoji/anger.png
+++ b/public/img/emoji/anger.png
diff --git a/public/img/emoji/angry.png b/public/img/emoji/angry.png
index f95bfa89..f95bfa89 100755..100644
--- a/public/img/emoji/angry.png
+++ b/public/img/emoji/angry.png
diff --git a/public/img/emoji/anguished.png b/public/img/emoji/anguished.png
index c6259472..c6259472 100755..100644
--- a/public/img/emoji/anguished.png
+++ b/public/img/emoji/anguished.png
diff --git a/public/img/emoji/ant.png b/public/img/emoji/ant.png
index b92d1cc1..b92d1cc1 100755..100644
--- a/public/img/emoji/ant.png
+++ b/public/img/emoji/ant.png
diff --git a/public/img/emoji/apple.png b/public/img/emoji/apple.png
index 08aa17b9..08aa17b9 100755..100644
--- a/public/img/emoji/apple.png
+++ b/public/img/emoji/apple.png
diff --git a/public/img/emoji/aquarius.png b/public/img/emoji/aquarius.png
index cbff66ed..cbff66ed 100755..100644
--- a/public/img/emoji/aquarius.png
+++ b/public/img/emoji/aquarius.png
diff --git a/public/img/emoji/aries.png b/public/img/emoji/aries.png
index aab5e880..aab5e880 100755..100644
--- a/public/img/emoji/aries.png
+++ b/public/img/emoji/aries.png
diff --git a/public/img/emoji/arrow_backward.png b/public/img/emoji/arrow_backward.png
index 08862183..08862183 100755..100644
--- a/public/img/emoji/arrow_backward.png
+++ b/public/img/emoji/arrow_backward.png
diff --git a/public/img/emoji/arrow_double_down.png b/public/img/emoji/arrow_double_down.png
index 2ecbebcd..2ecbebcd 100755..100644
--- a/public/img/emoji/arrow_double_down.png
+++ b/public/img/emoji/arrow_double_down.png
diff --git a/public/img/emoji/arrow_double_up.png b/public/img/emoji/arrow_double_up.png
index 2bd6659b..2bd6659b 100755..100644
--- a/public/img/emoji/arrow_double_up.png
+++ b/public/img/emoji/arrow_double_up.png
diff --git a/public/img/emoji/arrow_down.png b/public/img/emoji/arrow_down.png
index e6702f02..e6702f02 100755..100644
--- a/public/img/emoji/arrow_down.png
+++ b/public/img/emoji/arrow_down.png
diff --git a/public/img/emoji/arrow_down_small.png b/public/img/emoji/arrow_down_small.png
index 22d383a9..22d383a9 100755..100644
--- a/public/img/emoji/arrow_down_small.png
+++ b/public/img/emoji/arrow_down_small.png
diff --git a/public/img/emoji/arrow_forward.png b/public/img/emoji/arrow_forward.png
index fbfe711b..fbfe711b 100755..100644
--- a/public/img/emoji/arrow_forward.png
+++ b/public/img/emoji/arrow_forward.png
diff --git a/public/img/emoji/arrow_heading_down.png b/public/img/emoji/arrow_heading_down.png
index 56dd3b9d..56dd3b9d 100755..100644
--- a/public/img/emoji/arrow_heading_down.png
+++ b/public/img/emoji/arrow_heading_down.png
diff --git a/public/img/emoji/arrow_heading_up.png b/public/img/emoji/arrow_heading_up.png
index c8f670a1..c8f670a1 100755..100644
--- a/public/img/emoji/arrow_heading_up.png
+++ b/public/img/emoji/arrow_heading_up.png
diff --git a/public/img/emoji/arrow_left.png b/public/img/emoji/arrow_left.png
index d64ac619..d64ac619 100755..100644
--- a/public/img/emoji/arrow_left.png
+++ b/public/img/emoji/arrow_left.png
diff --git a/public/img/emoji/arrow_lower_left.png b/public/img/emoji/arrow_lower_left.png
index 55fb03c4..55fb03c4 100755..100644
--- a/public/img/emoji/arrow_lower_left.png
+++ b/public/img/emoji/arrow_lower_left.png
diff --git a/public/img/emoji/arrow_lower_right.png b/public/img/emoji/arrow_lower_right.png
index da8fb829..da8fb829 100755..100644
--- a/public/img/emoji/arrow_lower_right.png
+++ b/public/img/emoji/arrow_lower_right.png
diff --git a/public/img/emoji/arrow_right.png b/public/img/emoji/arrow_right.png
index 6d483b51..6d483b51 100755..100644
--- a/public/img/emoji/arrow_right.png
+++ b/public/img/emoji/arrow_right.png
diff --git a/public/img/emoji/arrow_right_hook.png b/public/img/emoji/arrow_right_hook.png
index 8b4ea6e1..8b4ea6e1 100755..100644
--- a/public/img/emoji/arrow_right_hook.png
+++ b/public/img/emoji/arrow_right_hook.png
diff --git a/public/img/emoji/arrow_up.png b/public/img/emoji/arrow_up.png
index b5b0688d..b5b0688d 100755..100644
--- a/public/img/emoji/arrow_up.png
+++ b/public/img/emoji/arrow_up.png
diff --git a/public/img/emoji/arrow_up_down.png b/public/img/emoji/arrow_up_down.png
index be423de7..be423de7 100755..100644
--- a/public/img/emoji/arrow_up_down.png
+++ b/public/img/emoji/arrow_up_down.png
diff --git a/public/img/emoji/arrow_up_small.png b/public/img/emoji/arrow_up_small.png
index 3f40bfb8..3f40bfb8 100755..100644
--- a/public/img/emoji/arrow_up_small.png
+++ b/public/img/emoji/arrow_up_small.png
diff --git a/public/img/emoji/arrow_upper_left.png b/public/img/emoji/arrow_upper_left.png
index 2950ae2f..2950ae2f 100755..100644
--- a/public/img/emoji/arrow_upper_left.png
+++ b/public/img/emoji/arrow_upper_left.png
diff --git a/public/img/emoji/arrow_upper_right.png b/public/img/emoji/arrow_upper_right.png
index e23790ba..e23790ba 100755..100644
--- a/public/img/emoji/arrow_upper_right.png
+++ b/public/img/emoji/arrow_upper_right.png
diff --git a/public/img/emoji/arrows_clockwise.png b/public/img/emoji/arrows_clockwise.png
index 5f84d7e7..5f84d7e7 100755..100644
--- a/public/img/emoji/arrows_clockwise.png
+++ b/public/img/emoji/arrows_clockwise.png
diff --git a/public/img/emoji/arrows_counterclockwise.png b/public/img/emoji/arrows_counterclockwise.png
index 3e06f5b3..3e06f5b3 100755..100644
--- a/public/img/emoji/arrows_counterclockwise.png
+++ b/public/img/emoji/arrows_counterclockwise.png
diff --git a/public/img/emoji/art.png b/public/img/emoji/art.png
index d45212b0..d45212b0 100755..100644
--- a/public/img/emoji/art.png
+++ b/public/img/emoji/art.png
diff --git a/public/img/emoji/articulated_lorry.png b/public/img/emoji/articulated_lorry.png
index 81ec1f91..81ec1f91 100755..100644
--- a/public/img/emoji/articulated_lorry.png
+++ b/public/img/emoji/articulated_lorry.png
diff --git a/public/img/emoji/astonished.png b/public/img/emoji/astonished.png
index 858a8348..858a8348 100755..100644
--- a/public/img/emoji/astonished.png
+++ b/public/img/emoji/astonished.png
diff --git a/public/img/emoji/atm.png b/public/img/emoji/atm.png
index c2846e79..c2846e79 100755..100644
--- a/public/img/emoji/atm.png
+++ b/public/img/emoji/atm.png
diff --git a/public/img/emoji/b.png b/public/img/emoji/b.png
index 8742b3d2..8742b3d2 100755..100644
--- a/public/img/emoji/b.png
+++ b/public/img/emoji/b.png
diff --git a/public/img/emoji/baby.png b/public/img/emoji/baby.png
index 3b29da40..3b29da40 100755..100644
--- a/public/img/emoji/baby.png
+++ b/public/img/emoji/baby.png
diff --git a/public/img/emoji/baby_bottle.png b/public/img/emoji/baby_bottle.png
index 1b2cfe5e..1b2cfe5e 100755..100644
--- a/public/img/emoji/baby_bottle.png
+++ b/public/img/emoji/baby_bottle.png
diff --git a/public/img/emoji/baby_chick.png b/public/img/emoji/baby_chick.png
index 9be8d293..9be8d293 100755..100644
--- a/public/img/emoji/baby_chick.png
+++ b/public/img/emoji/baby_chick.png
diff --git a/public/img/emoji/baby_symbol.png b/public/img/emoji/baby_symbol.png
index 2e58725c..2e58725c 100755..100644
--- a/public/img/emoji/baby_symbol.png
+++ b/public/img/emoji/baby_symbol.png
diff --git a/public/img/emoji/baggage_claim.png b/public/img/emoji/baggage_claim.png
index 59ae044a..59ae044a 100755..100644
--- a/public/img/emoji/baggage_claim.png
+++ b/public/img/emoji/baggage_claim.png
diff --git a/public/img/emoji/balloon.png b/public/img/emoji/balloon.png
index 03448970..03448970 100755..100644
--- a/public/img/emoji/balloon.png
+++ b/public/img/emoji/balloon.png
diff --git a/public/img/emoji/ballot_box_with_check.png b/public/img/emoji/ballot_box_with_check.png
index f07a466c..f07a466c 100755..100644
--- a/public/img/emoji/ballot_box_with_check.png
+++ b/public/img/emoji/ballot_box_with_check.png
diff --git a/public/img/emoji/bamboo.png b/public/img/emoji/bamboo.png
index fc858d0f..fc858d0f 100755..100644
--- a/public/img/emoji/bamboo.png
+++ b/public/img/emoji/bamboo.png
diff --git a/public/img/emoji/banana.png b/public/img/emoji/banana.png
index a0563afb..a0563afb 100755..100644
--- a/public/img/emoji/banana.png
+++ b/public/img/emoji/banana.png
diff --git a/public/img/emoji/bangbang.png b/public/img/emoji/bangbang.png
index 7270f0af..7270f0af 100755..100644
--- a/public/img/emoji/bangbang.png
+++ b/public/img/emoji/bangbang.png
diff --git a/public/img/emoji/bank.png b/public/img/emoji/bank.png
index 1faa8777..1faa8777 100755..100644
--- a/public/img/emoji/bank.png
+++ b/public/img/emoji/bank.png
diff --git a/public/img/emoji/bar_chart.png b/public/img/emoji/bar_chart.png
index 09d7301c..09d7301c 100755..100644
--- a/public/img/emoji/bar_chart.png
+++ b/public/img/emoji/bar_chart.png
diff --git a/public/img/emoji/barber.png b/public/img/emoji/barber.png
index a10cb232..a10cb232 100755..100644
--- a/public/img/emoji/barber.png
+++ b/public/img/emoji/barber.png
diff --git a/public/img/emoji/baseball.png b/public/img/emoji/baseball.png
index da004e2e..da004e2e 100755..100644
--- a/public/img/emoji/baseball.png
+++ b/public/img/emoji/baseball.png
diff --git a/public/img/emoji/basketball.png b/public/img/emoji/basketball.png
index ef694bec..ef694bec 100755..100644
--- a/public/img/emoji/basketball.png
+++ b/public/img/emoji/basketball.png
diff --git a/public/img/emoji/bath.png b/public/img/emoji/bath.png
index 8f75d1d2..8f75d1d2 100755..100644
--- a/public/img/emoji/bath.png
+++ b/public/img/emoji/bath.png
diff --git a/public/img/emoji/bathtub.png b/public/img/emoji/bathtub.png
index 1c3f844a..1c3f844a 100755..100644
--- a/public/img/emoji/bathtub.png
+++ b/public/img/emoji/bathtub.png
diff --git a/public/img/emoji/battery.png b/public/img/emoji/battery.png
index aa7eedce..aa7eedce 100755..100644
--- a/public/img/emoji/battery.png
+++ b/public/img/emoji/battery.png
diff --git a/public/img/emoji/bear.png b/public/img/emoji/bear.png
index f5afe920..f5afe920 100755..100644
--- a/public/img/emoji/bear.png
+++ b/public/img/emoji/bear.png
diff --git a/public/img/emoji/bee.png b/public/img/emoji/bee.png
index f5373395..f5373395 100755..100644
--- a/public/img/emoji/bee.png
+++ b/public/img/emoji/bee.png
diff --git a/public/img/emoji/beer.png b/public/img/emoji/beer.png
index cd78bed7..cd78bed7 100755..100644
--- a/public/img/emoji/beer.png
+++ b/public/img/emoji/beer.png
diff --git a/public/img/emoji/beers.png b/public/img/emoji/beers.png
index cc5e4ab5..cc5e4ab5 100755..100644
--- a/public/img/emoji/beers.png
+++ b/public/img/emoji/beers.png
diff --git a/public/img/emoji/beetle.png b/public/img/emoji/beetle.png
index 222577ca..222577ca 100755..100644
--- a/public/img/emoji/beetle.png
+++ b/public/img/emoji/beetle.png
diff --git a/public/img/emoji/beginner.png b/public/img/emoji/beginner.png
index 1f022d17..1f022d17 100755..100644
--- a/public/img/emoji/beginner.png
+++ b/public/img/emoji/beginner.png
diff --git a/public/img/emoji/bell.png b/public/img/emoji/bell.png
index 69acceb2..69acceb2 100755..100644
--- a/public/img/emoji/bell.png
+++ b/public/img/emoji/bell.png
diff --git a/public/img/emoji/bento.png b/public/img/emoji/bento.png
index d6801124..d6801124 100755..100644
--- a/public/img/emoji/bento.png
+++ b/public/img/emoji/bento.png
diff --git a/public/img/emoji/bicyclist.png b/public/img/emoji/bicyclist.png
index cbbd7c38..cbbd7c38 100755..100644
--- a/public/img/emoji/bicyclist.png
+++ b/public/img/emoji/bicyclist.png
diff --git a/public/img/emoji/bike.png b/public/img/emoji/bike.png
index 65738602..65738602 100755..100644
--- a/public/img/emoji/bike.png
+++ b/public/img/emoji/bike.png
diff --git a/public/img/emoji/bikini.png b/public/img/emoji/bikini.png
index 4ff63b40..4ff63b40 100755..100644
--- a/public/img/emoji/bikini.png
+++ b/public/img/emoji/bikini.png
diff --git a/public/img/emoji/bird.png b/public/img/emoji/bird.png
index e6be8c02..e6be8c02 100755..100644
--- a/public/img/emoji/bird.png
+++ b/public/img/emoji/bird.png
diff --git a/public/img/emoji/birthday.png b/public/img/emoji/birthday.png
index 36e8edcb..36e8edcb 100755..100644
--- a/public/img/emoji/birthday.png
+++ b/public/img/emoji/birthday.png
diff --git a/public/img/emoji/black_circle.png b/public/img/emoji/black_circle.png
index e46f9df6..e46f9df6 100755..100644
--- a/public/img/emoji/black_circle.png
+++ b/public/img/emoji/black_circle.png
diff --git a/public/img/emoji/black_joker.png b/public/img/emoji/black_joker.png
index 4c78f361..4c78f361 100755..100644
--- a/public/img/emoji/black_joker.png
+++ b/public/img/emoji/black_joker.png
diff --git a/public/img/emoji/black_nib.png b/public/img/emoji/black_nib.png
index 29f6994c..29f6994c 100755..100644
--- a/public/img/emoji/black_nib.png
+++ b/public/img/emoji/black_nib.png
diff --git a/public/img/emoji/black_small_square.png b/public/img/emoji/black_small_square.png
index a247751e..a247751e 100755..100644
--- a/public/img/emoji/black_small_square.png
+++ b/public/img/emoji/black_small_square.png
diff --git a/public/img/emoji/black_square.png b/public/img/emoji/black_square.png
index 71da10de..71da10de 100755..100644
--- a/public/img/emoji/black_square.png
+++ b/public/img/emoji/black_square.png
diff --git a/public/img/emoji/black_square_button.png b/public/img/emoji/black_square_button.png
index f2597e95..f2597e95 100755..100644
--- a/public/img/emoji/black_square_button.png
+++ b/public/img/emoji/black_square_button.png
diff --git a/public/img/emoji/blossom.png b/public/img/emoji/blossom.png
index 55a97353..55a97353 100755..100644
--- a/public/img/emoji/blossom.png
+++ b/public/img/emoji/blossom.png
diff --git a/public/img/emoji/blowfish.png b/public/img/emoji/blowfish.png
index d3ad4658..d3ad4658 100755..100644
--- a/public/img/emoji/blowfish.png
+++ b/public/img/emoji/blowfish.png
diff --git a/public/img/emoji/blue_book.png b/public/img/emoji/blue_book.png
index e2b9e8c7..e2b9e8c7 100755..100644
--- a/public/img/emoji/blue_book.png
+++ b/public/img/emoji/blue_book.png
diff --git a/public/img/emoji/blue_car.png b/public/img/emoji/blue_car.png
index 978291e0..978291e0 100755..100644
--- a/public/img/emoji/blue_car.png
+++ b/public/img/emoji/blue_car.png
diff --git a/public/img/emoji/blue_heart.png b/public/img/emoji/blue_heart.png
index baa29b31..baa29b31 100755..100644
--- a/public/img/emoji/blue_heart.png
+++ b/public/img/emoji/blue_heart.png
diff --git a/public/img/emoji/blush.png b/public/img/emoji/blush.png
index 3a95eb61..3a95eb61 100755..100644
--- a/public/img/emoji/blush.png
+++ b/public/img/emoji/blush.png
diff --git a/public/img/emoji/boar.png b/public/img/emoji/boar.png
index 8196ad4a..8196ad4a 100755..100644
--- a/public/img/emoji/boar.png
+++ b/public/img/emoji/boar.png
diff --git a/public/img/emoji/boat.png b/public/img/emoji/boat.png
index ff656dc6..ff656dc6 100755..100644
--- a/public/img/emoji/boat.png
+++ b/public/img/emoji/boat.png
diff --git a/public/img/emoji/bomb.png b/public/img/emoji/bomb.png
index 3289787d..3289787d 100755..100644
--- a/public/img/emoji/bomb.png
+++ b/public/img/emoji/bomb.png
diff --git a/public/img/emoji/book.png b/public/img/emoji/book.png
index 8b698415..8b698415 100755..100644
--- a/public/img/emoji/book.png
+++ b/public/img/emoji/book.png
diff --git a/public/img/emoji/bookmark.png b/public/img/emoji/bookmark.png
index 6fc4ed90..6fc4ed90 100755..100644
--- a/public/img/emoji/bookmark.png
+++ b/public/img/emoji/bookmark.png
diff --git a/public/img/emoji/bookmark_tabs.png b/public/img/emoji/bookmark_tabs.png
index 83782ff0..83782ff0 100755..100644
--- a/public/img/emoji/bookmark_tabs.png
+++ b/public/img/emoji/bookmark_tabs.png
diff --git a/public/img/emoji/books.png b/public/img/emoji/books.png
index dca06a1a..dca06a1a 100755..100644
--- a/public/img/emoji/books.png
+++ b/public/img/emoji/books.png
diff --git a/public/img/emoji/boom.png b/public/img/emoji/boom.png
index 9d5bd040..9d5bd040 100755..100644
--- a/public/img/emoji/boom.png
+++ b/public/img/emoji/boom.png
diff --git a/public/img/emoji/boot.png b/public/img/emoji/boot.png
index 58d0fdbc..58d0fdbc 100755..100644
--- a/public/img/emoji/boot.png
+++ b/public/img/emoji/boot.png
diff --git a/public/img/emoji/bouquet.png b/public/img/emoji/bouquet.png
index ce637832..ce637832 100755..100644
--- a/public/img/emoji/bouquet.png
+++ b/public/img/emoji/bouquet.png
diff --git a/public/img/emoji/bow.png b/public/img/emoji/bow.png
index 024cb610..024cb610 100755..100644
--- a/public/img/emoji/bow.png
+++ b/public/img/emoji/bow.png
diff --git a/public/img/emoji/bowling.png b/public/img/emoji/bowling.png
index 13d8ece2..13d8ece2 100755..100644
--- a/public/img/emoji/bowling.png
+++ b/public/img/emoji/bowling.png
diff --git a/public/img/emoji/bowtie.png b/public/img/emoji/bowtie.png
index 28ff0c78..28ff0c78 100755..100644
--- a/public/img/emoji/bowtie.png
+++ b/public/img/emoji/bowtie.png
diff --git a/public/img/emoji/boy.png b/public/img/emoji/boy.png
index f79f1f29..f79f1f29 100755..100644
--- a/public/img/emoji/boy.png
+++ b/public/img/emoji/boy.png
diff --git a/public/img/emoji/bread.png b/public/img/emoji/bread.png
index 7e7c6375..7e7c6375 100755..100644
--- a/public/img/emoji/bread.png
+++ b/public/img/emoji/bread.png
diff --git a/public/img/emoji/bride_with_veil.png b/public/img/emoji/bride_with_veil.png
index dd0b0cfd..dd0b0cfd 100755..100644
--- a/public/img/emoji/bride_with_veil.png
+++ b/public/img/emoji/bride_with_veil.png
diff --git a/public/img/emoji/bridge_at_night.png b/public/img/emoji/bridge_at_night.png
index 495b06c3..495b06c3 100755..100644
--- a/public/img/emoji/bridge_at_night.png
+++ b/public/img/emoji/bridge_at_night.png
diff --git a/public/img/emoji/briefcase.png b/public/img/emoji/briefcase.png
index 46e82b00..46e82b00 100755..100644
--- a/public/img/emoji/briefcase.png
+++ b/public/img/emoji/briefcase.png
diff --git a/public/img/emoji/broken_heart.png b/public/img/emoji/broken_heart.png
index a1bc850e..a1bc850e 100755..100644
--- a/public/img/emoji/broken_heart.png
+++ b/public/img/emoji/broken_heart.png
diff --git a/public/img/emoji/bug.png b/public/img/emoji/bug.png
index c2eaf7a7..c2eaf7a7 100755..100644
--- a/public/img/emoji/bug.png
+++ b/public/img/emoji/bug.png
diff --git a/public/img/emoji/bulb.png b/public/img/emoji/bulb.png
index 23afca1c..23afca1c 100755..100644
--- a/public/img/emoji/bulb.png
+++ b/public/img/emoji/bulb.png
diff --git a/public/img/emoji/bullettrain_front.png b/public/img/emoji/bullettrain_front.png
index 16651acf..16651acf 100755..100644
--- a/public/img/emoji/bullettrain_front.png
+++ b/public/img/emoji/bullettrain_front.png
diff --git a/public/img/emoji/bullettrain_side.png b/public/img/emoji/bullettrain_side.png
index 8eca3684..8eca3684 100755..100644
--- a/public/img/emoji/bullettrain_side.png
+++ b/public/img/emoji/bullettrain_side.png
diff --git a/public/img/emoji/bus.png b/public/img/emoji/bus.png
index 823aa39e..823aa39e 100755..100644
--- a/public/img/emoji/bus.png
+++ b/public/img/emoji/bus.png
diff --git a/public/img/emoji/busstop.png b/public/img/emoji/busstop.png
index 94894847..94894847 100755..100644
--- a/public/img/emoji/busstop.png
+++ b/public/img/emoji/busstop.png
diff --git a/public/img/emoji/bust_in_silhouette.png b/public/img/emoji/bust_in_silhouette.png
index dd7defe2..dd7defe2 100755..100644
--- a/public/img/emoji/bust_in_silhouette.png
+++ b/public/img/emoji/bust_in_silhouette.png
diff --git a/public/img/emoji/busts_in_silhouette.png b/public/img/emoji/busts_in_silhouette.png
index 1f3aabcf..1f3aabcf 100755..100644
--- a/public/img/emoji/busts_in_silhouette.png
+++ b/public/img/emoji/busts_in_silhouette.png
diff --git a/public/img/emoji/cactus.png b/public/img/emoji/cactus.png
index 5a2c3cc7..5a2c3cc7 100755..100644
--- a/public/img/emoji/cactus.png
+++ b/public/img/emoji/cactus.png
diff --git a/public/img/emoji/cake.png b/public/img/emoji/cake.png
index efeb9b4b..efeb9b4b 100755..100644
--- a/public/img/emoji/cake.png
+++ b/public/img/emoji/cake.png
diff --git a/public/img/emoji/calendar.png b/public/img/emoji/calendar.png
index 900b868b..900b868b 100755..100644
--- a/public/img/emoji/calendar.png
+++ b/public/img/emoji/calendar.png
diff --git a/public/img/emoji/calling.png b/public/img/emoji/calling.png
index 837897f2..837897f2 100755..100644
--- a/public/img/emoji/calling.png
+++ b/public/img/emoji/calling.png
diff --git a/public/img/emoji/camel.png b/public/img/emoji/camel.png
index 496c186a..496c186a 100755..100644
--- a/public/img/emoji/camel.png
+++ b/public/img/emoji/camel.png
diff --git a/public/img/emoji/camera.png b/public/img/emoji/camera.png
index 397d03b3..397d03b3 100755..100644
--- a/public/img/emoji/camera.png
+++ b/public/img/emoji/camera.png
diff --git a/public/img/emoji/cancer.png b/public/img/emoji/cancer.png
index ea43a4a2..ea43a4a2 100755..100644
--- a/public/img/emoji/cancer.png
+++ b/public/img/emoji/cancer.png
diff --git a/public/img/emoji/candy.png b/public/img/emoji/candy.png
index 33722f23..33722f23 100755..100644
--- a/public/img/emoji/candy.png
+++ b/public/img/emoji/candy.png
diff --git a/public/img/emoji/capital_abcd.png b/public/img/emoji/capital_abcd.png
index ffc0cba4..ffc0cba4 100755..100644
--- a/public/img/emoji/capital_abcd.png
+++ b/public/img/emoji/capital_abcd.png
diff --git a/public/img/emoji/capricorn.png b/public/img/emoji/capricorn.png
index f2044e78..f2044e78 100755..100644
--- a/public/img/emoji/capricorn.png
+++ b/public/img/emoji/capricorn.png
diff --git a/public/img/emoji/car.png b/public/img/emoji/car.png
index d70a2f06..d70a2f06 100755..100644
--- a/public/img/emoji/car.png
+++ b/public/img/emoji/car.png
diff --git a/public/img/emoji/card_index.png b/public/img/emoji/card_index.png
index 374e94e9..374e94e9 100755..100644
--- a/public/img/emoji/card_index.png
+++ b/public/img/emoji/card_index.png
diff --git a/public/img/emoji/carousel_horse.png b/public/img/emoji/carousel_horse.png
index 765d2c0a..765d2c0a 100755..100644
--- a/public/img/emoji/carousel_horse.png
+++ b/public/img/emoji/carousel_horse.png
diff --git a/public/img/emoji/cat.png b/public/img/emoji/cat.png
index 09b9ef79..09b9ef79 100755..100644
--- a/public/img/emoji/cat.png
+++ b/public/img/emoji/cat.png
diff --git a/public/img/emoji/cat2.png b/public/img/emoji/cat2.png
index 6dbc4c71..6dbc4c71 100755..100644
--- a/public/img/emoji/cat2.png
+++ b/public/img/emoji/cat2.png
diff --git a/public/img/emoji/cd.png b/public/img/emoji/cd.png
index baff835c..baff835c 100755..100644
--- a/public/img/emoji/cd.png
+++ b/public/img/emoji/cd.png
diff --git a/public/img/emoji/chart.png b/public/img/emoji/chart.png
index ac2c4bb0..ac2c4bb0 100755..100644
--- a/public/img/emoji/chart.png
+++ b/public/img/emoji/chart.png
diff --git a/public/img/emoji/chart_with_downwards_trend.png b/public/img/emoji/chart_with_downwards_trend.png
index cb0d2a11..cb0d2a11 100755..100644
--- a/public/img/emoji/chart_with_downwards_trend.png
+++ b/public/img/emoji/chart_with_downwards_trend.png
diff --git a/public/img/emoji/chart_with_upwards_trend.png b/public/img/emoji/chart_with_upwards_trend.png
index 7c66745c..7c66745c 100755..100644
--- a/public/img/emoji/chart_with_upwards_trend.png
+++ b/public/img/emoji/chart_with_upwards_trend.png
diff --git a/public/img/emoji/checkered_flag.png b/public/img/emoji/checkered_flag.png
index ead4a68d..ead4a68d 100755..100644
--- a/public/img/emoji/checkered_flag.png
+++ b/public/img/emoji/checkered_flag.png
diff --git a/public/img/emoji/cherries.png b/public/img/emoji/cherries.png
index 8d3e044f..8d3e044f 100755..100644
--- a/public/img/emoji/cherries.png
+++ b/public/img/emoji/cherries.png
diff --git a/public/img/emoji/cherry_blossom.png b/public/img/emoji/cherry_blossom.png
index e0315549..e0315549 100755..100644
--- a/public/img/emoji/cherry_blossom.png
+++ b/public/img/emoji/cherry_blossom.png
diff --git a/public/img/emoji/chestnut.png b/public/img/emoji/chestnut.png
index 066fb6bf..066fb6bf 100755..100644
--- a/public/img/emoji/chestnut.png
+++ b/public/img/emoji/chestnut.png
diff --git a/public/img/emoji/chicken.png b/public/img/emoji/chicken.png
index 6d25c0ef..6d25c0ef 100755..100644
--- a/public/img/emoji/chicken.png
+++ b/public/img/emoji/chicken.png
diff --git a/public/img/emoji/children_crossing.png b/public/img/emoji/children_crossing.png
index b0302ae6..b0302ae6 100755..100644
--- a/public/img/emoji/children_crossing.png
+++ b/public/img/emoji/children_crossing.png
diff --git a/public/img/emoji/chocolate_bar.png b/public/img/emoji/chocolate_bar.png
index c7ec19d0..c7ec19d0 100755..100644
--- a/public/img/emoji/chocolate_bar.png
+++ b/public/img/emoji/chocolate_bar.png
diff --git a/public/img/emoji/christmas_tree.png b/public/img/emoji/christmas_tree.png
index d813b959..d813b959 100755..100644
--- a/public/img/emoji/christmas_tree.png
+++ b/public/img/emoji/christmas_tree.png
diff --git a/public/img/emoji/church.png b/public/img/emoji/church.png
index 4c07c6b9..4c07c6b9 100755..100644
--- a/public/img/emoji/church.png
+++ b/public/img/emoji/church.png
diff --git a/public/img/emoji/cinema.png b/public/img/emoji/cinema.png
index a990ccf9..a990ccf9 100755..100644
--- a/public/img/emoji/cinema.png
+++ b/public/img/emoji/cinema.png
diff --git a/public/img/emoji/circus_tent.png b/public/img/emoji/circus_tent.png
index 4af8719a..4af8719a 100755..100644
--- a/public/img/emoji/circus_tent.png
+++ b/public/img/emoji/circus_tent.png
diff --git a/public/img/emoji/city_sunrise.png b/public/img/emoji/city_sunrise.png
index 91ca2a40..91ca2a40 100755..100644
--- a/public/img/emoji/city_sunrise.png
+++ b/public/img/emoji/city_sunrise.png
diff --git a/public/img/emoji/city_sunset.png b/public/img/emoji/city_sunset.png
index 7cb178a2..7cb178a2 100755..100644
--- a/public/img/emoji/city_sunset.png
+++ b/public/img/emoji/city_sunset.png
diff --git a/public/img/emoji/cl.png b/public/img/emoji/cl.png
index 15ac6752..15ac6752 100755..100644
--- a/public/img/emoji/cl.png
+++ b/public/img/emoji/cl.png
diff --git a/public/img/emoji/clap.png b/public/img/emoji/clap.png
index d01c982a..d01c982a 100755..100644
--- a/public/img/emoji/clap.png
+++ b/public/img/emoji/clap.png
diff --git a/public/img/emoji/clapper.png b/public/img/emoji/clapper.png
index 4e1dc111..4e1dc111 100755..100644
--- a/public/img/emoji/clapper.png
+++ b/public/img/emoji/clapper.png
diff --git a/public/img/emoji/clipboard.png b/public/img/emoji/clipboard.png
index e2c74e6d..e2c74e6d 100755..100644
--- a/public/img/emoji/clipboard.png
+++ b/public/img/emoji/clipboard.png
diff --git a/public/img/emoji/clock1.png b/public/img/emoji/clock1.png
index 9174d4e0..9174d4e0 100755..100644
--- a/public/img/emoji/clock1.png
+++ b/public/img/emoji/clock1.png
diff --git a/public/img/emoji/clock10.png b/public/img/emoji/clock10.png
index 39f590d6..39f590d6 100755..100644
--- a/public/img/emoji/clock10.png
+++ b/public/img/emoji/clock10.png
diff --git a/public/img/emoji/clock1030.png b/public/img/emoji/clock1030.png
index 0483b305..0483b305 100755..100644
--- a/public/img/emoji/clock1030.png
+++ b/public/img/emoji/clock1030.png
diff --git a/public/img/emoji/clock11.png b/public/img/emoji/clock11.png
index ddb53fad..ddb53fad 100755..100644
--- a/public/img/emoji/clock11.png
+++ b/public/img/emoji/clock11.png
diff --git a/public/img/emoji/clock1130.png b/public/img/emoji/clock1130.png
index 415999ec..415999ec 100755..100644
--- a/public/img/emoji/clock1130.png
+++ b/public/img/emoji/clock1130.png
diff --git a/public/img/emoji/clock12.png b/public/img/emoji/clock12.png
index 87b13287..87b13287 100755..100644
--- a/public/img/emoji/clock12.png
+++ b/public/img/emoji/clock12.png
diff --git a/public/img/emoji/clock1230.png b/public/img/emoji/clock1230.png
index a6527154..a6527154 100755..100644
--- a/public/img/emoji/clock1230.png
+++ b/public/img/emoji/clock1230.png
diff --git a/public/img/emoji/clock130.png b/public/img/emoji/clock130.png
index 90ea5b91..90ea5b91 100755..100644
--- a/public/img/emoji/clock130.png
+++ b/public/img/emoji/clock130.png
diff --git a/public/img/emoji/clock2.png b/public/img/emoji/clock2.png
index 65b3b3af..65b3b3af 100755..100644
--- a/public/img/emoji/clock2.png
+++ b/public/img/emoji/clock2.png
diff --git a/public/img/emoji/clock230.png b/public/img/emoji/clock230.png
index f12c6912..f12c6912 100755..100644
--- a/public/img/emoji/clock230.png
+++ b/public/img/emoji/clock230.png
diff --git a/public/img/emoji/clock3.png b/public/img/emoji/clock3.png
index 3e44d64e..3e44d64e 100755..100644
--- a/public/img/emoji/clock3.png
+++ b/public/img/emoji/clock3.png
diff --git a/public/img/emoji/clock330.png b/public/img/emoji/clock330.png
index 1dc9628e..1dc9628e 100755..100644
--- a/public/img/emoji/clock330.png
+++ b/public/img/emoji/clock330.png
diff --git a/public/img/emoji/clock4.png b/public/img/emoji/clock4.png
index 948ed1a3..948ed1a3 100755..100644
--- a/public/img/emoji/clock4.png
+++ b/public/img/emoji/clock4.png
diff --git a/public/img/emoji/clock430.png b/public/img/emoji/clock430.png
index 5d6b16a2..5d6b16a2 100755..100644
--- a/public/img/emoji/clock430.png
+++ b/public/img/emoji/clock430.png
diff --git a/public/img/emoji/clock5.png b/public/img/emoji/clock5.png
index b010b4f8..b010b4f8 100755..100644
--- a/public/img/emoji/clock5.png
+++ b/public/img/emoji/clock5.png
diff --git a/public/img/emoji/clock530.png b/public/img/emoji/clock530.png
index e08d4ad2..e08d4ad2 100755..100644
--- a/public/img/emoji/clock530.png
+++ b/public/img/emoji/clock530.png
diff --git a/public/img/emoji/clock6.png b/public/img/emoji/clock6.png
index 76bf8cf1..76bf8cf1 100755..100644
--- a/public/img/emoji/clock6.png
+++ b/public/img/emoji/clock6.png
diff --git a/public/img/emoji/clock630.png b/public/img/emoji/clock630.png
index 46f0681f..46f0681f 100755..100644
--- a/public/img/emoji/clock630.png
+++ b/public/img/emoji/clock630.png
diff --git a/public/img/emoji/clock7.png b/public/img/emoji/clock7.png
index d48f645d..d48f645d 100755..100644
--- a/public/img/emoji/clock7.png
+++ b/public/img/emoji/clock7.png
diff --git a/public/img/emoji/clock730.png b/public/img/emoji/clock730.png
index f2807de2..f2807de2 100755..100644
--- a/public/img/emoji/clock730.png
+++ b/public/img/emoji/clock730.png
diff --git a/public/img/emoji/clock8.png b/public/img/emoji/clock8.png
index 74c770d8..74c770d8 100755..100644
--- a/public/img/emoji/clock8.png
+++ b/public/img/emoji/clock8.png
diff --git a/public/img/emoji/clock830.png b/public/img/emoji/clock830.png
index f58f3dad..f58f3dad 100755..100644
--- a/public/img/emoji/clock830.png
+++ b/public/img/emoji/clock830.png
diff --git a/public/img/emoji/clock9.png b/public/img/emoji/clock9.png
index f009d14a..f009d14a 100755..100644
--- a/public/img/emoji/clock9.png
+++ b/public/img/emoji/clock9.png
diff --git a/public/img/emoji/clock930.png b/public/img/emoji/clock930.png
index fd352214..fd352214 100755..100644
--- a/public/img/emoji/clock930.png
+++ b/public/img/emoji/clock930.png
diff --git a/public/img/emoji/closed_book.png b/public/img/emoji/closed_book.png
index 484029c5..484029c5 100755..100644
--- a/public/img/emoji/closed_book.png
+++ b/public/img/emoji/closed_book.png
diff --git a/public/img/emoji/closed_lock_with_key.png b/public/img/emoji/closed_lock_with_key.png
index e6fdf6cb..e6fdf6cb 100755..100644
--- a/public/img/emoji/closed_lock_with_key.png
+++ b/public/img/emoji/closed_lock_with_key.png
diff --git a/public/img/emoji/closed_umbrella.png b/public/img/emoji/closed_umbrella.png
index 0b719f08..0b719f08 100755..100644
--- a/public/img/emoji/closed_umbrella.png
+++ b/public/img/emoji/closed_umbrella.png
diff --git a/public/img/emoji/cloud.png b/public/img/emoji/cloud.png
index b31c08c0..b31c08c0 100755..100644
--- a/public/img/emoji/cloud.png
+++ b/public/img/emoji/cloud.png
diff --git a/public/img/emoji/clubs.png b/public/img/emoji/clubs.png
index bfab5365..bfab5365 100755..100644
--- a/public/img/emoji/clubs.png
+++ b/public/img/emoji/clubs.png
diff --git a/public/img/emoji/cn.png b/public/img/emoji/cn.png
index b30dcc53..b30dcc53 100755..100644
--- a/public/img/emoji/cn.png
+++ b/public/img/emoji/cn.png
diff --git a/public/img/emoji/cocktail.png b/public/img/emoji/cocktail.png
index 28b45ea5..28b45ea5 100755..100644
--- a/public/img/emoji/cocktail.png
+++ b/public/img/emoji/cocktail.png
diff --git a/public/img/emoji/coffee.png b/public/img/emoji/coffee.png
index 57e1adcb..57e1adcb 100755..100644
--- a/public/img/emoji/coffee.png
+++ b/public/img/emoji/coffee.png
diff --git a/public/img/emoji/cold_sweat.png b/public/img/emoji/cold_sweat.png
index b9e39bc6..b9e39bc6 100755..100644
--- a/public/img/emoji/cold_sweat.png
+++ b/public/img/emoji/cold_sweat.png
diff --git a/public/img/emoji/collision.png b/public/img/emoji/collision.png
index 9d5bd040..9d5bd040 100755..100644
--- a/public/img/emoji/collision.png
+++ b/public/img/emoji/collision.png
diff --git a/public/img/emoji/computer.png b/public/img/emoji/computer.png
index d4d26876..d4d26876 100755..100644
--- a/public/img/emoji/computer.png
+++ b/public/img/emoji/computer.png
diff --git a/public/img/emoji/confetti_ball.png b/public/img/emoji/confetti_ball.png
index bd293e3d..bd293e3d 100755..100644
--- a/public/img/emoji/confetti_ball.png
+++ b/public/img/emoji/confetti_ball.png
diff --git a/public/img/emoji/confounded.png b/public/img/emoji/confounded.png
index 762c3766..762c3766 100755..100644
--- a/public/img/emoji/confounded.png
+++ b/public/img/emoji/confounded.png
diff --git a/public/img/emoji/confused.png b/public/img/emoji/confused.png
index 8dc494db..8dc494db 100755..100644
--- a/public/img/emoji/confused.png
+++ b/public/img/emoji/confused.png
diff --git a/public/img/emoji/congratulations.png b/public/img/emoji/congratulations.png
index 85814e33..85814e33 100755..100644
--- a/public/img/emoji/congratulations.png
+++ b/public/img/emoji/congratulations.png
diff --git a/public/img/emoji/construction.png b/public/img/emoji/construction.png
index 523e9f10..523e9f10 100755..100644
--- a/public/img/emoji/construction.png
+++ b/public/img/emoji/construction.png
diff --git a/public/img/emoji/construction_worker.png b/public/img/emoji/construction_worker.png
index 4d648604..4d648604 100755..100644
--- a/public/img/emoji/construction_worker.png
+++ b/public/img/emoji/construction_worker.png
diff --git a/public/img/emoji/convenience_store.png b/public/img/emoji/convenience_store.png
index 671696c2..671696c2 100755..100644
--- a/public/img/emoji/convenience_store.png
+++ b/public/img/emoji/convenience_store.png
diff --git a/public/img/emoji/cookie.png b/public/img/emoji/cookie.png
index 653edb25..653edb25 100755..100644
--- a/public/img/emoji/cookie.png
+++ b/public/img/emoji/cookie.png
diff --git a/public/img/emoji/cool.png b/public/img/emoji/cool.png
index 937dcd79..937dcd79 100755..100644
--- a/public/img/emoji/cool.png
+++ b/public/img/emoji/cool.png
diff --git a/public/img/emoji/cop.png b/public/img/emoji/cop.png
index 43a5a84f..43a5a84f 100755..100644
--- a/public/img/emoji/cop.png
+++ b/public/img/emoji/cop.png
diff --git a/public/img/emoji/copyright.png b/public/img/emoji/copyright.png
index 38493c33..38493c33 100755..100644
--- a/public/img/emoji/copyright.png
+++ b/public/img/emoji/copyright.png
diff --git a/public/img/emoji/corn.png b/public/img/emoji/corn.png
index fe5d8b12..fe5d8b12 100755..100644
--- a/public/img/emoji/corn.png
+++ b/public/img/emoji/corn.png
diff --git a/public/img/emoji/couple.png b/public/img/emoji/couple.png
index 9e51f40e..9e51f40e 100755..100644
--- a/public/img/emoji/couple.png
+++ b/public/img/emoji/couple.png
diff --git a/public/img/emoji/couple_with_heart.png b/public/img/emoji/couple_with_heart.png
index c503f40a..c503f40a 100755..100644
--- a/public/img/emoji/couple_with_heart.png
+++ b/public/img/emoji/couple_with_heart.png
diff --git a/public/img/emoji/couplekiss.png b/public/img/emoji/couplekiss.png
index d0279082..d0279082 100755..100644
--- a/public/img/emoji/couplekiss.png
+++ b/public/img/emoji/couplekiss.png
diff --git a/public/img/emoji/cow.png b/public/img/emoji/cow.png
index 12e1ab6c..12e1ab6c 100755..100644
--- a/public/img/emoji/cow.png
+++ b/public/img/emoji/cow.png
diff --git a/public/img/emoji/cow2.png b/public/img/emoji/cow2.png
index 594c9215..594c9215 100755..100644
--- a/public/img/emoji/cow2.png
+++ b/public/img/emoji/cow2.png
diff --git a/public/img/emoji/credit_card.png b/public/img/emoji/credit_card.png
index be1c1dd3..be1c1dd3 100755..100644
--- a/public/img/emoji/credit_card.png
+++ b/public/img/emoji/credit_card.png
diff --git a/public/img/emoji/crescent_moon.png b/public/img/emoji/crescent_moon.png
index afdb450d..afdb450d 100755..100644
--- a/public/img/emoji/crescent_moon.png
+++ b/public/img/emoji/crescent_moon.png
diff --git a/public/img/emoji/crocodile.png b/public/img/emoji/crocodile.png
index 7435d5ab..7435d5ab 100755..100644
--- a/public/img/emoji/crocodile.png
+++ b/public/img/emoji/crocodile.png
diff --git a/public/img/emoji/crossed_flags.png b/public/img/emoji/crossed_flags.png
index 2397bcd0..2397bcd0 100755..100644
--- a/public/img/emoji/crossed_flags.png
+++ b/public/img/emoji/crossed_flags.png
diff --git a/public/img/emoji/crown.png b/public/img/emoji/crown.png
index 39da1d52..39da1d52 100755..100644
--- a/public/img/emoji/crown.png
+++ b/public/img/emoji/crown.png
diff --git a/public/img/emoji/cry.png b/public/img/emoji/cry.png
index 6d0d9afd..6d0d9afd 100755..100644
--- a/public/img/emoji/cry.png
+++ b/public/img/emoji/cry.png
diff --git a/public/img/emoji/crying_cat_face.png b/public/img/emoji/crying_cat_face.png
index 42d4c27c..42d4c27c 100755..100644
--- a/public/img/emoji/crying_cat_face.png
+++ b/public/img/emoji/crying_cat_face.png
diff --git a/public/img/emoji/crystal_ball.png b/public/img/emoji/crystal_ball.png
index 6d2c6c42..6d2c6c42 100755..100644
--- a/public/img/emoji/crystal_ball.png
+++ b/public/img/emoji/crystal_ball.png
diff --git a/public/img/emoji/cupid.png b/public/img/emoji/cupid.png
index 49872847..49872847 100755..100644
--- a/public/img/emoji/cupid.png
+++ b/public/img/emoji/cupid.png
diff --git a/public/img/emoji/curly_loop.png b/public/img/emoji/curly_loop.png
index 7dd841d0..7dd841d0 100755..100644
--- a/public/img/emoji/curly_loop.png
+++ b/public/img/emoji/curly_loop.png
diff --git a/public/img/emoji/currency_exchange.png b/public/img/emoji/currency_exchange.png
index 6ebebe70..6ebebe70 100755..100644
--- a/public/img/emoji/currency_exchange.png
+++ b/public/img/emoji/currency_exchange.png
diff --git a/public/img/emoji/curry.png b/public/img/emoji/curry.png
index 7983c706..7983c706 100755..100644
--- a/public/img/emoji/curry.png
+++ b/public/img/emoji/curry.png
diff --git a/public/img/emoji/custard.png b/public/img/emoji/custard.png
index 9f843b4c..9f843b4c 100755..100644
--- a/public/img/emoji/custard.png
+++ b/public/img/emoji/custard.png
diff --git a/public/img/emoji/customs.png b/public/img/emoji/customs.png
index 92691e31..92691e31 100755..100644
--- a/public/img/emoji/customs.png
+++ b/public/img/emoji/customs.png
diff --git a/public/img/emoji/cyclone.png b/public/img/emoji/cyclone.png
index 5fd2e451..5fd2e451 100755..100644
--- a/public/img/emoji/cyclone.png
+++ b/public/img/emoji/cyclone.png
diff --git a/public/img/emoji/dancer.png b/public/img/emoji/dancer.png
index 7a7bf59f..7a7bf59f 100755..100644
--- a/public/img/emoji/dancer.png
+++ b/public/img/emoji/dancer.png
diff --git a/public/img/emoji/dancers.png b/public/img/emoji/dancers.png
index 2dfb451a..2dfb451a 100755..100644
--- a/public/img/emoji/dancers.png
+++ b/public/img/emoji/dancers.png
diff --git a/public/img/emoji/dango.png b/public/img/emoji/dango.png
index 2d042aeb..2d042aeb 100755..100644
--- a/public/img/emoji/dango.png
+++ b/public/img/emoji/dango.png
diff --git a/public/img/emoji/dart.png b/public/img/emoji/dart.png
index 5f16864c..5f16864c 100755..100644
--- a/public/img/emoji/dart.png
+++ b/public/img/emoji/dart.png
diff --git a/public/img/emoji/dash.png b/public/img/emoji/dash.png
index dc2c0a8f..dc2c0a8f 100755..100644
--- a/public/img/emoji/dash.png
+++ b/public/img/emoji/dash.png
diff --git a/public/img/emoji/date.png b/public/img/emoji/date.png
index 6ad2efa5..6ad2efa5 100755..100644
--- a/public/img/emoji/date.png
+++ b/public/img/emoji/date.png
diff --git a/public/img/emoji/de.png b/public/img/emoji/de.png
index 16a28548..16a28548 100755..100644
--- a/public/img/emoji/de.png
+++ b/public/img/emoji/de.png
diff --git a/public/img/emoji/deciduous_tree.png b/public/img/emoji/deciduous_tree.png
index 3fdf8c00..3fdf8c00 100755..100644
--- a/public/img/emoji/deciduous_tree.png
+++ b/public/img/emoji/deciduous_tree.png
diff --git a/public/img/emoji/department_store.png b/public/img/emoji/department_store.png
index 68d959c5..68d959c5 100755..100644
--- a/public/img/emoji/department_store.png
+++ b/public/img/emoji/department_store.png
diff --git a/public/img/emoji/diamond_shape_with_a_dot_inside.png b/public/img/emoji/diamond_shape_with_a_dot_inside.png
index dfd1098b..dfd1098b 100755..100644
--- a/public/img/emoji/diamond_shape_with_a_dot_inside.png
+++ b/public/img/emoji/diamond_shape_with_a_dot_inside.png
diff --git a/public/img/emoji/diamonds.png b/public/img/emoji/diamonds.png
index fe082775..fe082775 100755..100644
--- a/public/img/emoji/diamonds.png
+++ b/public/img/emoji/diamonds.png
diff --git a/public/img/emoji/disappointed.png b/public/img/emoji/disappointed.png
index 82552008..82552008 100755..100644
--- a/public/img/emoji/disappointed.png
+++ b/public/img/emoji/disappointed.png
diff --git a/public/img/emoji/disappointed_relieved.png b/public/img/emoji/disappointed_relieved.png
index fa5f9e7f..fa5f9e7f 100755..100644
--- a/public/img/emoji/disappointed_relieved.png
+++ b/public/img/emoji/disappointed_relieved.png
diff --git a/public/img/emoji/dizzy.png b/public/img/emoji/dizzy.png
index 3702b613..3702b613 100755..100644
--- a/public/img/emoji/dizzy.png
+++ b/public/img/emoji/dizzy.png
diff --git a/public/img/emoji/dizzy_face.png b/public/img/emoji/dizzy_face.png
index 8001d6ff..8001d6ff 100755..100644
--- a/public/img/emoji/dizzy_face.png
+++ b/public/img/emoji/dizzy_face.png
diff --git a/public/img/emoji/do_not_litter.png b/public/img/emoji/do_not_litter.png
index 38c7ae7a..38c7ae7a 100755..100644
--- a/public/img/emoji/do_not_litter.png
+++ b/public/img/emoji/do_not_litter.png
diff --git a/public/img/emoji/dog.png b/public/img/emoji/dog.png
index 389a02bf..389a02bf 100755..100644
--- a/public/img/emoji/dog.png
+++ b/public/img/emoji/dog.png
diff --git a/public/img/emoji/dog2.png b/public/img/emoji/dog2.png
index c7f6a24a..c7f6a24a 100755..100644
--- a/public/img/emoji/dog2.png
+++ b/public/img/emoji/dog2.png
diff --git a/public/img/emoji/dollar.png b/public/img/emoji/dollar.png
index 63de8849..63de8849 100755..100644
--- a/public/img/emoji/dollar.png
+++ b/public/img/emoji/dollar.png
diff --git a/public/img/emoji/dolls.png b/public/img/emoji/dolls.png
index 47ce3390..47ce3390 100755..100644
--- a/public/img/emoji/dolls.png
+++ b/public/img/emoji/dolls.png
diff --git a/public/img/emoji/dolphin.png b/public/img/emoji/dolphin.png
index 9326077a..9326077a 100755..100644
--- a/public/img/emoji/dolphin.png
+++ b/public/img/emoji/dolphin.png
diff --git a/public/img/emoji/donut.png b/public/img/emoji/donut.png
index ccf86912..ccf86912 100755..100644
--- a/public/img/emoji/donut.png
+++ b/public/img/emoji/donut.png
diff --git a/public/img/emoji/door.png b/public/img/emoji/door.png
index 83c819ae..83c819ae 100755..100644
--- a/public/img/emoji/door.png
+++ b/public/img/emoji/door.png
diff --git a/public/img/emoji/doughnut.png b/public/img/emoji/doughnut.png
index ccf86912..ccf86912 100755..100644
--- a/public/img/emoji/doughnut.png
+++ b/public/img/emoji/doughnut.png
diff --git a/public/img/emoji/dragon.png b/public/img/emoji/dragon.png
index 88d4784b..88d4784b 100755..100644
--- a/public/img/emoji/dragon.png
+++ b/public/img/emoji/dragon.png
diff --git a/public/img/emoji/dragon_face.png b/public/img/emoji/dragon_face.png
index e5e556bd..e5e556bd 100755..100644
--- a/public/img/emoji/dragon_face.png
+++ b/public/img/emoji/dragon_face.png
diff --git a/public/img/emoji/dress.png b/public/img/emoji/dress.png
index 6434e2e2..6434e2e2 100755..100644
--- a/public/img/emoji/dress.png
+++ b/public/img/emoji/dress.png
diff --git a/public/img/emoji/dromedary_camel.png b/public/img/emoji/dromedary_camel.png
index c8c7b9ff..c8c7b9ff 100755..100644
--- a/public/img/emoji/dromedary_camel.png
+++ b/public/img/emoji/dromedary_camel.png
diff --git a/public/img/emoji/droplet.png b/public/img/emoji/droplet.png
index cae7f495..cae7f495 100755..100644
--- a/public/img/emoji/droplet.png
+++ b/public/img/emoji/droplet.png
diff --git a/public/img/emoji/dvd.png b/public/img/emoji/dvd.png
index 363c83d0..363c83d0 100755..100644
--- a/public/img/emoji/dvd.png
+++ b/public/img/emoji/dvd.png
diff --git a/public/img/emoji/e-mail.png b/public/img/emoji/e-mail.png
index 176a8e1e..176a8e1e 100755..100644
--- a/public/img/emoji/e-mail.png
+++ b/public/img/emoji/e-mail.png
diff --git a/public/img/emoji/ear.png b/public/img/emoji/ear.png
index 2bbbf10c..2bbbf10c 100755..100644
--- a/public/img/emoji/ear.png
+++ b/public/img/emoji/ear.png
diff --git a/public/img/emoji/ear_of_rice.png b/public/img/emoji/ear_of_rice.png
index a9bba5c2..a9bba5c2 100755..100644
--- a/public/img/emoji/ear_of_rice.png
+++ b/public/img/emoji/ear_of_rice.png
diff --git a/public/img/emoji/earth_africa.png b/public/img/emoji/earth_africa.png
index 44ce5ecb..44ce5ecb 100755..100644
--- a/public/img/emoji/earth_africa.png
+++ b/public/img/emoji/earth_africa.png
diff --git a/public/img/emoji/earth_americas.png b/public/img/emoji/earth_americas.png
index 97d71767..97d71767 100755..100644
--- a/public/img/emoji/earth_americas.png
+++ b/public/img/emoji/earth_americas.png
diff --git a/public/img/emoji/earth_asia.png b/public/img/emoji/earth_asia.png
index 95ec357c..95ec357c 100755..100644
--- a/public/img/emoji/earth_asia.png
+++ b/public/img/emoji/earth_asia.png
diff --git a/public/img/emoji/egg.png b/public/img/emoji/egg.png
index c3de6ae4..c3de6ae4 100755..100644
--- a/public/img/emoji/egg.png
+++ b/public/img/emoji/egg.png
diff --git a/public/img/emoji/eggplant.png b/public/img/emoji/eggplant.png
index 66f25fce..66f25fce 100755..100644
--- a/public/img/emoji/eggplant.png
+++ b/public/img/emoji/eggplant.png
diff --git a/public/img/emoji/eight.png b/public/img/emoji/eight.png
index 7bdb4223..7bdb4223 100755..100644
--- a/public/img/emoji/eight.png
+++ b/public/img/emoji/eight.png
diff --git a/public/img/emoji/eight_pointed_black_star.png b/public/img/emoji/eight_pointed_black_star.png
index 2420a776..2420a776 100755..100644
--- a/public/img/emoji/eight_pointed_black_star.png
+++ b/public/img/emoji/eight_pointed_black_star.png
diff --git a/public/img/emoji/eight_spoked_asterisk.png b/public/img/emoji/eight_spoked_asterisk.png
index 946a2033..946a2033 100755..100644
--- a/public/img/emoji/eight_spoked_asterisk.png
+++ b/public/img/emoji/eight_spoked_asterisk.png
diff --git a/public/img/emoji/electric_plug.png b/public/img/emoji/electric_plug.png
index 2837bab4..2837bab4 100755..100644
--- a/public/img/emoji/electric_plug.png
+++ b/public/img/emoji/electric_plug.png
diff --git a/public/img/emoji/elephant.png b/public/img/emoji/elephant.png
index 5ca04570..5ca04570 100755..100644
--- a/public/img/emoji/elephant.png
+++ b/public/img/emoji/elephant.png
diff --git a/public/img/emoji/email.png b/public/img/emoji/email.png
index 0e01fd5f..0e01fd5f 100755..100644
--- a/public/img/emoji/email.png
+++ b/public/img/emoji/email.png
diff --git a/public/img/emoji/end.png b/public/img/emoji/end.png
index 61a4399a..61a4399a 100755..100644
--- a/public/img/emoji/end.png
+++ b/public/img/emoji/end.png
diff --git a/public/img/emoji/envelope.png b/public/img/emoji/envelope.png
index 3631861b..3631861b 100755..100644
--- a/public/img/emoji/envelope.png
+++ b/public/img/emoji/envelope.png
diff --git a/public/img/emoji/es.png b/public/img/emoji/es.png
index 71b30bff..71b30bff 100755..100644
--- a/public/img/emoji/es.png
+++ b/public/img/emoji/es.png
diff --git a/public/img/emoji/euro.png b/public/img/emoji/euro.png
index 1c5904b7..1c5904b7 100755..100644
--- a/public/img/emoji/euro.png
+++ b/public/img/emoji/euro.png
diff --git a/public/img/emoji/european_castle.png b/public/img/emoji/european_castle.png
index 8229b8a8..8229b8a8 100755..100644
--- a/public/img/emoji/european_castle.png
+++ b/public/img/emoji/european_castle.png
diff --git a/public/img/emoji/european_post_office.png b/public/img/emoji/european_post_office.png
index 0f65b145..0f65b145 100755..100644
--- a/public/img/emoji/european_post_office.png
+++ b/public/img/emoji/european_post_office.png
diff --git a/public/img/emoji/evergreen_tree.png b/public/img/emoji/evergreen_tree.png
index ae8ad103..ae8ad103 100755..100644
--- a/public/img/emoji/evergreen_tree.png
+++ b/public/img/emoji/evergreen_tree.png
diff --git a/public/img/emoji/exclamation.png b/public/img/emoji/exclamation.png
index 77bbdeab..77bbdeab 100755..100644
--- a/public/img/emoji/exclamation.png
+++ b/public/img/emoji/exclamation.png
diff --git a/public/img/emoji/expressionless.png b/public/img/emoji/expressionless.png
index 913ff4e2..913ff4e2 100755..100644
--- a/public/img/emoji/expressionless.png
+++ b/public/img/emoji/expressionless.png
diff --git a/public/img/emoji/eyeglasses.png b/public/img/emoji/eyeglasses.png
index a3cf75a2..a3cf75a2 100755..100644
--- a/public/img/emoji/eyeglasses.png
+++ b/public/img/emoji/eyeglasses.png
diff --git a/public/img/emoji/eyes.png b/public/img/emoji/eyes.png
index 1ac24a61..1ac24a61 100755..100644
--- a/public/img/emoji/eyes.png
+++ b/public/img/emoji/eyes.png
diff --git a/public/img/emoji/facepunch.png b/public/img/emoji/facepunch.png
index 277047b7..277047b7 100755..100644
--- a/public/img/emoji/facepunch.png
+++ b/public/img/emoji/facepunch.png
diff --git a/public/img/emoji/factory.png b/public/img/emoji/factory.png
index 64046347..64046347 100755..100644
--- a/public/img/emoji/factory.png
+++ b/public/img/emoji/factory.png
diff --git a/public/img/emoji/fallen_leaf.png b/public/img/emoji/fallen_leaf.png
index d49f9c17..d49f9c17 100755..100644
--- a/public/img/emoji/fallen_leaf.png
+++ b/public/img/emoji/fallen_leaf.png
diff --git a/public/img/emoji/family.png b/public/img/emoji/family.png
index b4b365f3..b4b365f3 100755..100644
--- a/public/img/emoji/family.png
+++ b/public/img/emoji/family.png
diff --git a/public/img/emoji/fast_forward.png b/public/img/emoji/fast_forward.png
index 8830e146..8830e146 100755..100644
--- a/public/img/emoji/fast_forward.png
+++ b/public/img/emoji/fast_forward.png
diff --git a/public/img/emoji/fax.png b/public/img/emoji/fax.png
index 62be2c95..62be2c95 100755..100644
--- a/public/img/emoji/fax.png
+++ b/public/img/emoji/fax.png
diff --git a/public/img/emoji/fearful.png b/public/img/emoji/fearful.png
index 513fce47..513fce47 100755..100644
--- a/public/img/emoji/fearful.png
+++ b/public/img/emoji/fearful.png
diff --git a/public/img/emoji/feelsgood.png b/public/img/emoji/feelsgood.png
index 361f969b..361f969b 100755..100644
--- a/public/img/emoji/feelsgood.png
+++ b/public/img/emoji/feelsgood.png
diff --git a/public/img/emoji/feet.png b/public/img/emoji/feet.png
index 1b0147b1..1b0147b1 100755..100644
--- a/public/img/emoji/feet.png
+++ b/public/img/emoji/feet.png
diff --git a/public/img/emoji/ferris_wheel.png b/public/img/emoji/ferris_wheel.png
index 54a1dcfa..54a1dcfa 100755..100644
--- a/public/img/emoji/ferris_wheel.png
+++ b/public/img/emoji/ferris_wheel.png
diff --git a/public/img/emoji/file_folder.png b/public/img/emoji/file_folder.png
index 4d8bebf8..4d8bebf8 100755..100644
--- a/public/img/emoji/file_folder.png
+++ b/public/img/emoji/file_folder.png
diff --git a/public/img/emoji/finnadie.png b/public/img/emoji/finnadie.png
index bfc5a0d9..bfc5a0d9 100755..100644
--- a/public/img/emoji/finnadie.png
+++ b/public/img/emoji/finnadie.png
diff --git a/public/img/emoji/fire.png b/public/img/emoji/fire.png
index f2a3149b..f2a3149b 100755..100644
--- a/public/img/emoji/fire.png
+++ b/public/img/emoji/fire.png
diff --git a/public/img/emoji/fire_engine.png b/public/img/emoji/fire_engine.png
index 9e6c59c9..9e6c59c9 100755..100644
--- a/public/img/emoji/fire_engine.png
+++ b/public/img/emoji/fire_engine.png
diff --git a/public/img/emoji/fireworks.png b/public/img/emoji/fireworks.png
index b4eccd57..b4eccd57 100755..100644
--- a/public/img/emoji/fireworks.png
+++ b/public/img/emoji/fireworks.png
diff --git a/public/img/emoji/first_quarter_moon.png b/public/img/emoji/first_quarter_moon.png
index f38c2369..f38c2369 100755..100644
--- a/public/img/emoji/first_quarter_moon.png
+++ b/public/img/emoji/first_quarter_moon.png
diff --git a/public/img/emoji/first_quarter_moon_with_face.png b/public/img/emoji/first_quarter_moon_with_face.png
index 85ae2ce7..85ae2ce7 100755..100644
--- a/public/img/emoji/first_quarter_moon_with_face.png
+++ b/public/img/emoji/first_quarter_moon_with_face.png
diff --git a/public/img/emoji/fish.png b/public/img/emoji/fish.png
index 90bdda2c..90bdda2c 100755..100644
--- a/public/img/emoji/fish.png
+++ b/public/img/emoji/fish.png
diff --git a/public/img/emoji/fish_cake.png b/public/img/emoji/fish_cake.png
index a8f22614..a8f22614 100755..100644
--- a/public/img/emoji/fish_cake.png
+++ b/public/img/emoji/fish_cake.png
diff --git a/public/img/emoji/fishing_pole_and_fish.png b/public/img/emoji/fishing_pole_and_fish.png
index d84609c3..d84609c3 100755..100644
--- a/public/img/emoji/fishing_pole_and_fish.png
+++ b/public/img/emoji/fishing_pole_and_fish.png
diff --git a/public/img/emoji/fist.png b/public/img/emoji/fist.png
index ecc8874c..ecc8874c 100755..100644
--- a/public/img/emoji/fist.png
+++ b/public/img/emoji/fist.png
diff --git a/public/img/emoji/five.png b/public/img/emoji/five.png
index 794321aa..794321aa 100755..100644
--- a/public/img/emoji/five.png
+++ b/public/img/emoji/five.png
diff --git a/public/img/emoji/flags.png b/public/img/emoji/flags.png
index 540164e8..540164e8 100755..100644
--- a/public/img/emoji/flags.png
+++ b/public/img/emoji/flags.png
diff --git a/public/img/emoji/flashlight.png b/public/img/emoji/flashlight.png
index 215940aa..215940aa 100755..100644
--- a/public/img/emoji/flashlight.png
+++ b/public/img/emoji/flashlight.png
diff --git a/public/img/emoji/floppy_disk.png b/public/img/emoji/floppy_disk.png
index 4ad56315..4ad56315 100755..100644
--- a/public/img/emoji/floppy_disk.png
+++ b/public/img/emoji/floppy_disk.png
diff --git a/public/img/emoji/flower_playing_cards.png b/public/img/emoji/flower_playing_cards.png
index cc46a6a1..cc46a6a1 100755..100644
--- a/public/img/emoji/flower_playing_cards.png
+++ b/public/img/emoji/flower_playing_cards.png
diff --git a/public/img/emoji/flushed.png b/public/img/emoji/flushed.png
index 74b78c9c..74b78c9c 100755..100644
--- a/public/img/emoji/flushed.png
+++ b/public/img/emoji/flushed.png
diff --git a/public/img/emoji/foggy.png b/public/img/emoji/foggy.png
index 3c7b8b04..3c7b8b04 100755..100644
--- a/public/img/emoji/foggy.png
+++ b/public/img/emoji/foggy.png
diff --git a/public/img/emoji/football.png b/public/img/emoji/football.png
index 0e4e168f..0e4e168f 100755..100644
--- a/public/img/emoji/football.png
+++ b/public/img/emoji/football.png
diff --git a/public/img/emoji/fork_and_knife.png b/public/img/emoji/fork_and_knife.png
index 8ba4bc65..8ba4bc65 100755..100644
--- a/public/img/emoji/fork_and_knife.png
+++ b/public/img/emoji/fork_and_knife.png
diff --git a/public/img/emoji/fountain.png b/public/img/emoji/fountain.png
index da126e64..da126e64 100755..100644
--- a/public/img/emoji/fountain.png
+++ b/public/img/emoji/fountain.png
diff --git a/public/img/emoji/four.png b/public/img/emoji/four.png
index 14782ba2..14782ba2 100755..100644
--- a/public/img/emoji/four.png
+++ b/public/img/emoji/four.png
diff --git a/public/img/emoji/four_leaf_clover.png b/public/img/emoji/four_leaf_clover.png
index f2014bea..f2014bea 100755..100644
--- a/public/img/emoji/four_leaf_clover.png
+++ b/public/img/emoji/four_leaf_clover.png
diff --git a/public/img/emoji/fr.png b/public/img/emoji/fr.png
index 6311c911..6311c911 100755..100644
--- a/public/img/emoji/fr.png
+++ b/public/img/emoji/fr.png
diff --git a/public/img/emoji/free.png b/public/img/emoji/free.png
index c886cf24..c886cf24 100755..100644
--- a/public/img/emoji/free.png
+++ b/public/img/emoji/free.png
diff --git a/public/img/emoji/fried_shrimp.png b/public/img/emoji/fried_shrimp.png
index c8c284bf..c8c284bf 100755..100644
--- a/public/img/emoji/fried_shrimp.png
+++ b/public/img/emoji/fried_shrimp.png
diff --git a/public/img/emoji/fries.png b/public/img/emoji/fries.png
index cfef6696..cfef6696 100755..100644
--- a/public/img/emoji/fries.png
+++ b/public/img/emoji/fries.png
diff --git a/public/img/emoji/frog.png b/public/img/emoji/frog.png
index cfe11b18..cfe11b18 100755..100644
--- a/public/img/emoji/frog.png
+++ b/public/img/emoji/frog.png
diff --git a/public/img/emoji/frowning.png b/public/img/emoji/frowning.png
index 487b7701..487b7701 100755..100644
--- a/public/img/emoji/frowning.png
+++ b/public/img/emoji/frowning.png
diff --git a/public/img/emoji/fu.png b/public/img/emoji/fu.png
index 61a3fee8..61a3fee8 100755..100644
--- a/public/img/emoji/fu.png
+++ b/public/img/emoji/fu.png
diff --git a/public/img/emoji/fuelpump.png b/public/img/emoji/fuelpump.png
index 54c29aeb..54c29aeb 100755..100644
--- a/public/img/emoji/fuelpump.png
+++ b/public/img/emoji/fuelpump.png
diff --git a/public/img/emoji/full_moon.png b/public/img/emoji/full_moon.png
index 8ff657a2..8ff657a2 100755..100644
--- a/public/img/emoji/full_moon.png
+++ b/public/img/emoji/full_moon.png
diff --git a/public/img/emoji/full_moon_with_face.png b/public/img/emoji/full_moon_with_face.png
index d42b3f0f..d42b3f0f 100755..100644
--- a/public/img/emoji/full_moon_with_face.png
+++ b/public/img/emoji/full_moon_with_face.png
diff --git a/public/img/emoji/game_die.png b/public/img/emoji/game_die.png
index cff2bd8b..cff2bd8b 100755..100644
--- a/public/img/emoji/game_die.png
+++ b/public/img/emoji/game_die.png
diff --git a/public/img/emoji/gb.png b/public/img/emoji/gb.png
index 2a62c7a0..2a62c7a0 100755..100644
--- a/public/img/emoji/gb.png
+++ b/public/img/emoji/gb.png
diff --git a/public/img/emoji/gem.png b/public/img/emoji/gem.png
index 8a5d8dad..8a5d8dad 100755..100644
--- a/public/img/emoji/gem.png
+++ b/public/img/emoji/gem.png
diff --git a/public/img/emoji/gemini.png b/public/img/emoji/gemini.png
index d926f6e8..d926f6e8 100755..100644
--- a/public/img/emoji/gemini.png
+++ b/public/img/emoji/gemini.png
diff --git a/public/img/emoji/ghost.png b/public/img/emoji/ghost.png
index 671dd0c9..671dd0c9 100755..100644
--- a/public/img/emoji/ghost.png
+++ b/public/img/emoji/ghost.png
diff --git a/public/img/emoji/gift.png b/public/img/emoji/gift.png
index 552cfdc2..552cfdc2 100755..100644
--- a/public/img/emoji/gift.png
+++ b/public/img/emoji/gift.png
diff --git a/public/img/emoji/gift_heart.png b/public/img/emoji/gift_heart.png
index f31c26a3..f31c26a3 100755..100644
--- a/public/img/emoji/gift_heart.png
+++ b/public/img/emoji/gift_heart.png
diff --git a/public/img/emoji/girl.png b/public/img/emoji/girl.png
index ea412694..ea412694 100755..100644
--- a/public/img/emoji/girl.png
+++ b/public/img/emoji/girl.png
diff --git a/public/img/emoji/globe_with_meridians.png b/public/img/emoji/globe_with_meridians.png
index b1986466..b1986466 100755..100644
--- a/public/img/emoji/globe_with_meridians.png
+++ b/public/img/emoji/globe_with_meridians.png
diff --git a/public/img/emoji/goat.png b/public/img/emoji/goat.png
index 4be9cf30..4be9cf30 100755..100644
--- a/public/img/emoji/goat.png
+++ b/public/img/emoji/goat.png
diff --git a/public/img/emoji/goberserk.png b/public/img/emoji/goberserk.png
index 59a742aa..59a742aa 100755..100644
--- a/public/img/emoji/goberserk.png
+++ b/public/img/emoji/goberserk.png
diff --git a/public/img/emoji/godmode.png b/public/img/emoji/godmode.png
index 7e75ab20..7e75ab20 100755..100644
--- a/public/img/emoji/godmode.png
+++ b/public/img/emoji/godmode.png
diff --git a/public/img/emoji/golf.png b/public/img/emoji/golf.png
index cba2116a..cba2116a 100755..100644
--- a/public/img/emoji/golf.png
+++ b/public/img/emoji/golf.png
diff --git a/public/img/emoji/grapes.png b/public/img/emoji/grapes.png
index 0f9f007a..0f9f007a 100755..100644
--- a/public/img/emoji/grapes.png
+++ b/public/img/emoji/grapes.png
diff --git a/public/img/emoji/green_apple.png b/public/img/emoji/green_apple.png
index 337205cd..337205cd 100755..100644
--- a/public/img/emoji/green_apple.png
+++ b/public/img/emoji/green_apple.png
diff --git a/public/img/emoji/green_book.png b/public/img/emoji/green_book.png
index e86651e5..e86651e5 100755..100644
--- a/public/img/emoji/green_book.png
+++ b/public/img/emoji/green_book.png
diff --git a/public/img/emoji/green_heart.png b/public/img/emoji/green_heart.png
index 7289cb81..7289cb81 100755..100644
--- a/public/img/emoji/green_heart.png
+++ b/public/img/emoji/green_heart.png
diff --git a/public/img/emoji/grey_exclamation.png b/public/img/emoji/grey_exclamation.png
index cf027dda..cf027dda 100755..100644
--- a/public/img/emoji/grey_exclamation.png
+++ b/public/img/emoji/grey_exclamation.png
diff --git a/public/img/emoji/grey_question.png b/public/img/emoji/grey_question.png
index fb97ba75..fb97ba75 100755..100644
--- a/public/img/emoji/grey_question.png
+++ b/public/img/emoji/grey_question.png
diff --git a/public/img/emoji/grimacing.png b/public/img/emoji/grimacing.png
index 1219ba7d..1219ba7d 100755..100644
--- a/public/img/emoji/grimacing.png
+++ b/public/img/emoji/grimacing.png
diff --git a/public/img/emoji/grin.png b/public/img/emoji/grin.png
index 591cfcef..591cfcef 100755..100644
--- a/public/img/emoji/grin.png
+++ b/public/img/emoji/grin.png
diff --git a/public/img/emoji/grinning.png b/public/img/emoji/grinning.png
index 7e812b7e..7e812b7e 100755..100644
--- a/public/img/emoji/grinning.png
+++ b/public/img/emoji/grinning.png
diff --git a/public/img/emoji/guardsman.png b/public/img/emoji/guardsman.png
index b67b335d..b67b335d 100755..100644
--- a/public/img/emoji/guardsman.png
+++ b/public/img/emoji/guardsman.png
diff --git a/public/img/emoji/guitar.png b/public/img/emoji/guitar.png
index 2b7fa43c..2b7fa43c 100755..100644
--- a/public/img/emoji/guitar.png
+++ b/public/img/emoji/guitar.png
diff --git a/public/img/emoji/gun.png b/public/img/emoji/gun.png
index c49dc52c..c49dc52c 100755..100644
--- a/public/img/emoji/gun.png
+++ b/public/img/emoji/gun.png
diff --git a/public/img/emoji/haircut.png b/public/img/emoji/haircut.png
index 902d273f..902d273f 100755..100644
--- a/public/img/emoji/haircut.png
+++ b/public/img/emoji/haircut.png
diff --git a/public/img/emoji/hamburger.png b/public/img/emoji/hamburger.png
index 9f1a3fdf..9f1a3fdf 100755..100644
--- a/public/img/emoji/hamburger.png
+++ b/public/img/emoji/hamburger.png
diff --git a/public/img/emoji/hammer.png b/public/img/emoji/hammer.png
index 482b1c74..482b1c74 100755..100644
--- a/public/img/emoji/hammer.png
+++ b/public/img/emoji/hammer.png
diff --git a/public/img/emoji/hamster.png b/public/img/emoji/hamster.png
index addfd2e6..addfd2e6 100755..100644
--- a/public/img/emoji/hamster.png
+++ b/public/img/emoji/hamster.png
diff --git a/public/img/emoji/hand.png b/public/img/emoji/hand.png
index 5e45c25a..5e45c25a 100755..100644
--- a/public/img/emoji/hand.png
+++ b/public/img/emoji/hand.png
diff --git a/public/img/emoji/handbag.png b/public/img/emoji/handbag.png
index d7adf04d..d7adf04d 100755..100644
--- a/public/img/emoji/handbag.png
+++ b/public/img/emoji/handbag.png
diff --git a/public/img/emoji/hankey.png b/public/img/emoji/hankey.png
index 73a4dc84..73a4dc84 100755..100644
--- a/public/img/emoji/hankey.png
+++ b/public/img/emoji/hankey.png
diff --git a/public/img/emoji/hash.png b/public/img/emoji/hash.png
index 6765d7d3..6765d7d3 100755..100644
--- a/public/img/emoji/hash.png
+++ b/public/img/emoji/hash.png
diff --git a/public/img/emoji/hatched_chick.png b/public/img/emoji/hatched_chick.png
index 39c25bc7..39c25bc7 100755..100644
--- a/public/img/emoji/hatched_chick.png
+++ b/public/img/emoji/hatched_chick.png
diff --git a/public/img/emoji/hatching_chick.png b/public/img/emoji/hatching_chick.png
index 005a5551..005a5551 100755..100644
--- a/public/img/emoji/hatching_chick.png
+++ b/public/img/emoji/hatching_chick.png
diff --git a/public/img/emoji/headphones.png b/public/img/emoji/headphones.png
index ad83000e..ad83000e 100755..100644
--- a/public/img/emoji/headphones.png
+++ b/public/img/emoji/headphones.png
diff --git a/public/img/emoji/hear_no_evil.png b/public/img/emoji/hear_no_evil.png
index f97a1f9a..f97a1f9a 100755..100644
--- a/public/img/emoji/hear_no_evil.png
+++ b/public/img/emoji/hear_no_evil.png
diff --git a/public/img/emoji/heart.png b/public/img/emoji/heart.png
index 7d7790ce..7d7790ce 100755..100644
--- a/public/img/emoji/heart.png
+++ b/public/img/emoji/heart.png
diff --git a/public/img/emoji/heart_decoration.png b/public/img/emoji/heart_decoration.png
index b8be44db..b8be44db 100755..100644
--- a/public/img/emoji/heart_decoration.png
+++ b/public/img/emoji/heart_decoration.png
diff --git a/public/img/emoji/heart_eyes.png b/public/img/emoji/heart_eyes.png
index 0e579427..0e579427 100755..100644
--- a/public/img/emoji/heart_eyes.png
+++ b/public/img/emoji/heart_eyes.png
diff --git a/public/img/emoji/heart_eyes_cat.png b/public/img/emoji/heart_eyes_cat.png
index eeba240e..eeba240e 100755..100644
--- a/public/img/emoji/heart_eyes_cat.png
+++ b/public/img/emoji/heart_eyes_cat.png
diff --git a/public/img/emoji/heartbeat.png b/public/img/emoji/heartbeat.png
index b6628f6f..b6628f6f 100755..100644
--- a/public/img/emoji/heartbeat.png
+++ b/public/img/emoji/heartbeat.png
diff --git a/public/img/emoji/heartpulse.png b/public/img/emoji/heartpulse.png
index a7491cbe..a7491cbe 100755..100644
--- a/public/img/emoji/heartpulse.png
+++ b/public/img/emoji/heartpulse.png
diff --git a/public/img/emoji/hearts.png b/public/img/emoji/hearts.png
index e8947153..e8947153 100755..100644
--- a/public/img/emoji/hearts.png
+++ b/public/img/emoji/hearts.png
diff --git a/public/img/emoji/heavy_check_mark.png b/public/img/emoji/heavy_check_mark.png
index d0f010b4..d0f010b4 100755..100644
--- a/public/img/emoji/heavy_check_mark.png
+++ b/public/img/emoji/heavy_check_mark.png
diff --git a/public/img/emoji/heavy_division_sign.png b/public/img/emoji/heavy_division_sign.png
index e193fd25..e193fd25 100755..100644
--- a/public/img/emoji/heavy_division_sign.png
+++ b/public/img/emoji/heavy_division_sign.png
diff --git a/public/img/emoji/heavy_dollar_sign.png b/public/img/emoji/heavy_dollar_sign.png
index 5eddfc52..5eddfc52 100755..100644
--- a/public/img/emoji/heavy_dollar_sign.png
+++ b/public/img/emoji/heavy_dollar_sign.png
diff --git a/public/img/emoji/heavy_exclamation_mark.png b/public/img/emoji/heavy_exclamation_mark.png
index 4c560f5e..4c560f5e 100755..100644
--- a/public/img/emoji/heavy_exclamation_mark.png
+++ b/public/img/emoji/heavy_exclamation_mark.png
diff --git a/public/img/emoji/heavy_minus_sign.png b/public/img/emoji/heavy_minus_sign.png
index 4a33f905..4a33f905 100755..100644
--- a/public/img/emoji/heavy_minus_sign.png
+++ b/public/img/emoji/heavy_minus_sign.png
diff --git a/public/img/emoji/heavy_multiplication_x.png b/public/img/emoji/heavy_multiplication_x.png
index 13d66607..13d66607 100755..100644
--- a/public/img/emoji/heavy_multiplication_x.png
+++ b/public/img/emoji/heavy_multiplication_x.png
diff --git a/public/img/emoji/heavy_plus_sign.png b/public/img/emoji/heavy_plus_sign.png
index ade3c3a8..ade3c3a8 100755..100644
--- a/public/img/emoji/heavy_plus_sign.png
+++ b/public/img/emoji/heavy_plus_sign.png
diff --git a/public/img/emoji/helicopter.png b/public/img/emoji/helicopter.png
index 8e82a0d5..8e82a0d5 100755..100644
--- a/public/img/emoji/helicopter.png
+++ b/public/img/emoji/helicopter.png
diff --git a/public/img/emoji/herb.png b/public/img/emoji/herb.png
index de1ff1b7..de1ff1b7 100755..100644
--- a/public/img/emoji/herb.png
+++ b/public/img/emoji/herb.png
diff --git a/public/img/emoji/hibiscus.png b/public/img/emoji/hibiscus.png
index 9365ae21..9365ae21 100755..100644
--- a/public/img/emoji/hibiscus.png
+++ b/public/img/emoji/hibiscus.png
diff --git a/public/img/emoji/high_brightness.png b/public/img/emoji/high_brightness.png
index ba9de7d4..ba9de7d4 100755..100644
--- a/public/img/emoji/high_brightness.png
+++ b/public/img/emoji/high_brightness.png
diff --git a/public/img/emoji/high_heel.png b/public/img/emoji/high_heel.png
index 525b6a0d..525b6a0d 100755..100644
--- a/public/img/emoji/high_heel.png
+++ b/public/img/emoji/high_heel.png
diff --git a/public/img/emoji/hocho.png b/public/img/emoji/hocho.png
index 3f05193c..3f05193c 100755..100644
--- a/public/img/emoji/hocho.png
+++ b/public/img/emoji/hocho.png
diff --git a/public/img/emoji/honey_pot.png b/public/img/emoji/honey_pot.png
index 73278898..73278898 100755..100644
--- a/public/img/emoji/honey_pot.png
+++ b/public/img/emoji/honey_pot.png
diff --git a/public/img/emoji/honeybee.png b/public/img/emoji/honeybee.png
index f5373395..f5373395 100755..100644
--- a/public/img/emoji/honeybee.png
+++ b/public/img/emoji/honeybee.png
diff --git a/public/img/emoji/horse.png b/public/img/emoji/horse.png
index 78d580ad..78d580ad 100755..100644
--- a/public/img/emoji/horse.png
+++ b/public/img/emoji/horse.png
diff --git a/public/img/emoji/horse_racing.png b/public/img/emoji/horse_racing.png
index e3bbaec1..e3bbaec1 100755..100644
--- a/public/img/emoji/horse_racing.png
+++ b/public/img/emoji/horse_racing.png
diff --git a/public/img/emoji/hospital.png b/public/img/emoji/hospital.png
index c05c4937..c05c4937 100755..100644
--- a/public/img/emoji/hospital.png
+++ b/public/img/emoji/hospital.png
diff --git a/public/img/emoji/hotel.png b/public/img/emoji/hotel.png
index d29f276a..d29f276a 100755..100644
--- a/public/img/emoji/hotel.png
+++ b/public/img/emoji/hotel.png
diff --git a/public/img/emoji/hotsprings.png b/public/img/emoji/hotsprings.png
index a0bc9d75..a0bc9d75 100755..100644
--- a/public/img/emoji/hotsprings.png
+++ b/public/img/emoji/hotsprings.png
diff --git a/public/img/emoji/hourglass.png b/public/img/emoji/hourglass.png
index 405aab41..405aab41 100755..100644
--- a/public/img/emoji/hourglass.png
+++ b/public/img/emoji/hourglass.png
diff --git a/public/img/emoji/hourglass_flowing_sand.png b/public/img/emoji/hourglass_flowing_sand.png
index b68eb695..b68eb695 100755..100644
--- a/public/img/emoji/hourglass_flowing_sand.png
+++ b/public/img/emoji/hourglass_flowing_sand.png
diff --git a/public/img/emoji/house.png b/public/img/emoji/house.png
index 95b9ee09..95b9ee09 100755..100644
--- a/public/img/emoji/house.png
+++ b/public/img/emoji/house.png
diff --git a/public/img/emoji/house_with_garden.png b/public/img/emoji/house_with_garden.png
index 3338fb71..3338fb71 100755..100644
--- a/public/img/emoji/house_with_garden.png
+++ b/public/img/emoji/house_with_garden.png
diff --git a/public/img/emoji/hurtrealbad.png b/public/img/emoji/hurtrealbad.png
index 146ef1a6..146ef1a6 100755..100644
--- a/public/img/emoji/hurtrealbad.png
+++ b/public/img/emoji/hurtrealbad.png
diff --git a/public/img/emoji/hushed.png b/public/img/emoji/hushed.png
index bbd2cd4b..bbd2cd4b 100755..100644
--- a/public/img/emoji/hushed.png
+++ b/public/img/emoji/hushed.png
diff --git a/public/img/emoji/ice_cream.png b/public/img/emoji/ice_cream.png
index 190be016..190be016 100755..100644
--- a/public/img/emoji/ice_cream.png
+++ b/public/img/emoji/ice_cream.png
diff --git a/public/img/emoji/icecream.png b/public/img/emoji/icecream.png
index 871ce097..871ce097 100755..100644
--- a/public/img/emoji/icecream.png
+++ b/public/img/emoji/icecream.png
diff --git a/public/img/emoji/id.png b/public/img/emoji/id.png
index 47437a76..47437a76 100755..100644
--- a/public/img/emoji/id.png
+++ b/public/img/emoji/id.png
diff --git a/public/img/emoji/ideograph_advantage.png b/public/img/emoji/ideograph_advantage.png
index 3c1334d1..3c1334d1 100755..100644
--- a/public/img/emoji/ideograph_advantage.png
+++ b/public/img/emoji/ideograph_advantage.png
diff --git a/public/img/emoji/imp.png b/public/img/emoji/imp.png
index fa7d9dc1..fa7d9dc1 100755..100644
--- a/public/img/emoji/imp.png
+++ b/public/img/emoji/imp.png
diff --git a/public/img/emoji/inbox_tray.png b/public/img/emoji/inbox_tray.png
index e2df0f89..e2df0f89 100755..100644
--- a/public/img/emoji/inbox_tray.png
+++ b/public/img/emoji/inbox_tray.png
diff --git a/public/img/emoji/incoming_envelope.png b/public/img/emoji/incoming_envelope.png
index afc82712..afc82712 100755..100644
--- a/public/img/emoji/incoming_envelope.png
+++ b/public/img/emoji/incoming_envelope.png
diff --git a/public/img/emoji/information_desk_person.png b/public/img/emoji/information_desk_person.png
index 52c0a50a..52c0a50a 100755..100644
--- a/public/img/emoji/information_desk_person.png
+++ b/public/img/emoji/information_desk_person.png
diff --git a/public/img/emoji/information_source.png b/public/img/emoji/information_source.png
index 9cb8b09b..9cb8b09b 100755..100644
--- a/public/img/emoji/information_source.png
+++ b/public/img/emoji/information_source.png
diff --git a/public/img/emoji/innocent.png b/public/img/emoji/innocent.png
index 503b614f..503b614f 100755..100644
--- a/public/img/emoji/innocent.png
+++ b/public/img/emoji/innocent.png
diff --git a/public/img/emoji/interrobang.png b/public/img/emoji/interrobang.png
index 64304b9f..64304b9f 100755..100644
--- a/public/img/emoji/interrobang.png
+++ b/public/img/emoji/interrobang.png
diff --git a/public/img/emoji/iphone.png b/public/img/emoji/iphone.png
index df007103..df007103 100755..100644
--- a/public/img/emoji/iphone.png
+++ b/public/img/emoji/iphone.png
diff --git a/public/img/emoji/it.png b/public/img/emoji/it.png
index 70bc9f32..70bc9f32 100755..100644
--- a/public/img/emoji/it.png
+++ b/public/img/emoji/it.png
diff --git a/public/img/emoji/izakaya_lantern.png b/public/img/emoji/izakaya_lantern.png
index 18730ad5..18730ad5 100755..100644
--- a/public/img/emoji/izakaya_lantern.png
+++ b/public/img/emoji/izakaya_lantern.png
diff --git a/public/img/emoji/jack_o_lantern.png b/public/img/emoji/jack_o_lantern.png
index 1f7667ea..1f7667ea 100755..100644
--- a/public/img/emoji/jack_o_lantern.png
+++ b/public/img/emoji/jack_o_lantern.png
diff --git a/public/img/emoji/japan.png b/public/img/emoji/japan.png
index 45932803..45932803 100755..100644
--- a/public/img/emoji/japan.png
+++ b/public/img/emoji/japan.png
diff --git a/public/img/emoji/japanese_castle.png b/public/img/emoji/japanese_castle.png
index f225ab21..f225ab21 100755..100644
--- a/public/img/emoji/japanese_castle.png
+++ b/public/img/emoji/japanese_castle.png
diff --git a/public/img/emoji/japanese_goblin.png b/public/img/emoji/japanese_goblin.png
index bd21b187..bd21b187 100755..100644
--- a/public/img/emoji/japanese_goblin.png
+++ b/public/img/emoji/japanese_goblin.png
diff --git a/public/img/emoji/japanese_ogre.png b/public/img/emoji/japanese_ogre.png
index e9f5471c..e9f5471c 100755..100644
--- a/public/img/emoji/japanese_ogre.png
+++ b/public/img/emoji/japanese_ogre.png
diff --git a/public/img/emoji/jeans.png b/public/img/emoji/jeans.png
index d721cea5..d721cea5 100755..100644
--- a/public/img/emoji/jeans.png
+++ b/public/img/emoji/jeans.png
diff --git a/public/img/emoji/joy.png b/public/img/emoji/joy.png
index 47df693d..47df693d 100755..100644
--- a/public/img/emoji/joy.png
+++ b/public/img/emoji/joy.png
diff --git a/public/img/emoji/joy_cat.png b/public/img/emoji/joy_cat.png
index 6c60cb0e..6c60cb0e 100755..100644
--- a/public/img/emoji/joy_cat.png
+++ b/public/img/emoji/joy_cat.png
diff --git a/public/img/emoji/jp.png b/public/img/emoji/jp.png
index b786efbb..b786efbb 100755..100644
--- a/public/img/emoji/jp.png
+++ b/public/img/emoji/jp.png
diff --git a/public/img/emoji/key.png b/public/img/emoji/key.png
index 34673213..34673213 100755..100644
--- a/public/img/emoji/key.png
+++ b/public/img/emoji/key.png
diff --git a/public/img/emoji/keycap_ten.png b/public/img/emoji/keycap_ten.png
index 71dac1c1..71dac1c1 100755..100644
--- a/public/img/emoji/keycap_ten.png
+++ b/public/img/emoji/keycap_ten.png
diff --git a/public/img/emoji/kimono.png b/public/img/emoji/kimono.png
index 34ffe137..34ffe137 100755..100644
--- a/public/img/emoji/kimono.png
+++ b/public/img/emoji/kimono.png
diff --git a/public/img/emoji/kiss.png b/public/img/emoji/kiss.png
index 14fd9918..14fd9918 100755..100644
--- a/public/img/emoji/kiss.png
+++ b/public/img/emoji/kiss.png
diff --git a/public/img/emoji/kissing.png b/public/img/emoji/kissing.png
index f3c8dcd7..f3c8dcd7 100755..100644
--- a/public/img/emoji/kissing.png
+++ b/public/img/emoji/kissing.png
diff --git a/public/img/emoji/kissing_cat.png b/public/img/emoji/kissing_cat.png
index adc62fbe..adc62fbe 100755..100644
--- a/public/img/emoji/kissing_cat.png
+++ b/public/img/emoji/kissing_cat.png
diff --git a/public/img/emoji/kissing_closed_eyes.png b/public/img/emoji/kissing_closed_eyes.png
index 449de197..449de197 100755..100644
--- a/public/img/emoji/kissing_closed_eyes.png
+++ b/public/img/emoji/kissing_closed_eyes.png
diff --git a/public/img/emoji/kissing_face.png b/public/img/emoji/kissing_face.png
index 449de197..449de197 100755..100644
--- a/public/img/emoji/kissing_face.png
+++ b/public/img/emoji/kissing_face.png
diff --git a/public/img/emoji/kissing_heart.png b/public/img/emoji/kissing_heart.png
index af9a80b7..af9a80b7 100755..100644
--- a/public/img/emoji/kissing_heart.png
+++ b/public/img/emoji/kissing_heart.png
diff --git a/public/img/emoji/kissing_smiling_eyes.png b/public/img/emoji/kissing_smiling_eyes.png
index 57f7b493..57f7b493 100755..100644
--- a/public/img/emoji/kissing_smiling_eyes.png
+++ b/public/img/emoji/kissing_smiling_eyes.png
diff --git a/public/img/emoji/koala.png b/public/img/emoji/koala.png
index e17bd3cf..e17bd3cf 100755..100644
--- a/public/img/emoji/koala.png
+++ b/public/img/emoji/koala.png
diff --git a/public/img/emoji/koko.png b/public/img/emoji/koko.png
index 3bef28c9..3bef28c9 100755..100644
--- a/public/img/emoji/koko.png
+++ b/public/img/emoji/koko.png
diff --git a/public/img/emoji/kr.png b/public/img/emoji/kr.png
index b4c0c1b6..b4c0c1b6 100755..100644
--- a/public/img/emoji/kr.png
+++ b/public/img/emoji/kr.png
diff --git a/public/img/emoji/large_blue_circle.png b/public/img/emoji/large_blue_circle.png
index a5b4ad4a..a5b4ad4a 100755..100644
--- a/public/img/emoji/large_blue_circle.png
+++ b/public/img/emoji/large_blue_circle.png
diff --git a/public/img/emoji/large_blue_diamond.png b/public/img/emoji/large_blue_diamond.png
index f4598ec0..f4598ec0 100755..100644
--- a/public/img/emoji/large_blue_diamond.png
+++ b/public/img/emoji/large_blue_diamond.png
diff --git a/public/img/emoji/large_orange_diamond.png b/public/img/emoji/large_orange_diamond.png
index 803725aa..803725aa 100755..100644
--- a/public/img/emoji/large_orange_diamond.png
+++ b/public/img/emoji/large_orange_diamond.png
diff --git a/public/img/emoji/last_quarter_moon.png b/public/img/emoji/last_quarter_moon.png
index 6ae30d6c..6ae30d6c 100755..100644
--- a/public/img/emoji/last_quarter_moon.png
+++ b/public/img/emoji/last_quarter_moon.png
diff --git a/public/img/emoji/last_quarter_moon_with_face.png b/public/img/emoji/last_quarter_moon_with_face.png
index 9ece82df..9ece82df 100755..100644
--- a/public/img/emoji/last_quarter_moon_with_face.png
+++ b/public/img/emoji/last_quarter_moon_with_face.png
diff --git a/public/img/emoji/laughing.png b/public/img/emoji/laughing.png
index 11c91eb2..11c91eb2 100755..100644
--- a/public/img/emoji/laughing.png
+++ b/public/img/emoji/laughing.png
diff --git a/public/img/emoji/leaves.png b/public/img/emoji/leaves.png
index 5229e06b..5229e06b 100755..100644
--- a/public/img/emoji/leaves.png
+++ b/public/img/emoji/leaves.png
diff --git a/public/img/emoji/ledger.png b/public/img/emoji/ledger.png
index e4f72ace..e4f72ace 100755..100644
--- a/public/img/emoji/ledger.png
+++ b/public/img/emoji/ledger.png
diff --git a/public/img/emoji/left_luggage.png b/public/img/emoji/left_luggage.png
index 1c08b464..1c08b464 100755..100644
--- a/public/img/emoji/left_luggage.png
+++ b/public/img/emoji/left_luggage.png
diff --git a/public/img/emoji/left_right_arrow.png b/public/img/emoji/left_right_arrow.png
index b9fd11c5..b9fd11c5 100755..100644
--- a/public/img/emoji/left_right_arrow.png
+++ b/public/img/emoji/left_right_arrow.png
diff --git a/public/img/emoji/leftwards_arrow_with_hook.png b/public/img/emoji/leftwards_arrow_with_hook.png
index bc45dfef..bc45dfef 100755..100644
--- a/public/img/emoji/leftwards_arrow_with_hook.png
+++ b/public/img/emoji/leftwards_arrow_with_hook.png
diff --git a/public/img/emoji/lemon.png b/public/img/emoji/lemon.png
index 9814dc95..9814dc95 100755..100644
--- a/public/img/emoji/lemon.png
+++ b/public/img/emoji/lemon.png
diff --git a/public/img/emoji/leo.png b/public/img/emoji/leo.png
index e025933b..e025933b 100755..100644
--- a/public/img/emoji/leo.png
+++ b/public/img/emoji/leo.png
diff --git a/public/img/emoji/leopard.png b/public/img/emoji/leopard.png
index 3e738d2d..3e738d2d 100755..100644
--- a/public/img/emoji/leopard.png
+++ b/public/img/emoji/leopard.png
diff --git a/public/img/emoji/libra.png b/public/img/emoji/libra.png
index 6f4a927c..6f4a927c 100755..100644
--- a/public/img/emoji/libra.png
+++ b/public/img/emoji/libra.png
diff --git a/public/img/emoji/light_rail.png b/public/img/emoji/light_rail.png
index bcfe801e..bcfe801e 100755..100644
--- a/public/img/emoji/light_rail.png
+++ b/public/img/emoji/light_rail.png
diff --git a/public/img/emoji/link.png b/public/img/emoji/link.png
index 0239e48e..0239e48e 100755..100644
--- a/public/img/emoji/link.png
+++ b/public/img/emoji/link.png
diff --git a/public/img/emoji/lips.png b/public/img/emoji/lips.png
index 826ed110..826ed110 100755..100644
--- a/public/img/emoji/lips.png
+++ b/public/img/emoji/lips.png
diff --git a/public/img/emoji/lipstick.png b/public/img/emoji/lipstick.png
index 82f990c5..82f990c5 100755..100644
--- a/public/img/emoji/lipstick.png
+++ b/public/img/emoji/lipstick.png
diff --git a/public/img/emoji/lock.png b/public/img/emoji/lock.png
index 4892b023..4892b023 100755..100644
--- a/public/img/emoji/lock.png
+++ b/public/img/emoji/lock.png
diff --git a/public/img/emoji/lock_with_ink_pen.png b/public/img/emoji/lock_with_ink_pen.png
index 375e67e8..375e67e8 100755..100644
--- a/public/img/emoji/lock_with_ink_pen.png
+++ b/public/img/emoji/lock_with_ink_pen.png
diff --git a/public/img/emoji/lollipop.png b/public/img/emoji/lollipop.png
index ba55e709..ba55e709 100755..100644
--- a/public/img/emoji/lollipop.png
+++ b/public/img/emoji/lollipop.png
diff --git a/public/img/emoji/loop.png b/public/img/emoji/loop.png
index ef34df3a..ef34df3a 100755..100644
--- a/public/img/emoji/loop.png
+++ b/public/img/emoji/loop.png
diff --git a/public/img/emoji/loudspeaker.png b/public/img/emoji/loudspeaker.png
index 752385e5..752385e5 100755..100644
--- a/public/img/emoji/loudspeaker.png
+++ b/public/img/emoji/loudspeaker.png
diff --git a/public/img/emoji/love_hotel.png b/public/img/emoji/love_hotel.png
index 44d7db82..44d7db82 100755..100644
--- a/public/img/emoji/love_hotel.png
+++ b/public/img/emoji/love_hotel.png
diff --git a/public/img/emoji/love_letter.png b/public/img/emoji/love_letter.png
index e29981f4..e29981f4 100755..100644
--- a/public/img/emoji/love_letter.png
+++ b/public/img/emoji/love_letter.png
diff --git a/public/img/emoji/low_brightness.png b/public/img/emoji/low_brightness.png
index ea15bde4..ea15bde4 100755..100644
--- a/public/img/emoji/low_brightness.png
+++ b/public/img/emoji/low_brightness.png
diff --git a/public/img/emoji/m.png b/public/img/emoji/m.png
index 7e3a3bff..7e3a3bff 100755..100644
--- a/public/img/emoji/m.png
+++ b/public/img/emoji/m.png
diff --git a/public/img/emoji/mag.png b/public/img/emoji/mag.png
index aa5b1d7c..aa5b1d7c 100755..100644
--- a/public/img/emoji/mag.png
+++ b/public/img/emoji/mag.png
diff --git a/public/img/emoji/mag_right.png b/public/img/emoji/mag_right.png
index 6e6cf11e..6e6cf11e 100755..100644
--- a/public/img/emoji/mag_right.png
+++ b/public/img/emoji/mag_right.png
diff --git a/public/img/emoji/mahjong.png b/public/img/emoji/mahjong.png
index f51ce65f..f51ce65f 100755..100644
--- a/public/img/emoji/mahjong.png
+++ b/public/img/emoji/mahjong.png
diff --git a/public/img/emoji/mailbox.png b/public/img/emoji/mailbox.png
index 8351e707..8351e707 100755..100644
--- a/public/img/emoji/mailbox.png
+++ b/public/img/emoji/mailbox.png
diff --git a/public/img/emoji/mailbox_closed.png b/public/img/emoji/mailbox_closed.png
index a5982b69..a5982b69 100755..100644
--- a/public/img/emoji/mailbox_closed.png
+++ b/public/img/emoji/mailbox_closed.png
diff --git a/public/img/emoji/mailbox_with_mail.png b/public/img/emoji/mailbox_with_mail.png
index dae34594..dae34594 100755..100644
--- a/public/img/emoji/mailbox_with_mail.png
+++ b/public/img/emoji/mailbox_with_mail.png
diff --git a/public/img/emoji/mailbox_with_no_mail.png b/public/img/emoji/mailbox_with_no_mail.png
index 59f15c5d..59f15c5d 100755..100644
--- a/public/img/emoji/mailbox_with_no_mail.png
+++ b/public/img/emoji/mailbox_with_no_mail.png
diff --git a/public/img/emoji/man.png b/public/img/emoji/man.png
index d9bfa26a..d9bfa26a 100755..100644
--- a/public/img/emoji/man.png
+++ b/public/img/emoji/man.png
diff --git a/public/img/emoji/man_with_gua_pi_mao.png b/public/img/emoji/man_with_gua_pi_mao.png
index 7aad74b5..7aad74b5 100755..100644
--- a/public/img/emoji/man_with_gua_pi_mao.png
+++ b/public/img/emoji/man_with_gua_pi_mao.png
diff --git a/public/img/emoji/man_with_turban.png b/public/img/emoji/man_with_turban.png
index 036604ca..036604ca 100755..100644
--- a/public/img/emoji/man_with_turban.png
+++ b/public/img/emoji/man_with_turban.png
diff --git a/public/img/emoji/mans_shoe.png b/public/img/emoji/mans_shoe.png
index ecba9ba7..ecba9ba7 100755..100644
--- a/public/img/emoji/mans_shoe.png
+++ b/public/img/emoji/mans_shoe.png
diff --git a/public/img/emoji/maple_leaf.png b/public/img/emoji/maple_leaf.png
index 4e9b4720..4e9b4720 100755..100644
--- a/public/img/emoji/maple_leaf.png
+++ b/public/img/emoji/maple_leaf.png
diff --git a/public/img/emoji/mask.png b/public/img/emoji/mask.png
index 05887e99..05887e99 100755..100644
--- a/public/img/emoji/mask.png
+++ b/public/img/emoji/mask.png
diff --git a/public/img/emoji/massage.png b/public/img/emoji/massage.png
index dd30d159..dd30d159 100755..100644
--- a/public/img/emoji/massage.png
+++ b/public/img/emoji/massage.png
diff --git a/public/img/emoji/meat_on_bone.png b/public/img/emoji/meat_on_bone.png
index 5b79a660..5b79a660 100755..100644
--- a/public/img/emoji/meat_on_bone.png
+++ b/public/img/emoji/meat_on_bone.png
diff --git a/public/img/emoji/mega.png b/public/img/emoji/mega.png
index 022df2f8..022df2f8 100755..100644
--- a/public/img/emoji/mega.png
+++ b/public/img/emoji/mega.png
diff --git a/public/img/emoji/melon.png b/public/img/emoji/melon.png
index 11c13cbb..11c13cbb 100755..100644
--- a/public/img/emoji/melon.png
+++ b/public/img/emoji/melon.png
diff --git a/public/img/emoji/memo.png b/public/img/emoji/memo.png
index fc97ddbc..fc97ddbc 100755..100644
--- a/public/img/emoji/memo.png
+++ b/public/img/emoji/memo.png
diff --git a/public/img/emoji/mens.png b/public/img/emoji/mens.png
index abccfc9f..abccfc9f 100755..100644
--- a/public/img/emoji/mens.png
+++ b/public/img/emoji/mens.png
diff --git a/public/img/emoji/metal.png b/public/img/emoji/metal.png
index 94f1fda2..94f1fda2 100755..100644
--- a/public/img/emoji/metal.png
+++ b/public/img/emoji/metal.png
diff --git a/public/img/emoji/metro.png b/public/img/emoji/metro.png
index 4acf5ab3..4acf5ab3 100755..100644
--- a/public/img/emoji/metro.png
+++ b/public/img/emoji/metro.png
diff --git a/public/img/emoji/microphone.png b/public/img/emoji/microphone.png
index 68c74ada..68c74ada 100755..100644
--- a/public/img/emoji/microphone.png
+++ b/public/img/emoji/microphone.png
diff --git a/public/img/emoji/microscope.png b/public/img/emoji/microscope.png
index 8b7a5e4e..8b7a5e4e 100755..100644
--- a/public/img/emoji/microscope.png
+++ b/public/img/emoji/microscope.png
diff --git a/public/img/emoji/milky_way.png b/public/img/emoji/milky_way.png
index 901090a1..901090a1 100755..100644
--- a/public/img/emoji/milky_way.png
+++ b/public/img/emoji/milky_way.png
diff --git a/public/img/emoji/minibus.png b/public/img/emoji/minibus.png
index c52cef23..c52cef23 100755..100644
--- a/public/img/emoji/minibus.png
+++ b/public/img/emoji/minibus.png
diff --git a/public/img/emoji/minidisc.png b/public/img/emoji/minidisc.png
index e19cc5d0..e19cc5d0 100755..100644
--- a/public/img/emoji/minidisc.png
+++ b/public/img/emoji/minidisc.png
diff --git a/public/img/emoji/mobile_phone_off.png b/public/img/emoji/mobile_phone_off.png
index fa16c763..fa16c763 100755..100644
--- a/public/img/emoji/mobile_phone_off.png
+++ b/public/img/emoji/mobile_phone_off.png
diff --git a/public/img/emoji/money_with_wings.png b/public/img/emoji/money_with_wings.png
index 581a8244..581a8244 100755..100644
--- a/public/img/emoji/money_with_wings.png
+++ b/public/img/emoji/money_with_wings.png
diff --git a/public/img/emoji/moneybag.png b/public/img/emoji/moneybag.png
index 5546c04b..5546c04b 100755..100644
--- a/public/img/emoji/moneybag.png
+++ b/public/img/emoji/moneybag.png
diff --git a/public/img/emoji/monkey.png b/public/img/emoji/monkey.png
index 64070359..64070359 100755..100644
--- a/public/img/emoji/monkey.png
+++ b/public/img/emoji/monkey.png
diff --git a/public/img/emoji/monkey_face.png b/public/img/emoji/monkey_face.png
index 6964cf4d..6964cf4d 100755..100644
--- a/public/img/emoji/monkey_face.png
+++ b/public/img/emoji/monkey_face.png
diff --git a/public/img/emoji/monorail.png b/public/img/emoji/monorail.png
index 913d3002..913d3002 100755..100644
--- a/public/img/emoji/monorail.png
+++ b/public/img/emoji/monorail.png
diff --git a/public/img/emoji/mortar_board.png b/public/img/emoji/mortar_board.png
index 84513f6b..84513f6b 100755..100644
--- a/public/img/emoji/mortar_board.png
+++ b/public/img/emoji/mortar_board.png
diff --git a/public/img/emoji/mount_fuji.png b/public/img/emoji/mount_fuji.png
index 4c313e58..4c313e58 100755..100644
--- a/public/img/emoji/mount_fuji.png
+++ b/public/img/emoji/mount_fuji.png
diff --git a/public/img/emoji/mountain_bicyclist.png b/public/img/emoji/mountain_bicyclist.png
index b6988975..b6988975 100755..100644
--- a/public/img/emoji/mountain_bicyclist.png
+++ b/public/img/emoji/mountain_bicyclist.png
diff --git a/public/img/emoji/mountain_cableway.png b/public/img/emoji/mountain_cableway.png
index 5688bb23..5688bb23 100755..100644
--- a/public/img/emoji/mountain_cableway.png
+++ b/public/img/emoji/mountain_cableway.png
diff --git a/public/img/emoji/mountain_railway.png b/public/img/emoji/mountain_railway.png
index 1f3d1aab..1f3d1aab 100755..100644
--- a/public/img/emoji/mountain_railway.png
+++ b/public/img/emoji/mountain_railway.png
diff --git a/public/img/emoji/mouse.png b/public/img/emoji/mouse.png
index 8ff162e2..8ff162e2 100755..100644
--- a/public/img/emoji/mouse.png
+++ b/public/img/emoji/mouse.png
diff --git a/public/img/emoji/mouse2.png b/public/img/emoji/mouse2.png
index 2d777e5e..2d777e5e 100755..100644
--- a/public/img/emoji/mouse2.png
+++ b/public/img/emoji/mouse2.png
diff --git a/public/img/emoji/movie_camera.png b/public/img/emoji/movie_camera.png
index 9c143840..9c143840 100755..100644
--- a/public/img/emoji/movie_camera.png
+++ b/public/img/emoji/movie_camera.png
diff --git a/public/img/emoji/moyai.png b/public/img/emoji/moyai.png
index 61a1a9c2..61a1a9c2 100755..100644
--- a/public/img/emoji/moyai.png
+++ b/public/img/emoji/moyai.png
diff --git a/public/img/emoji/muscle.png b/public/img/emoji/muscle.png
index 19f92efb..19f92efb 100755..100644
--- a/public/img/emoji/muscle.png
+++ b/public/img/emoji/muscle.png
diff --git a/public/img/emoji/mushroom.png b/public/img/emoji/mushroom.png
index 5eeed8e7..5eeed8e7 100755..100644
--- a/public/img/emoji/mushroom.png
+++ b/public/img/emoji/mushroom.png
diff --git a/public/img/emoji/musical_keyboard.png b/public/img/emoji/musical_keyboard.png
index 93647a4a..93647a4a 100755..100644
--- a/public/img/emoji/musical_keyboard.png
+++ b/public/img/emoji/musical_keyboard.png
diff --git a/public/img/emoji/musical_note.png b/public/img/emoji/musical_note.png
index 68b261bc..68b261bc 100755..100644
--- a/public/img/emoji/musical_note.png
+++ b/public/img/emoji/musical_note.png
diff --git a/public/img/emoji/musical_score.png b/public/img/emoji/musical_score.png
index c99e3381..c99e3381 100755..100644
--- a/public/img/emoji/musical_score.png
+++ b/public/img/emoji/musical_score.png
diff --git a/public/img/emoji/mute.png b/public/img/emoji/mute.png
index 4cf67c36..4cf67c36 100755..100644
--- a/public/img/emoji/mute.png
+++ b/public/img/emoji/mute.png
diff --git a/public/img/emoji/nail_care.png b/public/img/emoji/nail_care.png
index 6a66e63d..6a66e63d 100755..100644
--- a/public/img/emoji/nail_care.png
+++ b/public/img/emoji/nail_care.png
diff --git a/public/img/emoji/name_badge.png b/public/img/emoji/name_badge.png
index 2b712dcd..2b712dcd 100755..100644
--- a/public/img/emoji/name_badge.png
+++ b/public/img/emoji/name_badge.png
diff --git a/public/img/emoji/neckbeard.png b/public/img/emoji/neckbeard.png
index 6e31d165..6e31d165 100755..100644
--- a/public/img/emoji/neckbeard.png
+++ b/public/img/emoji/neckbeard.png
diff --git a/public/img/emoji/necktie.png b/public/img/emoji/necktie.png
index 80461c66..80461c66 100755..100644
--- a/public/img/emoji/necktie.png
+++ b/public/img/emoji/necktie.png
diff --git a/public/img/emoji/negative_squared_cross_mark.png b/public/img/emoji/negative_squared_cross_mark.png
index b47a0cec..b47a0cec 100755..100644
--- a/public/img/emoji/negative_squared_cross_mark.png
+++ b/public/img/emoji/negative_squared_cross_mark.png
diff --git a/public/img/emoji/neutral_face.png b/public/img/emoji/neutral_face.png
index 682a1ba0..682a1ba0 100755..100644
--- a/public/img/emoji/neutral_face.png
+++ b/public/img/emoji/neutral_face.png
diff --git a/public/img/emoji/new.png b/public/img/emoji/new.png
index 28d1570e..28d1570e 100755..100644
--- a/public/img/emoji/new.png
+++ b/public/img/emoji/new.png
diff --git a/public/img/emoji/new_moon.png b/public/img/emoji/new_moon.png
index 72492cb9..72492cb9 100755..100644
--- a/public/img/emoji/new_moon.png
+++ b/public/img/emoji/new_moon.png
diff --git a/public/img/emoji/new_moon_with_face.png b/public/img/emoji/new_moon_with_face.png
index 21a696eb..21a696eb 100755..100644
--- a/public/img/emoji/new_moon_with_face.png
+++ b/public/img/emoji/new_moon_with_face.png
diff --git a/public/img/emoji/newspaper.png b/public/img/emoji/newspaper.png
index 60c3394d..60c3394d 100755..100644
--- a/public/img/emoji/newspaper.png
+++ b/public/img/emoji/newspaper.png
diff --git a/public/img/emoji/ng.png b/public/img/emoji/ng.png
index 2ca180ae..2ca180ae 100755..100644
--- a/public/img/emoji/ng.png
+++ b/public/img/emoji/ng.png
diff --git a/public/img/emoji/nine.png b/public/img/emoji/nine.png
index 8006cc90..8006cc90 100755..100644
--- a/public/img/emoji/nine.png
+++ b/public/img/emoji/nine.png
diff --git a/public/img/emoji/no_bell.png b/public/img/emoji/no_bell.png
index 613b81cd..613b81cd 100755..100644
--- a/public/img/emoji/no_bell.png
+++ b/public/img/emoji/no_bell.png
diff --git a/public/img/emoji/no_bicycles.png b/public/img/emoji/no_bicycles.png
index 4b262166..4b262166 100755..100644
--- a/public/img/emoji/no_bicycles.png
+++ b/public/img/emoji/no_bicycles.png
diff --git a/public/img/emoji/no_entry.png b/public/img/emoji/no_entry.png
index cf2086a8..cf2086a8 100755..100644
--- a/public/img/emoji/no_entry.png
+++ b/public/img/emoji/no_entry.png
diff --git a/public/img/emoji/no_entry_sign.png b/public/img/emoji/no_entry_sign.png
index b3231f66..b3231f66 100755..100644
--- a/public/img/emoji/no_entry_sign.png
+++ b/public/img/emoji/no_entry_sign.png
diff --git a/public/img/emoji/no_good.png b/public/img/emoji/no_good.png
index d459a35b..d459a35b 100755..100644
--- a/public/img/emoji/no_good.png
+++ b/public/img/emoji/no_good.png
diff --git a/public/img/emoji/no_mobile_phones.png b/public/img/emoji/no_mobile_phones.png
index 41df57cf..41df57cf 100755..100644
--- a/public/img/emoji/no_mobile_phones.png
+++ b/public/img/emoji/no_mobile_phones.png
diff --git a/public/img/emoji/no_mouth.png b/public/img/emoji/no_mouth.png
index e6780204..e6780204 100755..100644
--- a/public/img/emoji/no_mouth.png
+++ b/public/img/emoji/no_mouth.png
diff --git a/public/img/emoji/no_pedestrians.png b/public/img/emoji/no_pedestrians.png
index 53ee0f92..53ee0f92 100755..100644
--- a/public/img/emoji/no_pedestrians.png
+++ b/public/img/emoji/no_pedestrians.png
diff --git a/public/img/emoji/no_smoking.png b/public/img/emoji/no_smoking.png
index 5880ddfd..5880ddfd 100755..100644
--- a/public/img/emoji/no_smoking.png
+++ b/public/img/emoji/no_smoking.png
diff --git a/public/img/emoji/non-potable_water.png b/public/img/emoji/non-potable_water.png
index 1b29d35b..1b29d35b 100755..100644
--- a/public/img/emoji/non-potable_water.png
+++ b/public/img/emoji/non-potable_water.png
diff --git a/public/img/emoji/nose.png b/public/img/emoji/nose.png
index ad17c16c..ad17c16c 100755..100644
--- a/public/img/emoji/nose.png
+++ b/public/img/emoji/nose.png
diff --git a/public/img/emoji/notebook.png b/public/img/emoji/notebook.png
index 5f0a5f6a..5f0a5f6a 100755..100644
--- a/public/img/emoji/notebook.png
+++ b/public/img/emoji/notebook.png
diff --git a/public/img/emoji/notebook_with_decorative_cover.png b/public/img/emoji/notebook_with_decorative_cover.png
index 4f3b14c8..4f3b14c8 100755..100644
--- a/public/img/emoji/notebook_with_decorative_cover.png
+++ b/public/img/emoji/notebook_with_decorative_cover.png
diff --git a/public/img/emoji/notes.png b/public/img/emoji/notes.png
index 0956d6ab..0956d6ab 100755..100644
--- a/public/img/emoji/notes.png
+++ b/public/img/emoji/notes.png
diff --git a/public/img/emoji/nut_and_bolt.png b/public/img/emoji/nut_and_bolt.png
index bddfa72a..bddfa72a 100755..100644
--- a/public/img/emoji/nut_and_bolt.png
+++ b/public/img/emoji/nut_and_bolt.png
diff --git a/public/img/emoji/o.png b/public/img/emoji/o.png
index 1ff846c1..1ff846c1 100755..100644
--- a/public/img/emoji/o.png
+++ b/public/img/emoji/o.png
diff --git a/public/img/emoji/o2.png b/public/img/emoji/o2.png
index d85f9fb9..d85f9fb9 100755..100644
--- a/public/img/emoji/o2.png
+++ b/public/img/emoji/o2.png
diff --git a/public/img/emoji/ocean.png b/public/img/emoji/ocean.png
index f8d520cd..f8d520cd 100755..100644
--- a/public/img/emoji/ocean.png
+++ b/public/img/emoji/ocean.png
diff --git a/public/img/emoji/octocat.png b/public/img/emoji/octocat.png
index d296f25f..d296f25f 100755..100644
--- a/public/img/emoji/octocat.png
+++ b/public/img/emoji/octocat.png
diff --git a/public/img/emoji/octopus.png b/public/img/emoji/octopus.png
index 52ce64b4..52ce64b4 100755..100644
--- a/public/img/emoji/octopus.png
+++ b/public/img/emoji/octopus.png
diff --git a/public/img/emoji/oden.png b/public/img/emoji/oden.png
index 73add1c7..73add1c7 100755..100644
--- a/public/img/emoji/oden.png
+++ b/public/img/emoji/oden.png
diff --git a/public/img/emoji/office.png b/public/img/emoji/office.png
index 53c3ef8d..53c3ef8d 100755..100644
--- a/public/img/emoji/office.png
+++ b/public/img/emoji/office.png
diff --git a/public/img/emoji/ok.png b/public/img/emoji/ok.png
index 6433d1a9..6433d1a9 100755..100644
--- a/public/img/emoji/ok.png
+++ b/public/img/emoji/ok.png
diff --git a/public/img/emoji/ok_hand.png b/public/img/emoji/ok_hand.png
index 80c5aebb..80c5aebb 100755..100644
--- a/public/img/emoji/ok_hand.png
+++ b/public/img/emoji/ok_hand.png
diff --git a/public/img/emoji/ok_woman.png b/public/img/emoji/ok_woman.png
index e8b98194..e8b98194 100755..100644
--- a/public/img/emoji/ok_woman.png
+++ b/public/img/emoji/ok_woman.png
diff --git a/public/img/emoji/older_man.png b/public/img/emoji/older_man.png
index 149f0cfb..149f0cfb 100755..100644
--- a/public/img/emoji/older_man.png
+++ b/public/img/emoji/older_man.png
diff --git a/public/img/emoji/older_woman.png b/public/img/emoji/older_woman.png
index f839565f..f839565f 100755..100644
--- a/public/img/emoji/older_woman.png
+++ b/public/img/emoji/older_woman.png
diff --git a/public/img/emoji/on.png b/public/img/emoji/on.png
index 4cd69a15..4cd69a15 100755..100644
--- a/public/img/emoji/on.png
+++ b/public/img/emoji/on.png
diff --git a/public/img/emoji/oncoming_automobile.png b/public/img/emoji/oncoming_automobile.png
index cb46de22..cb46de22 100755..100644
--- a/public/img/emoji/oncoming_automobile.png
+++ b/public/img/emoji/oncoming_automobile.png
diff --git a/public/img/emoji/oncoming_bus.png b/public/img/emoji/oncoming_bus.png
index 3695f762..3695f762 100755..100644
--- a/public/img/emoji/oncoming_bus.png
+++ b/public/img/emoji/oncoming_bus.png
diff --git a/public/img/emoji/oncoming_police_car.png b/public/img/emoji/oncoming_police_car.png
index af20e7ef..af20e7ef 100755..100644
--- a/public/img/emoji/oncoming_police_car.png
+++ b/public/img/emoji/oncoming_police_car.png
diff --git a/public/img/emoji/oncoming_taxi.png b/public/img/emoji/oncoming_taxi.png
index f78cf310..f78cf310 100755..100644
--- a/public/img/emoji/oncoming_taxi.png
+++ b/public/img/emoji/oncoming_taxi.png
diff --git a/public/img/emoji/one.png b/public/img/emoji/one.png
index 2d1f9f8c..2d1f9f8c 100755..100644
--- a/public/img/emoji/one.png
+++ b/public/img/emoji/one.png
diff --git a/public/img/emoji/open_file_folder.png b/public/img/emoji/open_file_folder.png
index 2bbbbf5e..2bbbbf5e 100755..100644
--- a/public/img/emoji/open_file_folder.png
+++ b/public/img/emoji/open_file_folder.png
diff --git a/public/img/emoji/open_hands.png b/public/img/emoji/open_hands.png
index cef9f428..cef9f428 100755..100644
--- a/public/img/emoji/open_hands.png
+++ b/public/img/emoji/open_hands.png
diff --git a/public/img/emoji/open_mouth.png b/public/img/emoji/open_mouth.png
index daf91427..daf91427 100755..100644
--- a/public/img/emoji/open_mouth.png
+++ b/public/img/emoji/open_mouth.png
diff --git a/public/img/emoji/ophiuchus.png b/public/img/emoji/ophiuchus.png
index 4eef715b..4eef715b 100755..100644
--- a/public/img/emoji/ophiuchus.png
+++ b/public/img/emoji/ophiuchus.png
diff --git a/public/img/emoji/orange_book.png b/public/img/emoji/orange_book.png
index 49650d59..49650d59 100755..100644
--- a/public/img/emoji/orange_book.png
+++ b/public/img/emoji/orange_book.png
diff --git a/public/img/emoji/outbox_tray.png b/public/img/emoji/outbox_tray.png
index 7ad15e64..7ad15e64 100755..100644
--- a/public/img/emoji/outbox_tray.png
+++ b/public/img/emoji/outbox_tray.png
diff --git a/public/img/emoji/ox.png b/public/img/emoji/ox.png
index 8d981946..8d981946 100755..100644
--- a/public/img/emoji/ox.png
+++ b/public/img/emoji/ox.png
diff --git a/public/img/emoji/page_facing_up.png b/public/img/emoji/page_facing_up.png
index 804c0d73..804c0d73 100755..100644
--- a/public/img/emoji/page_facing_up.png
+++ b/public/img/emoji/page_facing_up.png
diff --git a/public/img/emoji/page_with_curl.png b/public/img/emoji/page_with_curl.png
index 37cb4de5..37cb4de5 100755..100644
--- a/public/img/emoji/page_with_curl.png
+++ b/public/img/emoji/page_with_curl.png
diff --git a/public/img/emoji/pager.png b/public/img/emoji/pager.png
index e3e1fc44..e3e1fc44 100755..100644
--- a/public/img/emoji/pager.png
+++ b/public/img/emoji/pager.png
diff --git a/public/img/emoji/palm_tree.png b/public/img/emoji/palm_tree.png
index d13b7c62..d13b7c62 100755..100644
--- a/public/img/emoji/palm_tree.png
+++ b/public/img/emoji/palm_tree.png
diff --git a/public/img/emoji/panda_face.png b/public/img/emoji/panda_face.png
index a794fb17..a794fb17 100755..100644
--- a/public/img/emoji/panda_face.png
+++ b/public/img/emoji/panda_face.png
diff --git a/public/img/emoji/paperclip.png b/public/img/emoji/paperclip.png
index 677669a8..677669a8 100755..100644
--- a/public/img/emoji/paperclip.png
+++ b/public/img/emoji/paperclip.png
diff --git a/public/img/emoji/parking.png b/public/img/emoji/parking.png
index c24af81c..c24af81c 100755..100644
--- a/public/img/emoji/parking.png
+++ b/public/img/emoji/parking.png
diff --git a/public/img/emoji/part_alternation_mark.png b/public/img/emoji/part_alternation_mark.png
index 1e5855f8..1e5855f8 100755..100644
--- a/public/img/emoji/part_alternation_mark.png
+++ b/public/img/emoji/part_alternation_mark.png
diff --git a/public/img/emoji/partly_sunny.png b/public/img/emoji/partly_sunny.png
index b3f5bcfd..b3f5bcfd 100755..100644
--- a/public/img/emoji/partly_sunny.png
+++ b/public/img/emoji/partly_sunny.png
diff --git a/public/img/emoji/passport_control.png b/public/img/emoji/passport_control.png
index 675b76d3..675b76d3 100755..100644
--- a/public/img/emoji/passport_control.png
+++ b/public/img/emoji/passport_control.png
diff --git a/public/img/emoji/paw_prints.png b/public/img/emoji/paw_prints.png
index 89b9fec9..89b9fec9 100755..100644
--- a/public/img/emoji/paw_prints.png
+++ b/public/img/emoji/paw_prints.png
diff --git a/public/img/emoji/peach.png b/public/img/emoji/peach.png
index ee2139ec..ee2139ec 100755..100644
--- a/public/img/emoji/peach.png
+++ b/public/img/emoji/peach.png
diff --git a/public/img/emoji/pear.png b/public/img/emoji/pear.png
index f24aca8c..f24aca8c 100755..100644
--- a/public/img/emoji/pear.png
+++ b/public/img/emoji/pear.png
diff --git a/public/img/emoji/pencil.png b/public/img/emoji/pencil.png
index fc97ddbc..fc97ddbc 100755..100644
--- a/public/img/emoji/pencil.png
+++ b/public/img/emoji/pencil.png
diff --git a/public/img/emoji/pencil2.png b/public/img/emoji/pencil2.png
index 64c2d9b7..64c2d9b7 100755..100644
--- a/public/img/emoji/pencil2.png
+++ b/public/img/emoji/pencil2.png
diff --git a/public/img/emoji/penguin.png b/public/img/emoji/penguin.png
index d8edbcb8..d8edbcb8 100755..100644
--- a/public/img/emoji/penguin.png
+++ b/public/img/emoji/penguin.png
diff --git a/public/img/emoji/pensive.png b/public/img/emoji/pensive.png
index 4159f3c4..4159f3c4 100755..100644
--- a/public/img/emoji/pensive.png
+++ b/public/img/emoji/pensive.png
diff --git a/public/img/emoji/performing_arts.png b/public/img/emoji/performing_arts.png
index 899fbe5a..899fbe5a 100755..100644
--- a/public/img/emoji/performing_arts.png
+++ b/public/img/emoji/performing_arts.png
diff --git a/public/img/emoji/persevere.png b/public/img/emoji/persevere.png
index f99f6da4..f99f6da4 100755..100644
--- a/public/img/emoji/persevere.png
+++ b/public/img/emoji/persevere.png
diff --git a/public/img/emoji/person_frowning.png b/public/img/emoji/person_frowning.png
index 6f34d5e1..6f34d5e1 100755..100644
--- a/public/img/emoji/person_frowning.png
+++ b/public/img/emoji/person_frowning.png
diff --git a/public/img/emoji/person_with_blond_hair.png b/public/img/emoji/person_with_blond_hair.png
index c144301c..c144301c 100755..100644
--- a/public/img/emoji/person_with_blond_hair.png
+++ b/public/img/emoji/person_with_blond_hair.png
diff --git a/public/img/emoji/person_with_pouting_face.png b/public/img/emoji/person_with_pouting_face.png
index c4a95c3b..c4a95c3b 100755..100644
--- a/public/img/emoji/person_with_pouting_face.png
+++ b/public/img/emoji/person_with_pouting_face.png
diff --git a/public/img/emoji/phone.png b/public/img/emoji/phone.png
index 87d2559b..87d2559b 100755..100644
--- a/public/img/emoji/phone.png
+++ b/public/img/emoji/phone.png
diff --git a/public/img/emoji/pig.png b/public/img/emoji/pig.png
index f7f273c7..f7f273c7 100755..100644
--- a/public/img/emoji/pig.png
+++ b/public/img/emoji/pig.png
diff --git a/public/img/emoji/pig2.png b/public/img/emoji/pig2.png
index fec3374d..fec3374d 100755..100644
--- a/public/img/emoji/pig2.png
+++ b/public/img/emoji/pig2.png
diff --git a/public/img/emoji/pig_nose.png b/public/img/emoji/pig_nose.png
index 38d61244..38d61244 100755..100644
--- a/public/img/emoji/pig_nose.png
+++ b/public/img/emoji/pig_nose.png
diff --git a/public/img/emoji/pill.png b/public/img/emoji/pill.png
index cd84a78f..cd84a78f 100755..100644
--- a/public/img/emoji/pill.png
+++ b/public/img/emoji/pill.png
diff --git a/public/img/emoji/pineapple.png b/public/img/emoji/pineapple.png
index d6f8e287..d6f8e287 100755..100644
--- a/public/img/emoji/pineapple.png
+++ b/public/img/emoji/pineapple.png
diff --git a/public/img/emoji/pisces.png b/public/img/emoji/pisces.png
index 6db2c3d5..6db2c3d5 100755..100644
--- a/public/img/emoji/pisces.png
+++ b/public/img/emoji/pisces.png
diff --git a/public/img/emoji/pizza.png b/public/img/emoji/pizza.png
index 460367d0..460367d0 100755..100644
--- a/public/img/emoji/pizza.png
+++ b/public/img/emoji/pizza.png
diff --git a/public/img/emoji/plus1.png b/public/img/emoji/plus1.png
index 81786c1d..81786c1d 100755..100644
--- a/public/img/emoji/plus1.png
+++ b/public/img/emoji/plus1.png
diff --git a/public/img/emoji/point_down.png b/public/img/emoji/point_down.png
index 658c6d91..658c6d91 100755..100644
--- a/public/img/emoji/point_down.png
+++ b/public/img/emoji/point_down.png
diff --git a/public/img/emoji/point_left.png b/public/img/emoji/point_left.png
index 38a99b43..38a99b43 100755..100644
--- a/public/img/emoji/point_left.png
+++ b/public/img/emoji/point_left.png
diff --git a/public/img/emoji/point_right.png b/public/img/emoji/point_right.png
index 6f9f029a..6f9f029a 100755..100644
--- a/public/img/emoji/point_right.png
+++ b/public/img/emoji/point_right.png
diff --git a/public/img/emoji/point_up.png b/public/img/emoji/point_up.png
index 01896e21..01896e21 100755..100644
--- a/public/img/emoji/point_up.png
+++ b/public/img/emoji/point_up.png
diff --git a/public/img/emoji/point_up_2.png b/public/img/emoji/point_up_2.png
index 1cfe7367..1cfe7367 100755..100644
--- a/public/img/emoji/point_up_2.png
+++ b/public/img/emoji/point_up_2.png
diff --git a/public/img/emoji/police_car.png b/public/img/emoji/police_car.png
index b8f17275..b8f17275 100755..100644
--- a/public/img/emoji/police_car.png
+++ b/public/img/emoji/police_car.png
diff --git a/public/img/emoji/poodle.png b/public/img/emoji/poodle.png
index adac80bd..adac80bd 100755..100644
--- a/public/img/emoji/poodle.png
+++ b/public/img/emoji/poodle.png
diff --git a/public/img/emoji/poop.png b/public/img/emoji/poop.png
index 73a4dc84..73a4dc84 100755..100644
--- a/public/img/emoji/poop.png
+++ b/public/img/emoji/poop.png
diff --git a/public/img/emoji/post_office.png b/public/img/emoji/post_office.png
index 43b59e30..43b59e30 100755..100644
--- a/public/img/emoji/post_office.png
+++ b/public/img/emoji/post_office.png
diff --git a/public/img/emoji/postal_horn.png b/public/img/emoji/postal_horn.png
index 13a15141..13a15141 100755..100644
--- a/public/img/emoji/postal_horn.png
+++ b/public/img/emoji/postal_horn.png
diff --git a/public/img/emoji/postbox.png b/public/img/emoji/postbox.png
index ce04b700..ce04b700 100755..100644
--- a/public/img/emoji/postbox.png
+++ b/public/img/emoji/postbox.png
diff --git a/public/img/emoji/potable_water.png b/public/img/emoji/potable_water.png
index e9fd5607..e9fd5607 100755..100644
--- a/public/img/emoji/potable_water.png
+++ b/public/img/emoji/potable_water.png
diff --git a/public/img/emoji/pouch.png b/public/img/emoji/pouch.png
index dc35ae8e..dc35ae8e 100755..100644
--- a/public/img/emoji/pouch.png
+++ b/public/img/emoji/pouch.png
diff --git a/public/img/emoji/poultry_leg.png b/public/img/emoji/poultry_leg.png
index 43ad8596..43ad8596 100755..100644
--- a/public/img/emoji/poultry_leg.png
+++ b/public/img/emoji/poultry_leg.png
diff --git a/public/img/emoji/pound.png b/public/img/emoji/pound.png
index f8be91d7..f8be91d7 100755..100644
--- a/public/img/emoji/pound.png
+++ b/public/img/emoji/pound.png
diff --git a/public/img/emoji/pouting_cat.png b/public/img/emoji/pouting_cat.png
index 4325fd48..4325fd48 100755..100644
--- a/public/img/emoji/pouting_cat.png
+++ b/public/img/emoji/pouting_cat.png
diff --git a/public/img/emoji/pray.png b/public/img/emoji/pray.png
index f86c992d..f86c992d 100755..100644
--- a/public/img/emoji/pray.png
+++ b/public/img/emoji/pray.png
diff --git a/public/img/emoji/princess.png b/public/img/emoji/princess.png
index 1ebb2ce9..1ebb2ce9 100755..100644
--- a/public/img/emoji/princess.png
+++ b/public/img/emoji/princess.png
diff --git a/public/img/emoji/punch.png b/public/img/emoji/punch.png
index 277047b7..277047b7 100755..100644
--- a/public/img/emoji/punch.png
+++ b/public/img/emoji/punch.png
diff --git a/public/img/emoji/purple_heart.png b/public/img/emoji/purple_heart.png
index d5f87504..d5f87504 100755..100644
--- a/public/img/emoji/purple_heart.png
+++ b/public/img/emoji/purple_heart.png
diff --git a/public/img/emoji/purse.png b/public/img/emoji/purse.png
index 8f06a2b9..8f06a2b9 100755..100644
--- a/public/img/emoji/purse.png
+++ b/public/img/emoji/purse.png
diff --git a/public/img/emoji/pushpin.png b/public/img/emoji/pushpin.png
index 540c4ecb..540c4ecb 100755..100644
--- a/public/img/emoji/pushpin.png
+++ b/public/img/emoji/pushpin.png
diff --git a/public/img/emoji/put_litter_in_its_place.png b/public/img/emoji/put_litter_in_its_place.png
index c2e350c2..c2e350c2 100755..100644
--- a/public/img/emoji/put_litter_in_its_place.png
+++ b/public/img/emoji/put_litter_in_its_place.png
diff --git a/public/img/emoji/question.png b/public/img/emoji/question.png
index 38cedf56..38cedf56 100755..100644
--- a/public/img/emoji/question.png
+++ b/public/img/emoji/question.png
diff --git a/public/img/emoji/rabbit.png b/public/img/emoji/rabbit.png
index 5cb3ef6f..5cb3ef6f 100755..100644
--- a/public/img/emoji/rabbit.png
+++ b/public/img/emoji/rabbit.png
diff --git a/public/img/emoji/rabbit2.png b/public/img/emoji/rabbit2.png
index a9fd24dc..a9fd24dc 100755..100644
--- a/public/img/emoji/rabbit2.png
+++ b/public/img/emoji/rabbit2.png
diff --git a/public/img/emoji/racehorse.png b/public/img/emoji/racehorse.png
index 4d09c64d..4d09c64d 100755..100644
--- a/public/img/emoji/racehorse.png
+++ b/public/img/emoji/racehorse.png
diff --git a/public/img/emoji/radio.png b/public/img/emoji/radio.png
index ea589efe..ea589efe 100755..100644
--- a/public/img/emoji/radio.png
+++ b/public/img/emoji/radio.png
diff --git a/public/img/emoji/radio_button.png b/public/img/emoji/radio_button.png
index 63755eec..63755eec 100755..100644
--- a/public/img/emoji/radio_button.png
+++ b/public/img/emoji/radio_button.png
diff --git a/public/img/emoji/rage.png b/public/img/emoji/rage.png
index c65ddff5..c65ddff5 100755..100644
--- a/public/img/emoji/rage.png
+++ b/public/img/emoji/rage.png
diff --git a/public/img/emoji/rage1.png b/public/img/emoji/rage1.png
index 1506ba40..1506ba40 100755..100644
--- a/public/img/emoji/rage1.png
+++ b/public/img/emoji/rage1.png
diff --git a/public/img/emoji/rage2.png b/public/img/emoji/rage2.png
index f792e063..f792e063 100755..100644
--- a/public/img/emoji/rage2.png
+++ b/public/img/emoji/rage2.png
diff --git a/public/img/emoji/rage3.png b/public/img/emoji/rage3.png
index 58764cbc..58764cbc 100755..100644
--- a/public/img/emoji/rage3.png
+++ b/public/img/emoji/rage3.png
diff --git a/public/img/emoji/rage4.png b/public/img/emoji/rage4.png
index c726c94a..c726c94a 100755..100644
--- a/public/img/emoji/rage4.png
+++ b/public/img/emoji/rage4.png
diff --git a/public/img/emoji/railway_car.png b/public/img/emoji/railway_car.png
index 22361158..22361158 100755..100644
--- a/public/img/emoji/railway_car.png
+++ b/public/img/emoji/railway_car.png
diff --git a/public/img/emoji/rainbow.png b/public/img/emoji/rainbow.png
index 6b1faa03..6b1faa03 100755..100644
--- a/public/img/emoji/rainbow.png
+++ b/public/img/emoji/rainbow.png
diff --git a/public/img/emoji/raised_hand.png b/public/img/emoji/raised_hand.png
index 5e45c25a..5e45c25a 100755..100644
--- a/public/img/emoji/raised_hand.png
+++ b/public/img/emoji/raised_hand.png
diff --git a/public/img/emoji/raised_hands.png b/public/img/emoji/raised_hands.png
index e03142bd..e03142bd 100755..100644
--- a/public/img/emoji/raised_hands.png
+++ b/public/img/emoji/raised_hands.png
diff --git a/public/img/emoji/raising_hand.png b/public/img/emoji/raising_hand.png
index e1741a40..e1741a40 100755..100644
--- a/public/img/emoji/raising_hand.png
+++ b/public/img/emoji/raising_hand.png
diff --git a/public/img/emoji/ram.png b/public/img/emoji/ram.png
index 5ea7bfbc..5ea7bfbc 100755..100644
--- a/public/img/emoji/ram.png
+++ b/public/img/emoji/ram.png
diff --git a/public/img/emoji/ramen.png b/public/img/emoji/ramen.png
index 78dc7d53..78dc7d53 100755..100644
--- a/public/img/emoji/ramen.png
+++ b/public/img/emoji/ramen.png
diff --git a/public/img/emoji/rat.png b/public/img/emoji/rat.png
index fa7dd401..fa7dd401 100755..100644
--- a/public/img/emoji/rat.png
+++ b/public/img/emoji/rat.png
diff --git a/public/img/emoji/recycle.png b/public/img/emoji/recycle.png
index 99104c0e..99104c0e 100755..100644
--- a/public/img/emoji/recycle.png
+++ b/public/img/emoji/recycle.png
diff --git a/public/img/emoji/red_car.png b/public/img/emoji/red_car.png
index d70a2f06..d70a2f06 100755..100644
--- a/public/img/emoji/red_car.png
+++ b/public/img/emoji/red_car.png
diff --git a/public/img/emoji/red_circle.png b/public/img/emoji/red_circle.png
index b391289b..b391289b 100755..100644
--- a/public/img/emoji/red_circle.png
+++ b/public/img/emoji/red_circle.png
diff --git a/public/img/emoji/registered.png b/public/img/emoji/registered.png
index 31c68a80..31c68a80 100755..100644
--- a/public/img/emoji/registered.png
+++ b/public/img/emoji/registered.png
diff --git a/public/img/emoji/relaxed.png b/public/img/emoji/relaxed.png
index bbab82d3..bbab82d3 100755..100644
--- a/public/img/emoji/relaxed.png
+++ b/public/img/emoji/relaxed.png
diff --git a/public/img/emoji/relieved.png b/public/img/emoji/relieved.png
index fe5629f4..fe5629f4 100755..100644
--- a/public/img/emoji/relieved.png
+++ b/public/img/emoji/relieved.png
diff --git a/public/img/emoji/repeat.png b/public/img/emoji/repeat.png
index 80113b69..80113b69 100755..100644
--- a/public/img/emoji/repeat.png
+++ b/public/img/emoji/repeat.png
diff --git a/public/img/emoji/repeat_one.png b/public/img/emoji/repeat_one.png
index 3c47bcc1..3c47bcc1 100755..100644
--- a/public/img/emoji/repeat_one.png
+++ b/public/img/emoji/repeat_one.png
diff --git a/public/img/emoji/restroom.png b/public/img/emoji/restroom.png
index d6c111b2..d6c111b2 100755..100644
--- a/public/img/emoji/restroom.png
+++ b/public/img/emoji/restroom.png
diff --git a/public/img/emoji/revolving_hearts.png b/public/img/emoji/revolving_hearts.png
index ea3317c4..ea3317c4 100755..100644
--- a/public/img/emoji/revolving_hearts.png
+++ b/public/img/emoji/revolving_hearts.png
diff --git a/public/img/emoji/rewind.png b/public/img/emoji/rewind.png
index 26289dc3..26289dc3 100755..100644
--- a/public/img/emoji/rewind.png
+++ b/public/img/emoji/rewind.png
diff --git a/public/img/emoji/ribbon.png b/public/img/emoji/ribbon.png
index 63ee5ba5..63ee5ba5 100755..100644
--- a/public/img/emoji/ribbon.png
+++ b/public/img/emoji/ribbon.png
diff --git a/public/img/emoji/rice.png b/public/img/emoji/rice.png
index 1fd22027..1fd22027 100755..100644
--- a/public/img/emoji/rice.png
+++ b/public/img/emoji/rice.png
diff --git a/public/img/emoji/rice_ball.png b/public/img/emoji/rice_ball.png
index ade7c45d..ade7c45d 100755..100644
--- a/public/img/emoji/rice_ball.png
+++ b/public/img/emoji/rice_ball.png
diff --git a/public/img/emoji/rice_cracker.png b/public/img/emoji/rice_cracker.png
index 954c901e..954c901e 100755..100644
--- a/public/img/emoji/rice_cracker.png
+++ b/public/img/emoji/rice_cracker.png
diff --git a/public/img/emoji/rice_scene.png b/public/img/emoji/rice_scene.png
index 14361988..14361988 100755..100644
--- a/public/img/emoji/rice_scene.png
+++ b/public/img/emoji/rice_scene.png
diff --git a/public/img/emoji/ring.png b/public/img/emoji/ring.png
index 8a57fd68..8a57fd68 100755..100644
--- a/public/img/emoji/ring.png
+++ b/public/img/emoji/ring.png
diff --git a/public/img/emoji/rocket.png b/public/img/emoji/rocket.png
index 783078d3..783078d3 100755..100644
--- a/public/img/emoji/rocket.png
+++ b/public/img/emoji/rocket.png
diff --git a/public/img/emoji/roller_coaster.png b/public/img/emoji/roller_coaster.png
index 9180b986..9180b986 100755..100644
--- a/public/img/emoji/roller_coaster.png
+++ b/public/img/emoji/roller_coaster.png
diff --git a/public/img/emoji/rooster.png b/public/img/emoji/rooster.png
index fab23ad3..fab23ad3 100755..100644
--- a/public/img/emoji/rooster.png
+++ b/public/img/emoji/rooster.png
diff --git a/public/img/emoji/rose.png b/public/img/emoji/rose.png
index 3479fbcb..3479fbcb 100755..100644
--- a/public/img/emoji/rose.png
+++ b/public/img/emoji/rose.png
diff --git a/public/img/emoji/rotating_light.png b/public/img/emoji/rotating_light.png
index 6cf4a775..6cf4a775 100755..100644
--- a/public/img/emoji/rotating_light.png
+++ b/public/img/emoji/rotating_light.png
diff --git a/public/img/emoji/round_pushpin.png b/public/img/emoji/round_pushpin.png
index e498e92c..e498e92c 100755..100644
--- a/public/img/emoji/round_pushpin.png
+++ b/public/img/emoji/round_pushpin.png
diff --git a/public/img/emoji/rowboat.png b/public/img/emoji/rowboat.png
index e370d0fb..e370d0fb 100755..100644
--- a/public/img/emoji/rowboat.png
+++ b/public/img/emoji/rowboat.png
diff --git a/public/img/emoji/ru.png b/public/img/emoji/ru.png
index 55fcf354..55fcf354 100755..100644
--- a/public/img/emoji/ru.png
+++ b/public/img/emoji/ru.png
diff --git a/public/img/emoji/rugby_football.png b/public/img/emoji/rugby_football.png
index f8db67d7..f8db67d7 100755..100644
--- a/public/img/emoji/rugby_football.png
+++ b/public/img/emoji/rugby_football.png
diff --git a/public/img/emoji/runner.png b/public/img/emoji/runner.png
index cb004296..cb004296 100755..100644
--- a/public/img/emoji/runner.png
+++ b/public/img/emoji/runner.png
diff --git a/public/img/emoji/running.png b/public/img/emoji/running.png
index cb004296..cb004296 100755..100644
--- a/public/img/emoji/running.png
+++ b/public/img/emoji/running.png
diff --git a/public/img/emoji/running_shirt_with_sash.png b/public/img/emoji/running_shirt_with_sash.png
index 0d68bba0..0d68bba0 100755..100644
--- a/public/img/emoji/running_shirt_with_sash.png
+++ b/public/img/emoji/running_shirt_with_sash.png
diff --git a/public/img/emoji/sa.png b/public/img/emoji/sa.png
index 387f098b..387f098b 100755..100644
--- a/public/img/emoji/sa.png
+++ b/public/img/emoji/sa.png
diff --git a/public/img/emoji/sagittarius.png b/public/img/emoji/sagittarius.png
index 8b5435ba..8b5435ba 100755..100644
--- a/public/img/emoji/sagittarius.png
+++ b/public/img/emoji/sagittarius.png
diff --git a/public/img/emoji/sailboat.png b/public/img/emoji/sailboat.png
index ff656dc6..ff656dc6 100755..100644
--- a/public/img/emoji/sailboat.png
+++ b/public/img/emoji/sailboat.png
diff --git a/public/img/emoji/sake.png b/public/img/emoji/sake.png
index 1f69907e..1f69907e 100755..100644
--- a/public/img/emoji/sake.png
+++ b/public/img/emoji/sake.png
diff --git a/public/img/emoji/sandal.png b/public/img/emoji/sandal.png
index 0bb3f663..0bb3f663 100755..100644
--- a/public/img/emoji/sandal.png
+++ b/public/img/emoji/sandal.png
diff --git a/public/img/emoji/santa.png b/public/img/emoji/santa.png
index a2240c07..a2240c07 100755..100644
--- a/public/img/emoji/santa.png
+++ b/public/img/emoji/santa.png
diff --git a/public/img/emoji/satellite.png b/public/img/emoji/satellite.png
index 3481cc2e..3481cc2e 100755..100644
--- a/public/img/emoji/satellite.png
+++ b/public/img/emoji/satellite.png
diff --git a/public/img/emoji/satisfied.png b/public/img/emoji/satisfied.png
index 11c91eb2..11c91eb2 100755..100644
--- a/public/img/emoji/satisfied.png
+++ b/public/img/emoji/satisfied.png
diff --git a/public/img/emoji/saxophone.png b/public/img/emoji/saxophone.png
index 011559a7..011559a7 100755..100644
--- a/public/img/emoji/saxophone.png
+++ b/public/img/emoji/saxophone.png
diff --git a/public/img/emoji/school.png b/public/img/emoji/school.png
index afd922bf..afd922bf 100755..100644
--- a/public/img/emoji/school.png
+++ b/public/img/emoji/school.png
diff --git a/public/img/emoji/school_satchel.png b/public/img/emoji/school_satchel.png
index edfb19ae..edfb19ae 100755..100644
--- a/public/img/emoji/school_satchel.png
+++ b/public/img/emoji/school_satchel.png
diff --git a/public/img/emoji/scissors.png b/public/img/emoji/scissors.png
index d99b8aea..d99b8aea 100755..100644
--- a/public/img/emoji/scissors.png
+++ b/public/img/emoji/scissors.png
diff --git a/public/img/emoji/scorpius.png b/public/img/emoji/scorpius.png
index 67fcea16..67fcea16 100755..100644
--- a/public/img/emoji/scorpius.png
+++ b/public/img/emoji/scorpius.png
diff --git a/public/img/emoji/scream.png b/public/img/emoji/scream.png
index 9e93c885..9e93c885 100755..100644
--- a/public/img/emoji/scream.png
+++ b/public/img/emoji/scream.png
diff --git a/public/img/emoji/scream_cat.png b/public/img/emoji/scream_cat.png
index d94cd34f..d94cd34f 100755..100644
--- a/public/img/emoji/scream_cat.png
+++ b/public/img/emoji/scream_cat.png
diff --git a/public/img/emoji/scroll.png b/public/img/emoji/scroll.png
index c5a10e6b..c5a10e6b 100755..100644
--- a/public/img/emoji/scroll.png
+++ b/public/img/emoji/scroll.png
diff --git a/public/img/emoji/seat.png b/public/img/emoji/seat.png
index d1cb864b..d1cb864b 100755..100644
--- a/public/img/emoji/seat.png
+++ b/public/img/emoji/seat.png
diff --git a/public/img/emoji/secret.png b/public/img/emoji/secret.png
index 82e383a6..82e383a6 100755..100644
--- a/public/img/emoji/secret.png
+++ b/public/img/emoji/secret.png
diff --git a/public/img/emoji/see_no_evil.png b/public/img/emoji/see_no_evil.png
index 0890a622..0890a622 100755..100644
--- a/public/img/emoji/see_no_evil.png
+++ b/public/img/emoji/see_no_evil.png
diff --git a/public/img/emoji/seedling.png b/public/img/emoji/seedling.png
index 2ab07931..2ab07931 100755..100644
--- a/public/img/emoji/seedling.png
+++ b/public/img/emoji/seedling.png
diff --git a/public/img/emoji/seven.png b/public/img/emoji/seven.png
index 354e89ae..354e89ae 100755..100644
--- a/public/img/emoji/seven.png
+++ b/public/img/emoji/seven.png
diff --git a/public/img/emoji/shaved_ice.png b/public/img/emoji/shaved_ice.png
index 0d0b382c..0d0b382c 100755..100644
--- a/public/img/emoji/shaved_ice.png
+++ b/public/img/emoji/shaved_ice.png
diff --git a/public/img/emoji/sheep.png b/public/img/emoji/sheep.png
index c7277d28..c7277d28 100755..100644
--- a/public/img/emoji/sheep.png
+++ b/public/img/emoji/sheep.png
diff --git a/public/img/emoji/shell.png b/public/img/emoji/shell.png
index 3145b564..3145b564 100755..100644
--- a/public/img/emoji/shell.png
+++ b/public/img/emoji/shell.png
diff --git a/public/img/emoji/ship.png b/public/img/emoji/ship.png
index 5d2d8b60..5d2d8b60 100755..100644
--- a/public/img/emoji/ship.png
+++ b/public/img/emoji/ship.png
diff --git a/public/img/emoji/shipit.png b/public/img/emoji/shipit.png
index a58a47f6..a58a47f6 100755..100644
--- a/public/img/emoji/shipit.png
+++ b/public/img/emoji/shipit.png
diff --git a/public/img/emoji/shirt.png b/public/img/emoji/shirt.png
index 297a6d63..297a6d63 100755..100644
--- a/public/img/emoji/shirt.png
+++ b/public/img/emoji/shirt.png
diff --git a/public/img/emoji/shit.png b/public/img/emoji/shit.png
index 73a4dc84..73a4dc84 100755..100644
--- a/public/img/emoji/shit.png
+++ b/public/img/emoji/shit.png
diff --git a/public/img/emoji/shoe.png b/public/img/emoji/shoe.png
index 45b82e61..45b82e61 100755..100644
--- a/public/img/emoji/shoe.png
+++ b/public/img/emoji/shoe.png
diff --git a/public/img/emoji/shower.png b/public/img/emoji/shower.png
index 0d72ab86..0d72ab86 100755..100644
--- a/public/img/emoji/shower.png
+++ b/public/img/emoji/shower.png
diff --git a/public/img/emoji/signal_strength.png b/public/img/emoji/signal_strength.png
index a4bd23eb..a4bd23eb 100755..100644
--- a/public/img/emoji/signal_strength.png
+++ b/public/img/emoji/signal_strength.png
diff --git a/public/img/emoji/six.png b/public/img/emoji/six.png
index 56880556..56880556 100755..100644
--- a/public/img/emoji/six.png
+++ b/public/img/emoji/six.png
diff --git a/public/img/emoji/six_pointed_star.png b/public/img/emoji/six_pointed_star.png
index c11af14c..c11af14c 100755..100644
--- a/public/img/emoji/six_pointed_star.png
+++ b/public/img/emoji/six_pointed_star.png
diff --git a/public/img/emoji/ski.png b/public/img/emoji/ski.png
index 98f5cb0f..98f5cb0f 100755..100644
--- a/public/img/emoji/ski.png
+++ b/public/img/emoji/ski.png
diff --git a/public/img/emoji/skull.png b/public/img/emoji/skull.png
index bd4ee382..bd4ee382 100755..100644
--- a/public/img/emoji/skull.png
+++ b/public/img/emoji/skull.png
diff --git a/public/img/emoji/sleeping.png b/public/img/emoji/sleeping.png
index 093b8523..093b8523 100755..100644
--- a/public/img/emoji/sleeping.png
+++ b/public/img/emoji/sleeping.png
diff --git a/public/img/emoji/sleepy.png b/public/img/emoji/sleepy.png
index df4f55ef..df4f55ef 100755..100644
--- a/public/img/emoji/sleepy.png
+++ b/public/img/emoji/sleepy.png
diff --git a/public/img/emoji/slot_machine.png b/public/img/emoji/slot_machine.png
index 26f11483..26f11483 100755..100644
--- a/public/img/emoji/slot_machine.png
+++ b/public/img/emoji/slot_machine.png
diff --git a/public/img/emoji/small_blue_diamond.png b/public/img/emoji/small_blue_diamond.png
index 8cd49205..8cd49205 100755..100644
--- a/public/img/emoji/small_blue_diamond.png
+++ b/public/img/emoji/small_blue_diamond.png
diff --git a/public/img/emoji/small_orange_diamond.png b/public/img/emoji/small_orange_diamond.png
index 04941d37..04941d37 100755..100644
--- a/public/img/emoji/small_orange_diamond.png
+++ b/public/img/emoji/small_orange_diamond.png
diff --git a/public/img/emoji/small_red_triangle.png b/public/img/emoji/small_red_triangle.png
index 8c4428da..8c4428da 100755..100644
--- a/public/img/emoji/small_red_triangle.png
+++ b/public/img/emoji/small_red_triangle.png
diff --git a/public/img/emoji/small_red_triangle_down.png b/public/img/emoji/small_red_triangle_down.png
index 94832f06..94832f06 100755..100644
--- a/public/img/emoji/small_red_triangle_down.png
+++ b/public/img/emoji/small_red_triangle_down.png
diff --git a/public/img/emoji/smile.png b/public/img/emoji/smile.png
index 81a83968..81a83968 100755..100644
--- a/public/img/emoji/smile.png
+++ b/public/img/emoji/smile.png
diff --git a/public/img/emoji/smile_cat.png b/public/img/emoji/smile_cat.png
index ad333ba3..ad333ba3 100755..100644
--- a/public/img/emoji/smile_cat.png
+++ b/public/img/emoji/smile_cat.png
diff --git a/public/img/emoji/smiley.png b/public/img/emoji/smiley.png
index 77b581d6..77b581d6 100755..100644
--- a/public/img/emoji/smiley.png
+++ b/public/img/emoji/smiley.png
diff --git a/public/img/emoji/smiley_cat.png b/public/img/emoji/smiley_cat.png
index dbf1b027..dbf1b027 100755..100644
--- a/public/img/emoji/smiley_cat.png
+++ b/public/img/emoji/smiley_cat.png
diff --git a/public/img/emoji/smiling_imp.png b/public/img/emoji/smiling_imp.png
index d9040493..d9040493 100755..100644
--- a/public/img/emoji/smiling_imp.png
+++ b/public/img/emoji/smiling_imp.png
diff --git a/public/img/emoji/smirk.png b/public/img/emoji/smirk.png
index bc6e5082..bc6e5082 100755..100644
--- a/public/img/emoji/smirk.png
+++ b/public/img/emoji/smirk.png
diff --git a/public/img/emoji/smirk_cat.png b/public/img/emoji/smirk_cat.png
index 351565e2..351565e2 100755..100644
--- a/public/img/emoji/smirk_cat.png
+++ b/public/img/emoji/smirk_cat.png
diff --git a/public/img/emoji/smoking.png b/public/img/emoji/smoking.png
index 4aad6cbd..4aad6cbd 100755..100644
--- a/public/img/emoji/smoking.png
+++ b/public/img/emoji/smoking.png
diff --git a/public/img/emoji/snail.png b/public/img/emoji/snail.png
index e75e69a8..e75e69a8 100755..100644
--- a/public/img/emoji/snail.png
+++ b/public/img/emoji/snail.png
diff --git a/public/img/emoji/snake.png b/public/img/emoji/snake.png
index ef58933e..ef58933e 100755..100644
--- a/public/img/emoji/snake.png
+++ b/public/img/emoji/snake.png
diff --git a/public/img/emoji/snowboarder.png b/public/img/emoji/snowboarder.png
index aeda5c8d..aeda5c8d 100755..100644
--- a/public/img/emoji/snowboarder.png
+++ b/public/img/emoji/snowboarder.png
diff --git a/public/img/emoji/snowflake.png b/public/img/emoji/snowflake.png
index 54b68ff4..54b68ff4 100755..100644
--- a/public/img/emoji/snowflake.png
+++ b/public/img/emoji/snowflake.png
diff --git a/public/img/emoji/snowman.png b/public/img/emoji/snowman.png
index a97902e5..a97902e5 100755..100644
--- a/public/img/emoji/snowman.png
+++ b/public/img/emoji/snowman.png
diff --git a/public/img/emoji/sob.png b/public/img/emoji/sob.png
index 1561df92..1561df92 100755..100644
--- a/public/img/emoji/sob.png
+++ b/public/img/emoji/sob.png
diff --git a/public/img/emoji/soccer.png b/public/img/emoji/soccer.png
index 1e118b5b..1e118b5b 100755..100644
--- a/public/img/emoji/soccer.png
+++ b/public/img/emoji/soccer.png
diff --git a/public/img/emoji/soon.png b/public/img/emoji/soon.png
index 2cf46df2..2cf46df2 100755..100644
--- a/public/img/emoji/soon.png
+++ b/public/img/emoji/soon.png
diff --git a/public/img/emoji/sos.png b/public/img/emoji/sos.png
index e3e16ef7..e3e16ef7 100755..100644
--- a/public/img/emoji/sos.png
+++ b/public/img/emoji/sos.png
diff --git a/public/img/emoji/sound.png b/public/img/emoji/sound.png
index 6aa4dbff..6aa4dbff 100755..100644
--- a/public/img/emoji/sound.png
+++ b/public/img/emoji/sound.png
diff --git a/public/img/emoji/space_invader.png b/public/img/emoji/space_invader.png
index 38404916..38404916 100755..100644
--- a/public/img/emoji/space_invader.png
+++ b/public/img/emoji/space_invader.png
diff --git a/public/img/emoji/spades.png b/public/img/emoji/spades.png
index 133a1aba..133a1aba 100755..100644
--- a/public/img/emoji/spades.png
+++ b/public/img/emoji/spades.png
diff --git a/public/img/emoji/spaghetti.png b/public/img/emoji/spaghetti.png
index 08de243f..08de243f 100755..100644
--- a/public/img/emoji/spaghetti.png
+++ b/public/img/emoji/spaghetti.png
diff --git a/public/img/emoji/sparkler.png b/public/img/emoji/sparkler.png
index 4aabd7e0..4aabd7e0 100755..100644
--- a/public/img/emoji/sparkler.png
+++ b/public/img/emoji/sparkler.png
diff --git a/public/img/emoji/sparkles.png b/public/img/emoji/sparkles.png
index 51307bcf..51307bcf 100755..100644
--- a/public/img/emoji/sparkles.png
+++ b/public/img/emoji/sparkles.png
diff --git a/public/img/emoji/sparkling_heart.png b/public/img/emoji/sparkling_heart.png
index 64ac0666..64ac0666 100755..100644
--- a/public/img/emoji/sparkling_heart.png
+++ b/public/img/emoji/sparkling_heart.png
diff --git a/public/img/emoji/speak_no_evil.png b/public/img/emoji/speak_no_evil.png
index 87944c4d..87944c4d 100755..100644
--- a/public/img/emoji/speak_no_evil.png
+++ b/public/img/emoji/speak_no_evil.png
diff --git a/public/img/emoji/speaker.png b/public/img/emoji/speaker.png
index 470476e1..470476e1 100755..100644
--- a/public/img/emoji/speaker.png
+++ b/public/img/emoji/speaker.png
diff --git a/public/img/emoji/speech_balloon.png b/public/img/emoji/speech_balloon.png
index 2896c278..2896c278 100755..100644
--- a/public/img/emoji/speech_balloon.png
+++ b/public/img/emoji/speech_balloon.png
diff --git a/public/img/emoji/speedboat.png b/public/img/emoji/speedboat.png
index da6689b3..da6689b3 100755..100644
--- a/public/img/emoji/speedboat.png
+++ b/public/img/emoji/speedboat.png
diff --git a/public/img/emoji/squirrel.png b/public/img/emoji/squirrel.png
index a58a47f6..a58a47f6 100755..100644
--- a/public/img/emoji/squirrel.png
+++ b/public/img/emoji/squirrel.png
diff --git a/public/img/emoji/star.png b/public/img/emoji/star.png
index 1bfddc86..1bfddc86 100755..100644
--- a/public/img/emoji/star.png
+++ b/public/img/emoji/star.png
diff --git a/public/img/emoji/star2.png b/public/img/emoji/star2.png
index 8b40ff4c..8b40ff4c 100755..100644
--- a/public/img/emoji/star2.png
+++ b/public/img/emoji/star2.png
diff --git a/public/img/emoji/stars.png b/public/img/emoji/stars.png
index 097a8424..097a8424 100755..100644
--- a/public/img/emoji/stars.png
+++ b/public/img/emoji/stars.png
diff --git a/public/img/emoji/station.png b/public/img/emoji/station.png
index e77daa8a..e77daa8a 100755..100644
--- a/public/img/emoji/station.png
+++ b/public/img/emoji/station.png
diff --git a/public/img/emoji/statue_of_liberty.png b/public/img/emoji/statue_of_liberty.png
index 9ad90280..9ad90280 100755..100644
--- a/public/img/emoji/statue_of_liberty.png
+++ b/public/img/emoji/statue_of_liberty.png
diff --git a/public/img/emoji/steam_locomotive.png b/public/img/emoji/steam_locomotive.png
index 54950776..54950776 100755..100644
--- a/public/img/emoji/steam_locomotive.png
+++ b/public/img/emoji/steam_locomotive.png
diff --git a/public/img/emoji/stew.png b/public/img/emoji/stew.png
index e9687f9e..e9687f9e 100755..100644
--- a/public/img/emoji/stew.png
+++ b/public/img/emoji/stew.png
diff --git a/public/img/emoji/straight_ruler.png b/public/img/emoji/straight_ruler.png
index d96658ea..d96658ea 100755..100644
--- a/public/img/emoji/straight_ruler.png
+++ b/public/img/emoji/straight_ruler.png
diff --git a/public/img/emoji/strawberry.png b/public/img/emoji/strawberry.png
index 13eb827a..13eb827a 100755..100644
--- a/public/img/emoji/strawberry.png
+++ b/public/img/emoji/strawberry.png
diff --git a/public/img/emoji/stuck_out_tongue.png b/public/img/emoji/stuck_out_tongue.png
index fa7b58e2..fa7b58e2 100755..100644
--- a/public/img/emoji/stuck_out_tongue.png
+++ b/public/img/emoji/stuck_out_tongue.png
diff --git a/public/img/emoji/stuck_out_tongue_closed_eyes.png b/public/img/emoji/stuck_out_tongue_closed_eyes.png
index 333716ee..333716ee 100755..100644
--- a/public/img/emoji/stuck_out_tongue_closed_eyes.png
+++ b/public/img/emoji/stuck_out_tongue_closed_eyes.png
diff --git a/public/img/emoji/stuck_out_tongue_winking_eye.png b/public/img/emoji/stuck_out_tongue_winking_eye.png
index 6ae9d497..6ae9d497 100755..100644
--- a/public/img/emoji/stuck_out_tongue_winking_eye.png
+++ b/public/img/emoji/stuck_out_tongue_winking_eye.png
diff --git a/public/img/emoji/sun_with_face.png b/public/img/emoji/sun_with_face.png
index ee276636..ee276636 100755..100644
--- a/public/img/emoji/sun_with_face.png
+++ b/public/img/emoji/sun_with_face.png
diff --git a/public/img/emoji/sunflower.png b/public/img/emoji/sunflower.png
index d9bad194..d9bad194 100755..100644
--- a/public/img/emoji/sunflower.png
+++ b/public/img/emoji/sunflower.png
diff --git a/public/img/emoji/sunglasses.png b/public/img/emoji/sunglasses.png
index f2e52478..f2e52478 100755..100644
--- a/public/img/emoji/sunglasses.png
+++ b/public/img/emoji/sunglasses.png
diff --git a/public/img/emoji/sunny.png b/public/img/emoji/sunny.png
index d23c095e..d23c095e 100755..100644
--- a/public/img/emoji/sunny.png
+++ b/public/img/emoji/sunny.png
diff --git a/public/img/emoji/sunrise.png b/public/img/emoji/sunrise.png
index ec58dcc9..ec58dcc9 100755..100644
--- a/public/img/emoji/sunrise.png
+++ b/public/img/emoji/sunrise.png
diff --git a/public/img/emoji/sunrise_over_mountains.png b/public/img/emoji/sunrise_over_mountains.png
index ebc3db14..ebc3db14 100755..100644
--- a/public/img/emoji/sunrise_over_mountains.png
+++ b/public/img/emoji/sunrise_over_mountains.png
diff --git a/public/img/emoji/surfer.png b/public/img/emoji/surfer.png
index b067e8cb..b067e8cb 100755..100644
--- a/public/img/emoji/surfer.png
+++ b/public/img/emoji/surfer.png
diff --git a/public/img/emoji/sushi.png b/public/img/emoji/sushi.png
index 0d179bd9..0d179bd9 100755..100644
--- a/public/img/emoji/sushi.png
+++ b/public/img/emoji/sushi.png
diff --git a/public/img/emoji/suspect.png b/public/img/emoji/suspect.png
index 58e8921c..58e8921c 100755..100644
--- a/public/img/emoji/suspect.png
+++ b/public/img/emoji/suspect.png
diff --git a/public/img/emoji/suspension_railway.png b/public/img/emoji/suspension_railway.png
index aaa45f61..aaa45f61 100755..100644
--- a/public/img/emoji/suspension_railway.png
+++ b/public/img/emoji/suspension_railway.png
diff --git a/public/img/emoji/sweat.png b/public/img/emoji/sweat.png
index e894b769..e894b769 100755..100644
--- a/public/img/emoji/sweat.png
+++ b/public/img/emoji/sweat.png
diff --git a/public/img/emoji/sweat_drops.png b/public/img/emoji/sweat_drops.png
index a83b3e96..a83b3e96 100755..100644
--- a/public/img/emoji/sweat_drops.png
+++ b/public/img/emoji/sweat_drops.png
diff --git a/public/img/emoji/sweat_smile.png b/public/img/emoji/sweat_smile.png
index 3903f717..3903f717 100755..100644
--- a/public/img/emoji/sweat_smile.png
+++ b/public/img/emoji/sweat_smile.png
diff --git a/public/img/emoji/sweet_potato.png b/public/img/emoji/sweet_potato.png
index cde7880a..cde7880a 100755..100644
--- a/public/img/emoji/sweet_potato.png
+++ b/public/img/emoji/sweet_potato.png
diff --git a/public/img/emoji/swimmer.png b/public/img/emoji/swimmer.png
index d3878a06..d3878a06 100755..100644
--- a/public/img/emoji/swimmer.png
+++ b/public/img/emoji/swimmer.png
diff --git a/public/img/emoji/symbols.png b/public/img/emoji/symbols.png
index 16bc1da9..16bc1da9 100755..100644
--- a/public/img/emoji/symbols.png
+++ b/public/img/emoji/symbols.png
diff --git a/public/img/emoji/syringe.png b/public/img/emoji/syringe.png
index 36aa8fed..36aa8fed 100755..100644
--- a/public/img/emoji/syringe.png
+++ b/public/img/emoji/syringe.png
diff --git a/public/img/emoji/tada.png b/public/img/emoji/tada.png
index 7411b526..7411b526 100755..100644
--- a/public/img/emoji/tada.png
+++ b/public/img/emoji/tada.png
diff --git a/public/img/emoji/tanabata_tree.png b/public/img/emoji/tanabata_tree.png
index 6dea4b2d..6dea4b2d 100755..100644
--- a/public/img/emoji/tanabata_tree.png
+++ b/public/img/emoji/tanabata_tree.png
diff --git a/public/img/emoji/tangerine.png b/public/img/emoji/tangerine.png
index fc9d4f82..fc9d4f82 100755..100644
--- a/public/img/emoji/tangerine.png
+++ b/public/img/emoji/tangerine.png
diff --git a/public/img/emoji/taurus.png b/public/img/emoji/taurus.png
index 6af582f6..6af582f6 100755..100644
--- a/public/img/emoji/taurus.png
+++ b/public/img/emoji/taurus.png
diff --git a/public/img/emoji/taxi.png b/public/img/emoji/taxi.png
index 60a50d36..60a50d36 100755..100644
--- a/public/img/emoji/taxi.png
+++ b/public/img/emoji/taxi.png
diff --git a/public/img/emoji/tea.png b/public/img/emoji/tea.png
index 3ece0b70..3ece0b70 100755..100644
--- a/public/img/emoji/tea.png
+++ b/public/img/emoji/tea.png
diff --git a/public/img/emoji/telephone.png b/public/img/emoji/telephone.png
index 87d2559b..87d2559b 100755..100644
--- a/public/img/emoji/telephone.png
+++ b/public/img/emoji/telephone.png
diff --git a/public/img/emoji/telephone_receiver.png b/public/img/emoji/telephone_receiver.png
index 36e21e01..36e21e01 100755..100644
--- a/public/img/emoji/telephone_receiver.png
+++ b/public/img/emoji/telephone_receiver.png
diff --git a/public/img/emoji/telescope.png b/public/img/emoji/telescope.png
index 98e57558..98e57558 100755..100644
--- a/public/img/emoji/telescope.png
+++ b/public/img/emoji/telescope.png
diff --git a/public/img/emoji/tennis.png b/public/img/emoji/tennis.png
index 278d904e..278d904e 100755..100644
--- a/public/img/emoji/tennis.png
+++ b/public/img/emoji/tennis.png
diff --git a/public/img/emoji/tent.png b/public/img/emoji/tent.png
index 5c0d20e4..5c0d20e4 100755..100644
--- a/public/img/emoji/tent.png
+++ b/public/img/emoji/tent.png
diff --git a/public/img/emoji/thought_balloon.png b/public/img/emoji/thought_balloon.png
index febe30d0..febe30d0 100755..100644
--- a/public/img/emoji/thought_balloon.png
+++ b/public/img/emoji/thought_balloon.png
diff --git a/public/img/emoji/three.png b/public/img/emoji/three.png
index 55644c99..55644c99 100755..100644
--- a/public/img/emoji/three.png
+++ b/public/img/emoji/three.png
diff --git a/public/img/emoji/thumbsdown.png b/public/img/emoji/thumbsdown.png
index 41c6b825..41c6b825 100755..100644
--- a/public/img/emoji/thumbsdown.png
+++ b/public/img/emoji/thumbsdown.png
diff --git a/public/img/emoji/thumbsup.png b/public/img/emoji/thumbsup.png
index 81786c1d..81786c1d 100755..100644
--- a/public/img/emoji/thumbsup.png
+++ b/public/img/emoji/thumbsup.png
diff --git a/public/img/emoji/ticket.png b/public/img/emoji/ticket.png
index cdacf1a7..cdacf1a7 100755..100644
--- a/public/img/emoji/ticket.png
+++ b/public/img/emoji/ticket.png
diff --git a/public/img/emoji/tiger.png b/public/img/emoji/tiger.png
index d6cc84a3..d6cc84a3 100755..100644
--- a/public/img/emoji/tiger.png
+++ b/public/img/emoji/tiger.png
diff --git a/public/img/emoji/tiger2.png b/public/img/emoji/tiger2.png
index b0c7d8dc..b0c7d8dc 100755..100644
--- a/public/img/emoji/tiger2.png
+++ b/public/img/emoji/tiger2.png
diff --git a/public/img/emoji/tired_face.png b/public/img/emoji/tired_face.png
index 77b78345..77b78345 100755..100644
--- a/public/img/emoji/tired_face.png
+++ b/public/img/emoji/tired_face.png
diff --git a/public/img/emoji/tm.png b/public/img/emoji/tm.png
index c7dec75a..c7dec75a 100755..100644
--- a/public/img/emoji/tm.png
+++ b/public/img/emoji/tm.png
diff --git a/public/img/emoji/toilet.png b/public/img/emoji/toilet.png
index e5cc4119..e5cc4119 100755..100644
--- a/public/img/emoji/toilet.png
+++ b/public/img/emoji/toilet.png
diff --git a/public/img/emoji/tokyo_tower.png b/public/img/emoji/tokyo_tower.png
index e1cbd7a3..e1cbd7a3 100755..100644
--- a/public/img/emoji/tokyo_tower.png
+++ b/public/img/emoji/tokyo_tower.png
diff --git a/public/img/emoji/tomato.png b/public/img/emoji/tomato.png
index a129700b..a129700b 100755..100644
--- a/public/img/emoji/tomato.png
+++ b/public/img/emoji/tomato.png
diff --git a/public/img/emoji/tongue.png b/public/img/emoji/tongue.png
index b0bab120..b0bab120 100755..100644
--- a/public/img/emoji/tongue.png
+++ b/public/img/emoji/tongue.png
diff --git a/public/img/emoji/top.png b/public/img/emoji/top.png
index 5aa4dd44..5aa4dd44 100755..100644
--- a/public/img/emoji/top.png
+++ b/public/img/emoji/top.png
diff --git a/public/img/emoji/tophat.png b/public/img/emoji/tophat.png
index 7d27134d..7d27134d 100755..100644
--- a/public/img/emoji/tophat.png
+++ b/public/img/emoji/tophat.png
diff --git a/public/img/emoji/tractor.png b/public/img/emoji/tractor.png
index 058fd3ed..058fd3ed 100755..100644
--- a/public/img/emoji/tractor.png
+++ b/public/img/emoji/tractor.png
diff --git a/public/img/emoji/traffic_light.png b/public/img/emoji/traffic_light.png
index 1facb276..1facb276 100755..100644
--- a/public/img/emoji/traffic_light.png
+++ b/public/img/emoji/traffic_light.png
diff --git a/public/img/emoji/train.png b/public/img/emoji/train.png
index 3202d80e..3202d80e 100755..100644
--- a/public/img/emoji/train.png
+++ b/public/img/emoji/train.png
diff --git a/public/img/emoji/train2.png b/public/img/emoji/train2.png
index 9c0d3ab6..9c0d3ab6 100755..100644
--- a/public/img/emoji/train2.png
+++ b/public/img/emoji/train2.png
diff --git a/public/img/emoji/tram.png b/public/img/emoji/tram.png
index 5eb29fb7..5eb29fb7 100755..100644
--- a/public/img/emoji/tram.png
+++ b/public/img/emoji/tram.png
diff --git a/public/img/emoji/triangular_flag_on_post.png b/public/img/emoji/triangular_flag_on_post.png
index f9a3f32d..f9a3f32d 100755..100644
--- a/public/img/emoji/triangular_flag_on_post.png
+++ b/public/img/emoji/triangular_flag_on_post.png
diff --git a/public/img/emoji/triangular_ruler.png b/public/img/emoji/triangular_ruler.png
index 383677cb..383677cb 100755..100644
--- a/public/img/emoji/triangular_ruler.png
+++ b/public/img/emoji/triangular_ruler.png
diff --git a/public/img/emoji/trident.png b/public/img/emoji/trident.png
index d79a7b4c..d79a7b4c 100755..100644
--- a/public/img/emoji/trident.png
+++ b/public/img/emoji/trident.png
diff --git a/public/img/emoji/triumph.png b/public/img/emoji/triumph.png
index 92f93bd1..92f93bd1 100755..100644
--- a/public/img/emoji/triumph.png
+++ b/public/img/emoji/triumph.png
diff --git a/public/img/emoji/trolleybus.png b/public/img/emoji/trolleybus.png
index b9740a53..b9740a53 100755..100644
--- a/public/img/emoji/trolleybus.png
+++ b/public/img/emoji/trolleybus.png
diff --git a/public/img/emoji/trollface.png b/public/img/emoji/trollface.png
index 119d77e7..119d77e7 100755..100644
--- a/public/img/emoji/trollface.png
+++ b/public/img/emoji/trollface.png
diff --git a/public/img/emoji/trophy.png b/public/img/emoji/trophy.png
index 95d3b63f..95d3b63f 100755..100644
--- a/public/img/emoji/trophy.png
+++ b/public/img/emoji/trophy.png
diff --git a/public/img/emoji/tropical_drink.png b/public/img/emoji/tropical_drink.png
index 55ca9eed..55ca9eed 100755..100644
--- a/public/img/emoji/tropical_drink.png
+++ b/public/img/emoji/tropical_drink.png
diff --git a/public/img/emoji/tropical_fish.png b/public/img/emoji/tropical_fish.png
index a6d73498..a6d73498 100755..100644
--- a/public/img/emoji/tropical_fish.png
+++ b/public/img/emoji/tropical_fish.png
diff --git a/public/img/emoji/truck.png b/public/img/emoji/truck.png
index 3f25ba1f..3f25ba1f 100755..100644
--- a/public/img/emoji/truck.png
+++ b/public/img/emoji/truck.png
diff --git a/public/img/emoji/trumpet.png b/public/img/emoji/trumpet.png
index c84cfb13..c84cfb13 100755..100644
--- a/public/img/emoji/trumpet.png
+++ b/public/img/emoji/trumpet.png
diff --git a/public/img/emoji/tshirt.png b/public/img/emoji/tshirt.png
index 297a6d63..297a6d63 100755..100644
--- a/public/img/emoji/tshirt.png
+++ b/public/img/emoji/tshirt.png
diff --git a/public/img/emoji/tulip.png b/public/img/emoji/tulip.png
index b3ee1102..b3ee1102 100755..100644
--- a/public/img/emoji/tulip.png
+++ b/public/img/emoji/tulip.png
diff --git a/public/img/emoji/turtle.png b/public/img/emoji/turtle.png
index 04d1d968..04d1d968 100755..100644
--- a/public/img/emoji/turtle.png
+++ b/public/img/emoji/turtle.png
diff --git a/public/img/emoji/tv.png b/public/img/emoji/tv.png
index 803dc3d4..803dc3d4 100755..100644
--- a/public/img/emoji/tv.png
+++ b/public/img/emoji/tv.png
diff --git a/public/img/emoji/twisted_rightwards_arrows.png b/public/img/emoji/twisted_rightwards_arrows.png
index 25cde18b..25cde18b 100755..100644
--- a/public/img/emoji/twisted_rightwards_arrows.png
+++ b/public/img/emoji/twisted_rightwards_arrows.png
diff --git a/public/img/emoji/two.png b/public/img/emoji/two.png
index c191f8a3..c191f8a3 100755..100644
--- a/public/img/emoji/two.png
+++ b/public/img/emoji/two.png
diff --git a/public/img/emoji/two_hearts.png b/public/img/emoji/two_hearts.png
index b189e9ae..b189e9ae 100755..100644
--- a/public/img/emoji/two_hearts.png
+++ b/public/img/emoji/two_hearts.png
diff --git a/public/img/emoji/two_men_holding_hands.png b/public/img/emoji/two_men_holding_hands.png
index d1099f21..d1099f21 100755..100644
--- a/public/img/emoji/two_men_holding_hands.png
+++ b/public/img/emoji/two_men_holding_hands.png
diff --git a/public/img/emoji/two_women_holding_hands.png b/public/img/emoji/two_women_holding_hands.png
index 619646c4..619646c4 100755..100644
--- a/public/img/emoji/two_women_holding_hands.png
+++ b/public/img/emoji/two_women_holding_hands.png
diff --git a/public/img/emoji/u5272.png b/public/img/emoji/u5272.png
index 2148253f..2148253f 100755..100644
--- a/public/img/emoji/u5272.png
+++ b/public/img/emoji/u5272.png
diff --git a/public/img/emoji/u5408.png b/public/img/emoji/u5408.png
index 03ab0d87..03ab0d87 100755..100644
--- a/public/img/emoji/u5408.png
+++ b/public/img/emoji/u5408.png
diff --git a/public/img/emoji/u55b6.png b/public/img/emoji/u55b6.png
index ba946d3f..ba946d3f 100755..100644
--- a/public/img/emoji/u55b6.png
+++ b/public/img/emoji/u55b6.png
diff --git a/public/img/emoji/u6307.png b/public/img/emoji/u6307.png
index 6557f567..6557f567 100755..100644
--- a/public/img/emoji/u6307.png
+++ b/public/img/emoji/u6307.png
diff --git a/public/img/emoji/u6708.png b/public/img/emoji/u6708.png
index e4dfe5aa..e4dfe5aa 100755..100644
--- a/public/img/emoji/u6708.png
+++ b/public/img/emoji/u6708.png
diff --git a/public/img/emoji/u6709.png b/public/img/emoji/u6709.png
index cd8fb3f6..cd8fb3f6 100755..100644
--- a/public/img/emoji/u6709.png
+++ b/public/img/emoji/u6709.png
diff --git a/public/img/emoji/u6e80.png b/public/img/emoji/u6e80.png
index 5df1cb87..5df1cb87 100755..100644
--- a/public/img/emoji/u6e80.png
+++ b/public/img/emoji/u6e80.png
diff --git a/public/img/emoji/u7121.png b/public/img/emoji/u7121.png
index 25f694ed..25f694ed 100755..100644
--- a/public/img/emoji/u7121.png
+++ b/public/img/emoji/u7121.png
diff --git a/public/img/emoji/u7533.png b/public/img/emoji/u7533.png
index fc4a9901..fc4a9901 100755..100644
--- a/public/img/emoji/u7533.png
+++ b/public/img/emoji/u7533.png
diff --git a/public/img/emoji/u7981.png b/public/img/emoji/u7981.png
index f550a573..f550a573 100755..100644
--- a/public/img/emoji/u7981.png
+++ b/public/img/emoji/u7981.png
diff --git a/public/img/emoji/u7a7a.png b/public/img/emoji/u7a7a.png
index c05f5cff..c05f5cff 100755..100644
--- a/public/img/emoji/u7a7a.png
+++ b/public/img/emoji/u7a7a.png
diff --git a/public/img/emoji/uk.png b/public/img/emoji/uk.png
index 2a62c7a0..2a62c7a0 100755..100644
--- a/public/img/emoji/uk.png
+++ b/public/img/emoji/uk.png
diff --git a/public/img/emoji/umbrella.png b/public/img/emoji/umbrella.png
index 1db722fa..1db722fa 100755..100644
--- a/public/img/emoji/umbrella.png
+++ b/public/img/emoji/umbrella.png
diff --git a/public/img/emoji/unamused.png b/public/img/emoji/unamused.png
index 3722e6f5..3722e6f5 100755..100644
--- a/public/img/emoji/unamused.png
+++ b/public/img/emoji/unamused.png
diff --git a/public/img/emoji/underage.png b/public/img/emoji/underage.png
index a789b3c6..a789b3c6 100755..100644
--- a/public/img/emoji/underage.png
+++ b/public/img/emoji/underage.png
diff --git a/public/img/emoji/unlock.png b/public/img/emoji/unlock.png
index 22b429cd..22b429cd 100755..100644
--- a/public/img/emoji/unlock.png
+++ b/public/img/emoji/unlock.png
diff --git a/public/img/emoji/up.png b/public/img/emoji/up.png
index 829219a8..829219a8 100755..100644
--- a/public/img/emoji/up.png
+++ b/public/img/emoji/up.png
diff --git a/public/img/emoji/us.png b/public/img/emoji/us.png
index 38137669..38137669 100755..100644
--- a/public/img/emoji/us.png
+++ b/public/img/emoji/us.png
diff --git a/public/img/emoji/v.png b/public/img/emoji/v.png
index f61267c2..f61267c2 100755..100644
--- a/public/img/emoji/v.png
+++ b/public/img/emoji/v.png
diff --git a/public/img/emoji/vertical_traffic_light.png b/public/img/emoji/vertical_traffic_light.png
index 7a5ba35f..7a5ba35f 100755..100644
--- a/public/img/emoji/vertical_traffic_light.png
+++ b/public/img/emoji/vertical_traffic_light.png
diff --git a/public/img/emoji/vhs.png b/public/img/emoji/vhs.png
index 881081c1..881081c1 100755..100644
--- a/public/img/emoji/vhs.png
+++ b/public/img/emoji/vhs.png
diff --git a/public/img/emoji/vibration_mode.png b/public/img/emoji/vibration_mode.png
index a716e96c..a716e96c 100755..100644
--- a/public/img/emoji/vibration_mode.png
+++ b/public/img/emoji/vibration_mode.png
diff --git a/public/img/emoji/video_camera.png b/public/img/emoji/video_camera.png
index 274cecdd..274cecdd 100755..100644
--- a/public/img/emoji/video_camera.png
+++ b/public/img/emoji/video_camera.png
diff --git a/public/img/emoji/video_game.png b/public/img/emoji/video_game.png
index e265a3bd..e265a3bd 100755..100644
--- a/public/img/emoji/video_game.png
+++ b/public/img/emoji/video_game.png
diff --git a/public/img/emoji/violin.png b/public/img/emoji/violin.png
index 69347b54..69347b54 100755..100644
--- a/public/img/emoji/violin.png
+++ b/public/img/emoji/violin.png
diff --git a/public/img/emoji/virgo.png b/public/img/emoji/virgo.png
index 72e1763f..72e1763f 100755..100644
--- a/public/img/emoji/virgo.png
+++ b/public/img/emoji/virgo.png
diff --git a/public/img/emoji/volcano.png b/public/img/emoji/volcano.png
index 9b434539..9b434539 100755..100644
--- a/public/img/emoji/volcano.png
+++ b/public/img/emoji/volcano.png
diff --git a/public/img/emoji/vs.png b/public/img/emoji/vs.png
index 86363885..86363885 100755..100644
--- a/public/img/emoji/vs.png
+++ b/public/img/emoji/vs.png
diff --git a/public/img/emoji/walking.png b/public/img/emoji/walking.png
index 52bc0381..52bc0381 100755..100644
--- a/public/img/emoji/walking.png
+++ b/public/img/emoji/walking.png
diff --git a/public/img/emoji/waning_crescent_moon.png b/public/img/emoji/waning_crescent_moon.png
index 30387780..30387780 100755..100644
--- a/public/img/emoji/waning_crescent_moon.png
+++ b/public/img/emoji/waning_crescent_moon.png
diff --git a/public/img/emoji/waning_gibbous_moon.png b/public/img/emoji/waning_gibbous_moon.png
index 51009907..51009907 100755..100644
--- a/public/img/emoji/waning_gibbous_moon.png
+++ b/public/img/emoji/waning_gibbous_moon.png
diff --git a/public/img/emoji/warning.png b/public/img/emoji/warning.png
index db6f96f0..db6f96f0 100755..100644
--- a/public/img/emoji/warning.png
+++ b/public/img/emoji/warning.png
diff --git a/public/img/emoji/watch.png b/public/img/emoji/watch.png
index d503bb87..d503bb87 100755..100644
--- a/public/img/emoji/watch.png
+++ b/public/img/emoji/watch.png
diff --git a/public/img/emoji/water_buffalo.png b/public/img/emoji/water_buffalo.png
index 3bcde3ed..3bcde3ed 100755..100644
--- a/public/img/emoji/water_buffalo.png
+++ b/public/img/emoji/water_buffalo.png
diff --git a/public/img/emoji/watermelon.png b/public/img/emoji/watermelon.png
index fc212be7..fc212be7 100755..100644
--- a/public/img/emoji/watermelon.png
+++ b/public/img/emoji/watermelon.png
diff --git a/public/img/emoji/wave.png b/public/img/emoji/wave.png
index 56e6e822..56e6e822 100755..100644
--- a/public/img/emoji/wave.png
+++ b/public/img/emoji/wave.png
diff --git a/public/img/emoji/wavy_dash.png b/public/img/emoji/wavy_dash.png
index 5a74e5c7..5a74e5c7 100755..100644
--- a/public/img/emoji/wavy_dash.png
+++ b/public/img/emoji/wavy_dash.png
diff --git a/public/img/emoji/waxing_crescent_moon.png b/public/img/emoji/waxing_crescent_moon.png
index c8f13dd3..c8f13dd3 100755..100644
--- a/public/img/emoji/waxing_crescent_moon.png
+++ b/public/img/emoji/waxing_crescent_moon.png
diff --git a/public/img/emoji/waxing_gibbous_moon.png b/public/img/emoji/waxing_gibbous_moon.png
index 54e7ec67..54e7ec67 100755..100644
--- a/public/img/emoji/waxing_gibbous_moon.png
+++ b/public/img/emoji/waxing_gibbous_moon.png
diff --git a/public/img/emoji/wc.png b/public/img/emoji/wc.png
index dfe84d2a..dfe84d2a 100755..100644
--- a/public/img/emoji/wc.png
+++ b/public/img/emoji/wc.png
diff --git a/public/img/emoji/weary.png b/public/img/emoji/weary.png
index 0c547541..0c547541 100755..100644
--- a/public/img/emoji/weary.png
+++ b/public/img/emoji/weary.png
diff --git a/public/img/emoji/wedding.png b/public/img/emoji/wedding.png
index ead19d52..ead19d52 100755..100644
--- a/public/img/emoji/wedding.png
+++ b/public/img/emoji/wedding.png
diff --git a/public/img/emoji/whale.png b/public/img/emoji/whale.png
index 5bb113e4..5bb113e4 100755..100644
--- a/public/img/emoji/whale.png
+++ b/public/img/emoji/whale.png
diff --git a/public/img/emoji/whale2.png b/public/img/emoji/whale2.png
index 0ef4ea94..0ef4ea94 100755..100644
--- a/public/img/emoji/whale2.png
+++ b/public/img/emoji/whale2.png
diff --git a/public/img/emoji/wheelchair.png b/public/img/emoji/wheelchair.png
index eddcdd79..eddcdd79 100755..100644
--- a/public/img/emoji/wheelchair.png
+++ b/public/img/emoji/wheelchair.png
diff --git a/public/img/emoji/white_check_mark.png b/public/img/emoji/white_check_mark.png
index 61dc0583..61dc0583 100755..100644
--- a/public/img/emoji/white_check_mark.png
+++ b/public/img/emoji/white_check_mark.png
diff --git a/public/img/emoji/white_circle.png b/public/img/emoji/white_circle.png
index 3f648d1b..3f648d1b 100755..100644
--- a/public/img/emoji/white_circle.png
+++ b/public/img/emoji/white_circle.png
diff --git a/public/img/emoji/white_flower.png b/public/img/emoji/white_flower.png
index c0929d0d..c0929d0d 100755..100644
--- a/public/img/emoji/white_flower.png
+++ b/public/img/emoji/white_flower.png
diff --git a/public/img/emoji/white_large_square.png b/public/img/emoji/white_large_square.png
index 60cb19a1..60cb19a1 100755..100644
--- a/public/img/emoji/white_large_square.png
+++ b/public/img/emoji/white_large_square.png
diff --git a/public/img/emoji/white_square_button.png b/public/img/emoji/white_square_button.png
index ad54d55c..ad54d55c 100755..100644
--- a/public/img/emoji/white_square_button.png
+++ b/public/img/emoji/white_square_button.png
diff --git a/public/img/emoji/wind_chime.png b/public/img/emoji/wind_chime.png
index efacf5dd..efacf5dd 100755..100644
--- a/public/img/emoji/wind_chime.png
+++ b/public/img/emoji/wind_chime.png
diff --git a/public/img/emoji/wine_glass.png b/public/img/emoji/wine_glass.png
index 82b0f000..82b0f000 100755..100644
--- a/public/img/emoji/wine_glass.png
+++ b/public/img/emoji/wine_glass.png
diff --git a/public/img/emoji/wink.png b/public/img/emoji/wink.png
index 756766dd..756766dd 100755..100644
--- a/public/img/emoji/wink.png
+++ b/public/img/emoji/wink.png
diff --git a/public/img/emoji/wolf.png b/public/img/emoji/wolf.png
index c60c9689..c60c9689 100755..100644
--- a/public/img/emoji/wolf.png
+++ b/public/img/emoji/wolf.png
diff --git a/public/img/emoji/woman.png b/public/img/emoji/woman.png
index 6bf0d2b1..6bf0d2b1 100755..100644
--- a/public/img/emoji/woman.png
+++ b/public/img/emoji/woman.png
diff --git a/public/img/emoji/womans_clothes.png b/public/img/emoji/womans_clothes.png
index aa297c7b..aa297c7b 100755..100644
--- a/public/img/emoji/womans_clothes.png
+++ b/public/img/emoji/womans_clothes.png
diff --git a/public/img/emoji/womans_hat.png b/public/img/emoji/womans_hat.png
index 4cb2e6a6..4cb2e6a6 100755..100644
--- a/public/img/emoji/womans_hat.png
+++ b/public/img/emoji/womans_hat.png
diff --git a/public/img/emoji/womens.png b/public/img/emoji/womens.png
index 2fab2966..2fab2966 100755..100644
--- a/public/img/emoji/womens.png
+++ b/public/img/emoji/womens.png
diff --git a/public/img/emoji/worried.png b/public/img/emoji/worried.png
index bfa1856c..bfa1856c 100755..100644
--- a/public/img/emoji/worried.png
+++ b/public/img/emoji/worried.png
diff --git a/public/img/emoji/wrench.png b/public/img/emoji/wrench.png
index a87072ad..a87072ad 100755..100644
--- a/public/img/emoji/wrench.png
+++ b/public/img/emoji/wrench.png
diff --git a/public/img/emoji/x.png b/public/img/emoji/x.png
index dff9efa8..dff9efa8 100755..100644
--- a/public/img/emoji/x.png
+++ b/public/img/emoji/x.png
diff --git a/public/img/emoji/yellow_heart.png b/public/img/emoji/yellow_heart.png
index fa41ce78..fa41ce78 100755..100644
--- a/public/img/emoji/yellow_heart.png
+++ b/public/img/emoji/yellow_heart.png
diff --git a/public/img/emoji/yen.png b/public/img/emoji/yen.png
index 139bc936..139bc936 100755..100644
--- a/public/img/emoji/yen.png
+++ b/public/img/emoji/yen.png
diff --git a/public/img/emoji/yum.png b/public/img/emoji/yum.png
index fc39637e..fc39637e 100755..100644
--- a/public/img/emoji/yum.png
+++ b/public/img/emoji/yum.png
diff --git a/public/img/emoji/zap.png b/public/img/emoji/zap.png
index 260c531b..260c531b 100755..100644
--- a/public/img/emoji/zap.png
+++ b/public/img/emoji/zap.png
diff --git a/public/img/emoji/zero.png b/public/img/emoji/zero.png
index 6e57b334..6e57b334 100755..100644
--- a/public/img/emoji/zero.png
+++ b/public/img/emoji/zero.png
diff --git a/public/img/emoji/zzz.png b/public/img/emoji/zzz.png
index 30be0465..30be0465 100755..100644
--- a/public/img/emoji/zzz.png
+++ b/public/img/emoji/zzz.png
diff --git a/public/js/libs/clipboard-1.5.5.min.js b/public/js/libs/clipboard-1.5.5.min.js
index 4e2a012a..4e2a012a 100755..100644
--- a/public/js/libs/clipboard-1.5.5.min.js
+++ b/public/js/libs/clipboard-1.5.5.min.js
diff --git a/public/js/libs/emojify-1.1.0.min.js b/public/js/libs/emojify-1.1.0.min.js
index 4fedf320..4fedf320 100755..100644
--- a/public/js/libs/emojify-1.1.0.min.js
+++ b/public/js/libs/emojify-1.1.0.min.js
diff --git a/public/js/semantic-2.1.8.min.js b/public/js/semantic-2.1.8.min.js
index 74875c8d..74875c8d 100755..100644
--- a/public/js/semantic-2.1.8.min.js
+++ b/public/js/semantic-2.1.8.min.js
diff --git a/public/less/_emojify.less b/public/less/_emojify.less
index e9a49a04..e9a49a04 100755..100644
--- a/public/less/_emojify.less
+++ b/public/less/_emojify.less
diff --git a/public/less/_repository.less b/public/less/_repository.less
index c3cc6d80..e9acff3f 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -73,6 +73,10 @@
 		background-color: #FAFAFA; 
 		margin-top: -15px; 
 		padding-top: 15px;
+
+		.ui.tabs.divider {
+			border-bottom: none;
+		}
 	}
 	.filter.menu {
 		.label.color {
diff --git a/public/plugins/dropzone-4.2.0/dropzone.css b/public/plugins/dropzone-4.2.0/dropzone.css
index 0494d1cc..0494d1cc 100755..100644
--- a/public/plugins/dropzone-4.2.0/dropzone.css
+++ b/public/plugins/dropzone-4.2.0/dropzone.css
diff --git a/public/plugins/dropzone-4.2.0/dropzone.js b/public/plugins/dropzone-4.2.0/dropzone.js
index cd7855fb..cd7855fb 100755..100644
--- a/public/plugins/dropzone-4.2.0/dropzone.js
+++ b/public/plugins/dropzone-4.2.0/dropzone.js
diff --git a/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.css b/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.css
index 9cecc707..9cecc707 100755..100644
--- a/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.css
+++ b/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.css
diff --git a/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.min.js b/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.min.js
index 5e5d7c9e..5e5d7c9e 100755..100644
--- a/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.min.js
+++ b/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.min.js
diff --git a/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.png b/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.png
index bccc2012..bccc2012 100755..100644
--- a/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.png
+++ b/public/plugins/jquery.minicolors-2.2.3/jquery.minicolors.png
diff --git a/public/plugins/simplemde-1.10.0/simplemde.min.css b/public/plugins/simplemde-1.10.0/simplemde.min.css
index 86205057..86205057 100755..100644
--- a/public/plugins/simplemde-1.10.0/simplemde.min.css
+++ b/public/plugins/simplemde-1.10.0/simplemde.min.css
diff --git a/public/plugins/simplemde-1.10.0/simplemde.min.js b/public/plugins/simplemde-1.10.0/simplemde.min.js
index 9148b42e..9148b42e 100755..100644
--- a/public/plugins/simplemde-1.10.0/simplemde.min.js
+++ b/public/plugins/simplemde-1.10.0/simplemde.min.js
diff --git a/routers/repo/http.go b/routers/repo/http.go
index 5e81e73c..f9600c94 100644
--- a/routers/repo/http.go
+++ b/routers/repo/http.go
@@ -134,7 +134,6 @@ func HTTP(ctx *middleware.Context) {
 				ctx.Handle(500, "GetUserByID", err)
 				return
 			}
-			authUsername = authUser.Name
 		}
 
 		if !isPublicPull {
@@ -202,7 +201,15 @@ func HTTP(ctx *middleware.Context) {
 					refName := fields[2]
 
 					// FIXME: handle error.
-					if err = models.Update(refName, oldCommitId, newCommitId, authUsername, username, reponame, authUser.Id); err == nil {
+					if err = models.PushUpdate(models.PushUpdateOptions{
+						RefName:      refName,
+						OldCommitID:  oldCommitId,
+						NewCommitID:  newCommitId,
+						PusherID:     authUser.Id,
+						PusherName:   authUser.Name,
+						RepoUserName: username,
+						RepoName:     reponame,
+					}); err == nil {
 						go models.HookQueue.Add(repo.ID)
 						go models.AddTestPullRequestTask(repo.ID, strings.TrimPrefix(refName, "refs/heads/"))
 					}
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 3120a8ba..1d747d2f 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -57,9 +57,9 @@ func MustEnableIssues(ctx *middleware.Context) {
 	}
 }
 
-func MustEnablePulls(ctx *middleware.Context) {
-	if !ctx.Repo.Repository.EnablePulls {
-		ctx.Handle(404, "MustEnablePulls", nil)
+func MustAllowPulls(ctx *middleware.Context) {
+	if !ctx.Repo.Repository.AllowsPulls() {
+		ctx.Handle(404, "MustAllowPulls", nil)
 	}
 
 	ctx.Data["HasForkedRepo"] = ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)
@@ -81,7 +81,7 @@ func RetrieveLabels(ctx *middleware.Context) {
 func Issues(ctx *middleware.Context) {
 	isPullList := ctx.Params(":type") == "pulls"
 	if isPullList {
-		MustEnablePulls(ctx)
+		MustAllowPulls(ctx)
 		if ctx.Written() {
 			return
 		}
diff --git a/routers/user/profile.go b/routers/user/profile.go
index 46c2688d..d0f41262 100644
--- a/routers/user/profile.go
+++ b/routers/user/profile.go
@@ -75,7 +75,7 @@ func Profile(ctx *middleware.Context) {
 	ctx.Data["PageIsUserProfile"] = true
 	ctx.Data["Owner"] = u
 
-	orgs, err := models.GetOrgsByUserIDDesc(u.Id, "updated", ctx.User.IsAdmin || ctx.User.Id == u.Id)
+	orgs, err := models.GetOrgsByUserID(u.Id, ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.Id == u.Id))
 	if err != nil {
 		ctx.Handle(500, "GetOrgsByUserIDDesc", err)
 		return
diff --git a/templates/.VERSION b/templates/.VERSION
index 5b4bfc48..356e27b1 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.8.37.0217
\ No newline at end of file
+0.8.40.0219
\ No newline at end of file
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index 3002ff4b..34ef9faf 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -57,7 +57,7 @@
 					<i class="icon octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui {{if not .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span>
 				</a>
 			{{end}}
-			{{if .Repository.EnablePulls}}
+			{{if .Repository.AllowsPulls}}
 				<a class="{{if .PageIsPullList}}active{{end}} item" href="{{.RepoLink}}/pulls">
 					<i class="icon octicon octicon-git-pull-request"></i> {{.i18n.Tr "repo.pulls"}} <span class="ui {{if not .Repository.NumOpenPulls}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenPulls}}</span>
 				</a>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 985779fa..977d841c 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -117,15 +117,17 @@
 							<p class="help">{{.i18n.Tr "repo.settings.tracker_url_format_desc" | Str2html}}</p>
 						</div>
 
-						<div class="ui divider"></div>
+						{{if .Repository.CanEnablePulls}}
+							<div class="ui divider"></div>
 
-						<div class="inline field">
-							<label>{{.i18n.Tr "repo.pulls"}}</label>
-							<div class="ui checkbox">
-								<input name="enable_pulls" type="checkbox" {{if .Repository.EnablePulls}}checked{{end}}>
-								<label>{{.i18n.Tr "repo.settings.pulls_desc"}}</label>
+							<div class="inline field">
+								<label>{{.i18n.Tr "repo.pulls"}}</label>
+								<div class="ui checkbox">
+									<input name="enable_pulls" type="checkbox" {{if .Repository.EnablePulls}}checked{{end}}>
+									<label>{{.i18n.Tr "repo.settings.pulls_desc"}}</label>
+								</div>
 							</div>
-						</div>
+						{{end}}
 
 						<div class="ui divider"></div>
 						<div class="field">