diff --git a/Gemfile b/Gemfile
index cf663f22a9..10d3088d62 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,17 +67,19 @@ unless Bundler::Dependency::PLATFORM_MAP.include? :mri_21
    end
 end
 
-gem 'seed-fu', '~> 2.3.3'
 
 if rails_master?
   gem 'arel', git: 'https://github.com/rails/arel.git'
   gem 'rails', git: 'https://github.com/rails/rails.git'
+  gem 'rails-observers', git: 'https://github.com/SamSaffron/rails-observers.git'
+  gem 'seed-fu', git: 'https://github.com/SamSaffron/seed-fu.git', branch: 'discourse'
 else
+  gem 'seed-fu', '~> 2.3.3'
   gem 'rails'
+  gem 'rails-observers'
 end
 
 gem 'actionpack-action_caching'
-gem 'rails-observers'
 
 # Rails 4.1.6+ will relax the mail gem version requirement to `~> 2.5, >= 2.5.4`.
 # However, mail gem 2.6.x currently does not work with discourse because of the
@@ -118,11 +120,7 @@ gem 'fastimage'
 gem 'fog', '1.22.1', require: false
 gem 'unf', require: false
 
-# see: https://twitter.com/samsaffron/status/412360162297393152
-# Massive amount of changes made in branch we use, no PR upstreamed
-# We need to get this sorted
-# https://github.com/samsaffron/email_reply_parser
-gem 'email_reply_parser-discourse', require: 'email_reply_parser'
+gem 'email_reply_parser'
 
 # note: for image_optim to correctly work you need
 # sudo apt-get install -y advancecomp gifsicle jpegoptim libjpeg-progs optipng pngcrush
@@ -144,8 +142,15 @@ gem 'omniauth-github-discourse', require: 'omniauth-github'
 gem 'omniauth-oauth2', require: false
 gem 'omniauth-google-oauth2'
 gem 'oj'
-# while resolving https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4
-gem 'pg', '0.15.1'
+
+if rails_master?
+  # native casting
+  gem 'pg', '0.18.0.pre20141117110243'
+else
+  # while resolving https://groups.google.com/forum/#!topic/ruby-pg/5_ylGmog1S4
+  gem 'pg', '0.15.1'
+end
+
 gem 'pry-rails', require: false
 gem 'rake'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0f56e0cbc1..dc78e8f6d1 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -65,7 +65,7 @@ GEM
     dotenv (0.11.1)
       dotenv-deployment (~> 0.0.2)
     dotenv-deployment (0.0.2)
-    email_reply_parser-discourse (0.6)
+    email_reply_parser (0.5.8)
     ember-data-source (0.14)
       ember-source
     ember-rails (0.14.1)
@@ -82,7 +82,7 @@ GEM
     erubis (2.7.0)
     eventmachine (1.0.3)
     excon (0.39.6)
-    execjs (2.2.1)
+    execjs (2.2.2)
     exifr (1.1.3)
     fabrication (2.9.8)
     fakeweb (1.3.0)
@@ -99,7 +99,7 @@ GEM
     fastimage (1.6.3)
       addressable (~> 2.3, >= 2.3.5)
     ffi (1.9.5)
-    flamegraph (0.0.8)
+    flamegraph (0.0.9)
       fast_stack
     fog (1.22.1)
       fog-brightbox
@@ -185,7 +185,7 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
     netrc (0.7.7)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     nokogumbo (1.1.12)
       nokogiri
@@ -273,7 +273,7 @@ GEM
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     raindrops (0.13.0)
-    rake (10.3.2)
+    rake (10.4.0)
     rake-compiler (0.9.3)
       rake
     rb-fsevent (0.9.4)
@@ -390,7 +390,7 @@ GEM
     trollop (2.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.6.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     unf (0.1.4)
@@ -412,7 +412,7 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   certified
-  email_reply_parser-discourse
+  email_reply_parser
   ember-rails
   ember-source (= 1.6.0.beta.2)
   eventmachine
diff --git a/Gemfile_master.lock b/Gemfile_master.lock
index c962d2baec..c3f6d3a39b 100644
--- a/Gemfile_master.lock
+++ b/Gemfile_master.lock
@@ -7,66 +7,26 @@ GIT
       activemodel (>= 3.0)
 
 GIT
-  remote: https://github.com/rails/arel.git
-  revision: 1fefe71b1872c0a83f09231164863cd8dbb57174
+  remote: https://github.com/SamSaffron/rails-observers.git
+  revision: 7d2222d758603a004f6599f82a7068ffeb2d7ebf
   specs:
-    arel (6.0.0)
+    rails-observers (0.1.2)
+      activemodel (> 4.0)
 
 GIT
-  remote: https://github.com/rails/rails.git
-  revision: 2f8be7ebafcf7815f9f3ec7983789157525a60fa
+  remote: https://github.com/SamSaffron/seed-fu.git
+  revision: d93df3b6364ea938d87c5629bf950b0d1ffe037e
+  branch: discourse
   specs:
-    actionmailer (4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activejob (= 4.2.0.beta4)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      rack (~> 1.6.0.beta)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      globalid (>= 0.3.0)
-    activemodel (4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      builder (~> 3.1)
-    activerecord (4.2.0.beta4)
-      activemodel (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      arel (~> 6.0)
-    activesupport (4.2.0.beta4)
-      i18n (>= 0.7.0.beta1, < 0.8)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.1)
-      tzinfo (~> 1.1)
-    rails (4.2.0.beta4)
-      actionmailer (= 4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      actionview (= 4.2.0.beta4)
-      activejob (= 4.2.0.beta4)
-      activemodel (= 4.2.0.beta4)
-      activerecord (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.beta4)
-      sprockets-rails (~> 3.0.0.beta1)
-    railties (4.2.0.beta4)
-      actionpack (= 4.2.0.beta4)
-      activesupport (= 4.2.0.beta4)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
+    seed-fu (2.3.3)
+      activerecord (>= 3.1)
+      activesupport (>= 3.1)
+
+GIT
+  remote: https://github.com/rails/arel.git
+  revision: 98fc25991137ee09b6800578117f8c1c322680f2
+  specs:
+    arel (6.0.0)
 
 GIT
   remote: https://github.com/rails/sass-rails.git
@@ -78,6 +38,61 @@ GIT
       sprockets (~> 2.12)
       sprockets-rails (>= 2.0, < 4.0)
 
+PATH
+  remote: ../rails
+  specs:
+    actionmailer (5.0.0.alpha)
+      actionpack (= 5.0.0.alpha)
+      actionview (= 5.0.0.alpha)
+      activejob (= 5.0.0.alpha)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (5.0.0.alpha)
+      actionview (= 5.0.0.alpha)
+      activesupport (= 5.0.0.alpha)
+      rack (~> 1.6.0.beta2)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    actionview (5.0.0.alpha)
+      activesupport (= 5.0.0.alpha)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.1)
+    activejob (5.0.0.alpha)
+      activesupport (= 5.0.0.alpha)
+      globalid (>= 0.3.0)
+    activemodel (5.0.0.alpha)
+      activesupport (= 5.0.0.alpha)
+      builder (~> 3.1)
+    activerecord (5.0.0.alpha)
+      activemodel (= 5.0.0.alpha)
+      activesupport (= 5.0.0.alpha)
+      arel (~> 6.0)
+    activesupport (5.0.0.alpha)
+      i18n (>= 0.7.0.beta1, < 0.8)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    rails (5.0.0.alpha)
+      actionmailer (= 5.0.0.alpha)
+      actionpack (= 5.0.0.alpha)
+      actionview (= 5.0.0.alpha)
+      activejob (= 5.0.0.alpha)
+      activemodel (= 5.0.0.alpha)
+      activerecord (= 5.0.0.alpha)
+      activesupport (= 5.0.0.alpha)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 5.0.0.alpha)
+      sprockets-rails
+    railties (5.0.0.alpha)
+      actionpack (= 5.0.0.alpha)
+      activesupport (= 5.0.0.alpha)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+
 PATH
   remote: vendor/gems/rails_multisite
   specs:
@@ -150,7 +165,7 @@ GEM
     fastimage (1.6.3)
       addressable (~> 2.3, >= 2.3.5)
     ffi (1.9.5)
-    flamegraph (0.0.8)
+    flamegraph (0.0.9)
       fast_stack
     fog (1.22.1)
       fog-brightbox
@@ -285,7 +300,7 @@ GEM
     openid-redis-store (0.0.2)
       redis
       ruby-openid
-    pg (0.15.1)
+    pg (0.18.0.pre20141117110243)
     polyglot (0.3.5)
     progress (3.0.1)
     pry (0.10.1)
@@ -300,7 +315,7 @@ GEM
       rack (>= 1.1, < 2.0)
     qunit-rails (0.0.7)
       railties
-    rack (1.6.0.beta)
+    rack (1.6.0.beta2)
     rack-mini-profiler (0.9.2)
       rack (>= 1.1.3)
     rack-openid (1.3.1)
@@ -318,8 +333,6 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.1)
       loofah (~> 2.0)
-    rails-observers (0.1.2)
-      activemodel (~> 4.0)
     raindrops (0.13.0)
     rake (10.4.0)
     rake-compiler (0.9.3)
@@ -373,9 +386,6 @@ GEM
       nokogiri (>= 1.4.4)
       nokogumbo (= 1.1.12)
     sass (3.2.19)
-    seed-fu (2.3.3)
-      activerecord (>= 3.1, < 4.2)
-      activesupport (>= 3.1, < 4.2)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
@@ -498,7 +508,7 @@ DEPENDENCIES
   omniauth-twitter
   onebox
   openid-redis-store
-  pg (= 0.15.1)
+  pg (= 0.18.0.pre20141117110243)
   pry-nav
   pry-rails
   puma
@@ -506,7 +516,7 @@ DEPENDENCIES
   rack-mini-profiler
   rack-protection
   rails!
-  rails-observers
+  rails-observers!
   rails_multisite!
   rake
   rb-fsevent
@@ -525,7 +535,7 @@ DEPENDENCIES
   sanitize
   sass
   sass-rails!
-  seed-fu (~> 2.3.3)
+  seed-fu!
   shoulda
   sidekiq
   simple-rss
diff --git a/README.md b/README.md
index ae82fb76fc..006e797675 100644
--- a/README.md
+++ b/README.md
@@ -10,12 +10,12 @@ To learn more about the philosophy and goals of the project, [visit **discourse.
 
 ## Screenshots
 
-[![](https://raw2.github.com/discourse/discourse-docimages/master/readme/boing-boing-latest-small2.png)](http://bbs.boingboing.net)
-[![](https://raw2.github.com/discourse/discourse-docimages/master/readme/how-to-geek-profile-small2.png?breakcache=1)](http://discuss.howtogeek.com)
-[![](https://raw2.github.com/discourse/discourse-docimages/master/readme/new-relic-categories-small2.png)](http://discuss.newrelic.com)
-[![](https://raw2.github.com/discourse/discourse-docimages/master/readme/turtle-rock-topic-small2.jpg)](https://talk.turtlerockstudios.com/)
-[![](https://raw.github.com/discourse/discourse-docimages/master/readme/nexus-7-mobile-discourse-small3.png)](http://discuss.atom.io)
-[![](https://raw.github.com/discourse/discourse-docimages/master/readme/iphone-5s-mobile-discourse-small4.png)](http://discourse.soylent.me)
+[![](https://raw.githubusercontent.com/discourse/discourse-docimages/master/readme/boing-boing-latest-small2.png)](http://bbs.boingboing.net)
+[![](https://raw.githubusercontent.com/discourse/discourse-docimages/master/readme/how-to-geek-profile-small2.png)](http://discuss.howtogeek.com)
+[![](https://raw.githubusercontent.com/discourse/discourse-docimages/master/readme/new-relic-categories-small2.png)](http://discuss.newrelic.com)
+[![](https://raw.githubusercontent.com/discourse/discourse-docimages/master/readme/turtle-rock-topic-small2.jpg)](https://talk.turtlerockstudios.com/)
+[![](https://raw.githubusercontent.com/discourse/discourse-docimages/master/readme/nexus-7-mobile-discourse-small3.png)](http://discuss.atom.io)
+[![](https://raw.githubusercontent.com/discourse/discourse-docimages/master/readme/iphone-5s-mobile-discourse-small4.png)](http://discourse.soylent.me)
 
 
 ## Development
diff --git a/app/assets/javascripts/admin.js.erb b/app/assets/javascripts/admin.js.erb
index 3c536f4ca6..ce47046a21 100644
--- a/app/assets/javascripts/admin.js.erb
+++ b/app/assets/javascripts/admin.js.erb
@@ -1,12 +1,5 @@
 <%
-if Rails.env.development?
-  require_asset ("development/list-view.js")
-else
-  require_asset ("production/list-view.js")
-end
-
 require_asset("main_include_admin.js")
 
 DiscoursePluginRegistry.admin_javascripts.each { |js| require_asset(js) }
-
 %>
diff --git a/app/assets/javascripts/admin/components/resumable_upload_component.js b/app/assets/javascripts/admin/components/resumable_upload_component.js
index 3e3c1ad6fc..a5ef4af921 100644
--- a/app/assets/javascripts/admin/components/resumable_upload_component.js
+++ b/app/assets/javascripts/admin/components/resumable_upload_component.js
@@ -9,13 +9,8 @@
         error="errorAction"
         uploadText="UPLOAD"
     }}
-
-  @class ResumableUploadComponent
-  @extends Ember.Component
-  @namespace Discourse
-  @module Discourse
 **/
-Discourse.ResumableUploadComponent = Ember.Component.extend({
+Discourse.ResumableUploadComponent = Ember.Component.extend(Discourse.StringBuffer, {
   tagName: "button",
   classNames: ["btn", "ru"],
   classNameBindings: ["isUploading"],
@@ -25,7 +20,7 @@ Discourse.ResumableUploadComponent = Ember.Component.extend({
   isUploading: false,
   progress: 0,
 
-  shouldRerender: Discourse.View.renderIfChanged("isUploading", "progress"),
+  rerenderTriggers: ['isUploading', 'progress'],
 
   text: function() {
     if (this.get("isUploading")) {
@@ -35,7 +30,7 @@ Discourse.ResumableUploadComponent = Ember.Component.extend({
     }
   }.property("isUploading", "progress"),
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     var icon = this.get("isUploading") ? "times" : "upload";
     buffer.push("<i class='fa fa-" + icon + "'></i>");
     buffer.push("<span class='ru-label'>" + this.get("text") + "</span>");
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
index 2b4bd0e29c..745a172d2e 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-emails.js.es6
@@ -1,3 +1,5 @@
+import { outputExportResult } from 'admin/lib/export-result';
+
 export default Ember.ArrayController.extend(Discourse.Presence, {
   loading: false,
 
@@ -7,12 +9,16 @@ export default Ember.ArrayController.extend(Discourse.Presence, {
         // feeling lazy
         window.location.reload();
       });
+    },
+
+    exportScreenedEmailList: function(subject) {
+      Discourse.ExportCsv.exportScreenedEmailList().then(outputExportResult);
     }
   },
 
   show: function() {
     var self = this;
-    this.set('loading', true);
+    self.set('loading', true);
     Discourse.ScreenedEmail.findAll().then(function(result) {
       self.set('model', result);
       self.set('loading', false);
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
index 414461edac..b06c74d04e 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-ip-addresses.js.es6
@@ -1,10 +1,12 @@
+import { outputExportResult } from 'admin/lib/export-result';
+
 export default Ember.ArrayController.extend(Discourse.Presence, {
   loading: false,
   itemController: 'admin-log-screened-ip-address',
 
   show: function() {
     var self = this;
-    this.set('loading', true);
+    self.set('loading', true);
     Discourse.ScreenedIpAddress.findAll().then(function(result) {
       self.set('model', result);
       self.set('loading', false);
@@ -34,6 +36,10 @@ export default Ember.ArrayController.extend(Discourse.Presence, {
           });
         }
       });
+    },
+
+    exportScreenedIpList: function(subject) {
+      Discourse.ExportCsv.exportScreenedIpList().then(outputExportResult);
     }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
index 92cb40e496..49637494c8 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-screened-urls.js.es6
@@ -1,12 +1,20 @@
+import { outputExportResult } from 'admin/lib/export-result';
+
 export default Ember.ArrayController.extend(Discourse.Presence, {
   loading: false,
 
   show: function() {
     var self = this;
-    this.set('loading', true);
+    self.set('loading', true);
     Discourse.ScreenedUrl.findAll().then(function(result) {
       self.set('model', result);
       self.set('loading', false);
     });
+  },
+
+  actions: {
+    exportScreenedUrlList: function(subject) {
+      Discourse.ExportCsv.exportScreenedUrlList().then(outputExportResult);
+    }
   }
 });
diff --git a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6 b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
index 76df4a3b60..9d04374931 100644
--- a/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
+++ b/app/assets/javascripts/admin/controllers/admin-logs-staff-action-logs.js.es6
@@ -6,6 +6,8 @@
   @namespace Discourse
   @module Discourse
 **/
+import { outputExportResult } from 'admin/lib/export-result';
+
 export default Ember.ArrayController.extend(Discourse.Presence, {
   loading: false,
   filters: {},
@@ -60,6 +62,10 @@ export default Ember.ArrayController.extend(Discourse.Presence, {
 
     filterBySubject: function(subject) {
       this.set('filters.subject', subject);
+    },
+
+    exportStaffActionLogs: function(subject) {
+      Discourse.ExportCsv.exportStaffActionLogs().then(outputExportResult);
     }
   }
 });
diff --git a/app/assets/javascripts/admin/lib/export-result.js.es6 b/app/assets/javascripts/admin/lib/export-result.js.es6
new file mode 100644
index 0000000000..da1058d564
--- /dev/null
+++ b/app/assets/javascripts/admin/lib/export-result.js.es6
@@ -0,0 +1,7 @@
+export function outputExportResult(result) {
+  if (result.success) {
+    bootbox.alert(I18n.t("admin.export_csv.success"));
+  } else {
+    bootbox.alert(I18n.t("admin.export_csv.failed"));
+  }
+}
diff --git a/app/assets/javascripts/admin/models/admin_user.js b/app/assets/javascripts/admin/models/admin_user.js
index c89b540973..06dd114e47 100644
--- a/app/assets/javascripts/admin/models/admin_user.js
+++ b/app/assets/javascripts/admin/models/admin_user.js
@@ -298,9 +298,7 @@ Discourse.AdminUser = Discourse.User.extend({
     });
   },
 
-  deleteForbidden: function() {
-    return (!this.get('can_be_deleted') || this.get('post_count') > 0);
-  }.property('post_count'),
+  deleteForbidden: Em.computed.not("canBeDeleted"),
 
   deleteExplanation: function() {
     if (this.get('deleteForbidden')) {
@@ -316,9 +314,10 @@ Discourse.AdminUser = Discourse.User.extend({
 
   destroy: function(opts) {
     var user = this;
+    var location = document.location.pathname;
 
     var performDestroy = function(block) {
-      var formData = { context: window.location.pathname };
+      var formData = { context: location };
       if (block) {
         formData["block_email"] = true;
         formData["block_urls"] = true;
@@ -332,7 +331,7 @@ Discourse.AdminUser = Discourse.User.extend({
         data: formData
       }).then(function(data) {
         if (data.deleted) {
-          document.location = "/admin/users/list/active";
+          document.location = location;
         } else {
           bootbox.alert(I18n.t("admin.user.delete_failed"));
           if (data.user) {
diff --git a/app/assets/javascripts/admin/models/export_csv.js b/app/assets/javascripts/admin/models/export_csv.js
index b747cd449b..082ddeb001 100644
--- a/app/assets/javascripts/admin/models/export_csv.js
+++ b/app/assets/javascripts/admin/models/export_csv.js
@@ -15,15 +15,42 @@ Discourse.ExportCsv.reopenClass({
     @method export_user_list
   **/
   exportUserList: function() {
-    return Discourse.ajax("/admin/export_csv/users.json");
+    return Discourse.ajax("/admin/export_csv/export_entity.json", {data: {entity: 'user'}});
   },
 
   /**
-    Exports screened IPs list
+    Exports staff action logs
 
-    @method export_screened_ips_list
+    @method export_staff_action_logs
   **/
-  exportScreenedIpsList: function() {
-    return Discourse.ajax("/admin/export_csv/screened_ips.json");
+  exportStaffActionLogs: function() {
+    return Discourse.ajax("/admin/export_csv/export_entity.json", {data: {entity: 'staff_action'}});
+  },
+
+  /**
+    Exports screened email list
+
+    @method export_screened_email_list
+  **/
+  exportScreenedEmailList: function() {
+    return Discourse.ajax("/admin/export_csv/export_entity.json", {data: {entity: 'screened_email'}});
+  },
+
+  /**
+    Exports screened IP list
+
+    @method export_screened_ip_list
+  **/
+  exportScreenedIpList: function() {
+    return Discourse.ajax("/admin/export_csv/export_entity.json", {data: {entity: 'screened_ip'}});
+  },
+
+  /**
+    Exports screened URL list
+
+    @method export_screened_url_list
+  **/
+  exportScreenedUrlList: function() {
+    return Discourse.ajax("/admin/export_csv/export_entity.json", {data: {entity: 'screened_url'}});
   }
 });
diff --git a/app/assets/javascripts/admin/models/site_setting.js b/app/assets/javascripts/admin/models/site_setting.js
index 2990d908cc..aa43219b49 100644
--- a/app/assets/javascripts/admin/models/site_setting.js
+++ b/app/assets/javascripts/admin/models/site_setting.js
@@ -1,11 +1,3 @@
-/**
-  Our data model for interacting with site settings.
-
-  @class SiteSetting
-  @extends Discourse.Model
-  @namespace Discourse
-  @module Discourse
-**/
 Discourse.SiteSetting = Discourse.Model.extend({
 
   validationMessage: null,
diff --git a/app/assets/javascripts/admin/routes/admin-logs.js.es6 b/app/assets/javascripts/admin/routes/admin-logs.js.es6
deleted file mode 100644
index a16a9f1a6b..0000000000
--- a/app/assets/javascripts/admin/routes/admin-logs.js.es6
+++ /dev/null
@@ -1,15 +0,0 @@
-export default Discourse.Route.extend({
-
-  actions: {
-    exportScreenedIps: function() {
-      Discourse.ExportCsv.exportScreenedIpsList().then(function(result) {
-        if (result.success) {
-          bootbox.alert(I18n.t("admin.export_csv.success"));
-        } else {
-          bootbox.alert(I18n.t("admin.export_csv.failed"));
-        }
-      });
-    }
-  }
-
-});
diff --git a/app/assets/javascripts/admin/routes/admin-users-list.js.es6 b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
new file mode 100644
index 0000000000..bf460971bb
--- /dev/null
+++ b/app/assets/javascripts/admin/routes/admin-users-list.js.es6
@@ -0,0 +1,19 @@
+export default Discourse.Route.extend({
+
+  actions: {
+    exportUsers: function() {
+      Discourse.ExportCsv.exportUserList().then(function(result) {
+        if (result.success) {
+          bootbox.alert(I18n.t("admin.export_csv.success"));
+        } else {
+          bootbox.alert(I18n.t("admin.export_csv.failed"));
+        }
+      });
+    },
+
+    deleteUser: function(user) {
+      Discourse.AdminUser.create(user).destroy({ deletePosts: true });
+    }
+  }
+
+});
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index 09eadbdb7d..27f4ec3010 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -4,24 +4,24 @@
     <div class="full-width">
 
       <ul class="nav nav-pills">
-        <li>{{#link-to 'admin.dashboard'}}{{i18n admin.dashboard.title}}{{/link-to}}</li>
+        <li>{{#link-to 'admin.dashboard'}}{{i18n 'admin.dashboard.title'}}{{/link-to}}</li>
         {{#if currentUser.admin}}
-          <li>{{#link-to 'adminSiteSettings'}}{{i18n admin.site_settings.title}}{{/link-to}}</li>
+          <li>{{#link-to 'adminSiteSettings'}}{{i18n 'admin.site_settings.title'}}{{/link-to}}</li>
         {{/if}}
-        <li>{{#link-to 'adminUsersList.show' 'active'}}{{i18n admin.users.title}}{{/link-to}}</li>
+        <li>{{#link-to 'adminUsersList.show' 'active'}}{{i18n 'admin.users.title'}}{{/link-to}}</li>
         {{#if showBadges}}
-          <li>{{#link-to 'adminBadges.index'}}{{i18n admin.badges.title}}{{/link-to}}</li>
+          <li>{{#link-to 'adminBadges.index'}}{{i18n 'admin.badges.title'}}{{/link-to}}</li>
         {{/if}}
         {{#if currentUser.admin}}
-          <li>{{#link-to 'adminGroups.index'}}{{i18n admin.groups.title}}{{/link-to}}</li>
+          <li>{{#link-to 'adminGroups.index'}}{{i18n 'admin.groups.title'}}{{/link-to}}</li>
         {{/if}}
-        <li>{{#link-to 'adminEmail'}}{{i18n admin.email.title}}{{/link-to}}</li>
-        <li>{{#link-to 'adminFlags'}}{{i18n admin.flags.title}}{{/link-to}}</li>
-        <li>{{#link-to 'adminLogs'}}{{i18n admin.logs.title}}{{/link-to}}</li>
+        <li>{{#link-to 'adminEmail'}}{{i18n 'admin.email.title'}}{{/link-to}}</li>
+        <li>{{#link-to 'adminFlags'}}{{i18n 'admin.flags.title'}}{{/link-to}}</li>
+        <li>{{#link-to 'adminLogs'}}{{i18n 'admin.logs.title'}}{{/link-to}}</li>
         {{#if currentUser.admin}}
-          <li>{{#link-to 'adminCustomize.colors'}}{{i18n admin.customize.title}}{{/link-to}}</li>
-          <li>{{#link-to 'admin.api'}}{{i18n admin.api.title}}{{/link-to}}</li>
-          <li>{{#link-to 'admin.backups'}}{{i18n admin.backups.title}}{{/link-to}}</li>
+          <li>{{#link-to 'adminCustomize.colors'}}{{i18n 'admin.customize.title'}}{{/link-to}}</li>
+          <li>{{#link-to 'admin.api'}}{{i18n 'admin.api.title'}}{{/link-to}}</li>
+          <li>{{#link-to 'admin.backups'}}{{i18n 'admin.backups.title'}}{{/link-to}}</li>
         {{/if}}
       </ul>
 
diff --git a/app/assets/javascripts/admin/templates/api.hbs b/app/assets/javascripts/admin/templates/api.hbs
index 3807e1e681..13267da911 100644
--- a/app/assets/javascripts/admin/templates/api.hbs
+++ b/app/assets/javascripts/admin/templates/api.hbs
@@ -1,8 +1,8 @@
 {{#if model}}
   <table class='api-keys'>
   <tr>
-    <th>{{i18n admin.api.key}}</th>
-    <th>{{i18n admin.api.user}}</th>
+    <th>{{i18n 'admin.api.key'}}</th>
+    <th>{{i18n 'admin.api.user'}}</th>
     <th>&nbsp;</th>
   </tr>
   {{#each model}}
@@ -14,20 +14,20 @@
             {{avatar user imageSize="small"}}
           {{/link-to}}
         {{else}}
-          {{i18n admin.api.all_users}}
+          {{i18n 'admin.api.all_users'}}
         {{/if}}
       </td>
       <td>
-        <button class='btn' {{action "regenerateKey" this}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</button>
-        <button class='btn' {{action "revokeKey" this}}><i class="fa fa-times"></i>{{i18n admin.api.revoke}}</button>
+        <button class='btn' {{action "regenerateKey" this}}><i class="fa fa-undo"></i>{{i18n 'admin.api.regenerate'}}</button>
+        <button class='btn' {{action "revokeKey" this}}><i class="fa fa-times"></i>{{i18n 'admin.api.revoke'}}</button>
       </td>
     </tr>
   {{/each}}
   </table>
 {{else}}
-  <p>{{i18n admin.api.none}}</p>
+  <p>{{i18n 'admin.api.none'}}</p>
 {{/if}}
 
 {{#unless hasMasterKey}}
-  <button class='btn' {{action "generateMasterKey"}}><i class="fa fa-key"></i>{{i18n admin.api.generate_master}}</button>
+  <button class='btn' {{action "generateMasterKey"}}><i class="fa fa-key"></i>{{i18n 'admin.api.generate_master'}}</button>
 {{/unless }}
diff --git a/app/assets/javascripts/admin/templates/backups.hbs b/app/assets/javascripts/admin/templates/backups.hbs
index 3ccbfce80b..e700cff02e 100644
--- a/app/assets/javascripts/admin/templates/backups.hbs
+++ b/app/assets/javascripts/admin/templates/backups.hbs
@@ -1,18 +1,18 @@
 <div class="admin-controls">
   <div class="span15">
     <ul class="nav nav-pills">
-      <li>{{#link-to "admin.backups.index"}}{{i18n admin.backups.menu.backups}}{{/link-to}}</li>
-      <li>{{#link-to "admin.backups.logs"}}{{i18n admin.backups.menu.logs}}{{/link-to}}</li>
+      <li>{{#link-to "admin.backups.index"}}{{i18n 'admin.backups.menu.backups'}}{{/link-to}}</li>
+      <li>{{#link-to "admin.backups.logs"}}{{i18n 'admin.backups.menu.logs'}}{{/link-to}}</li>
     </ul>
   </div>
   <div class="pull-right">
     {{#if canRollback}}
-      <button {{action "rollback"}} class="btn btn-rollback" title="{{i18n admin.backups.operations.rollback.title}}" {{bind-attr disabled="rollbackDisabled"}}><i class="fa fa-ambulance fa-flip-horizontal"></i>{{i18n admin.backups.operations.rollback.text}}</button>
+      <button {{action "rollback"}} class="btn btn-rollback" title="{{i18n 'admin.backups.operations.rollback.title'}}" {{bind-attr disabled="rollbackDisabled"}}><i class="fa fa-ambulance fa-flip-horizontal"></i>{{i18n 'admin.backups.operations.rollback.text'}}</button>
     {{/if}}
     {{#if isOperationRunning}}
-      <button {{action "cancelOperation"}} class="btn btn-danger" title="{{i18n admin.backups.operations.cancel.title}}"><i class="fa fa-times"></i>{{i18n admin.backups.operations.cancel.text}}</button>
+      <button {{action "cancelOperation"}} class="btn btn-danger" title="{{i18n 'admin.backups.operations.cancel.title'}}"><i class="fa fa-times"></i>{{i18n 'admin.backups.operations.cancel.text'}}</button>
     {{else}}
-      <button {{action "startBackup"}} class="btn btn-primary" title="{{i18n admin.backups.operations.backup.title}}"><i class="fa fa-rocket"></i>{{i18n admin.backups.operations.backup.text}}</button>
+      <button {{action "startBackup"}} class="btn btn-primary" title="{{i18n 'admin.backups.operations.backup.title'}}"><i class="fa fa-rocket"></i>{{i18n 'admin.backups.operations.backup.text'}}</button>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups_index.hbs
index 486bf3027c..bfbedd1be2 100644
--- a/app/assets/javascripts/admin/templates/backups_index.hbs
+++ b/app/assets/javascripts/admin/templates/backups_index.hbs
@@ -1,7 +1,7 @@
 <table>
   <tr>
-    <th width="55%">{{i18n admin.backups.columns.filename}}</th>
-    <th width="10%">{{i18n admin.backups.columns.size}}</th>
+    <th width="55%">{{i18n 'admin.backups.columns.filename'}}</th>
+    <th width="10%">{{i18n 'admin.backups.columns.size'}}</th>
     <th>
       <div class="pull-right">
         {{resumable-upload target="/admin/backups/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}}
@@ -15,15 +15,15 @@
       <td>{{human-size backup.size}}</td>
       <td>
         <div class="pull-right">
-          <a {{bind-attr href="backup.link"}} class="btn download" title="{{i18n admin.backups.operations.download.title}}"><i class="fa fa-download"></i>{{i18n admin.backups.operations.download.text}}</a>
+          <a {{bind-attr href="backup.link"}} class="btn download" title="{{i18n 'admin.backups.operations.download.title'}}"><i class="fa fa-download"></i>{{i18n 'admin.backups.operations.download.text'}}</a>
           <button {{action "destroyBackup" backup}} class="btn btn-danger no-text" {{bind-attr disabled="destroyDisabled" title="destroyTitle"}}><i class="fa fa-trash-o"></i></button>
-          <button {{action "startRestore" backup}} class="btn" {{bind-attr disabled="restoreDisabled" title="restoreTitle"}}><i class="fa fa-play"></i>{{i18n admin.backups.operations.restore.text}}</button>
+          <button {{action "startRestore" backup}} class="btn" {{bind-attr disabled="restoreDisabled" title="restoreTitle"}}><i class="fa fa-play"></i>{{i18n 'admin.backups.operations.restore.text'}}</button>
         </div>
       </td>
     </tr>
   {{else}}
     <tr>
-      <td>{{i18n admin.backups.none}}</td>
+      <td>{{i18n 'admin.backups.none'}}</td>
       <td></td>
       <td></td>
     </tr>
diff --git a/app/assets/javascripts/admin/templates/badges-index.hbs b/app/assets/javascripts/admin/templates/badges-index.hbs
index 5bb47c2170..fcb54478d8 100644
--- a/app/assets/javascripts/admin/templates/badges-index.hbs
+++ b/app/assets/javascripts/admin/templates/badges-index.hbs
@@ -1,9 +1,9 @@
 <div class='span13'>
-  <p>{{i18n admin.badges.none_selected}}</p>
+  <p>{{i18n 'admin.badges.none_selected'}}</p>
 
   <div>
     {{#link-to 'adminBadges.show' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n admin.badges.new}}
+      {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
     {{/link-to}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/badges-show.hbs b/app/assets/javascripts/admin/templates/badges-show.hbs
index e12957320d..79b2589ff9 100644
--- a/app/assets/javascripts/admin/templates/badges-show.hbs
+++ b/app/assets/javascripts/admin/templates/badges-show.hbs
@@ -1,31 +1,31 @@
 <div class='current-badge span13'>
   <form class="form-horizontal">
     <div>
-      <label for="name">{{i18n admin.badges.name}}</label>
+      <label for="name">{{i18n 'admin.badges.name'}}</label>
       {{input type="text" name="name" value=buffered.name}}
     </div>
 
     {{#if showDisplayName}}
       <div>
-        <strong>{{i18n admin.badges.display_name}}</strong>
+        <strong>{{i18n 'admin.badges.display_name'}}</strong>
         {{buffered.displayName}}
       </div>
     {{/if}}
 
     <div>
-      <label for="name">{{i18n admin.badges.icon}}</label>
+      <label for="name">{{i18n 'admin.badges.icon'}}</label>
       {{input type="text" name="name" value=buffered.icon}}
-      <p class='help'>{{i18n admin.badges.icon_help}}</p>
+      <p class='help'>{{i18n 'admin.badges.icon_help'}}</p>
     </div>
 
     <div>
-      <label for="name">{{i18n admin.badges.image}}</label>
+      <label for="name">{{i18n 'admin.badges.image'}}</label>
       {{input type="text" name="name" value=buffered.image}}
-      <p class='help'>{{i18n admin.badges.icon_help}}</p>
+      <p class='help'>{{i18n 'admin.badges.icon_help'}}</p>
     </div>
 
     <div>
-      <label for="badge_type_id">{{i18n admin.badges.badge_type}}</label>
+      <label for="badge_type_id">{{i18n 'admin.badges.badge_type'}}</label>
       {{view Ember.Select name="badge_type_id"
                           value=buffered.badge_type_id
                           content=badgeTypes
@@ -35,7 +35,7 @@
     </div>
 
     <div>
-      <label for="badge_grouping_id">{{i18n admin.badges.badge_grouping}}</label>
+      <label for="badge_grouping_id">{{i18n 'admin.badges.badge_grouping'}}</label>
       {{view Ember.Select name="badge_grouping_id"
                           value=buffered.badge_grouping_id
                           content=badgeGroupings
@@ -46,7 +46,7 @@
 
 
     <div>
-      <label for="description">{{i18n admin.badges.description}}</label>
+      <label for="description">{{i18n 'admin.badges.description'}}</label>
       {{#if canEditDescription}}
         {{textarea name="description" value=buffered.description}}
       {{else}}
@@ -55,34 +55,34 @@
     </div>
 
     <div>
-      <label for="query">{{i18n admin.badges.query}}</label>
+      <label for="query">{{i18n 'admin.badges.query'}}</label>
       {{textarea name="query" value=buffered.query disabled=readOnly}}
     </div>
 
     {{#if hasQuery}}
-      <a href {{action "preview" buffered "false"}}>{{i18n admin.badges.preview.link_text}}</a>
+      <a href {{action "preview" buffered "false"}}>{{i18n 'admin.badges.preview.link_text'}}</a>
       |
-      <a href {{action "preview" buffered "true"}}>{{i18n admin.badges.preview.plan_text}}</a>
+      <a href {{action "preview" buffered "true"}}>{{i18n 'admin.badges.preview.plan_text'}}</a>
       {{#if preview_loading}}
-        {{i18n loading}}...
+        {{i18n 'loading'}}...
       {{/if}}
 
       <div>
         <label>
           {{input type="checkbox" checked=buffered.auto_revoke disabled=readOnly}}
-          {{i18n admin.badges.auto_revoke}}
+          {{i18n 'admin.badges.auto_revoke'}}
         </label>
       </div>
 
       <div>
         <label>
           {{input type="checkbox" checked=buffered.target_posts disabled=readOnly}}
-          {{i18n admin.badges.target_posts}}
+          {{i18n 'admin.badges.target_posts'}}
         </label>
       </div>
 
       <div>
-        <label for="trigger">{{i18n admin.badges.trigger}}</label>
+        <label for="trigger">{{i18n 'admin.badges.trigger'}}</label>
         {{view Ember.Select name="trigger"
                             value=buffered.trigger
                             content=badgeTriggers
@@ -95,43 +95,43 @@
     <div>
       <label>
         {{input type="checkbox" checked=buffered.allow_title}}
-        {{i18n admin.badges.allow_title}}
+        {{i18n 'admin.badges.allow_title'}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.multiple_grant disabled=readOnly}}
-        {{i18n admin.badges.multiple_grant}}
+        {{i18n 'admin.badges.multiple_grant'}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.listable disabled=readOnly}}
-        {{i18n admin.badges.listable}}
+        {{i18n 'admin.badges.listable'}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.show_posts disabled=readOnly}}
-        {{i18n admin.badges.show_posts}}
+        {{i18n 'admin.badges.show_posts'}}
       </label>
     </div>
 
     <div>
       <label>
         {{input type="checkbox" checked=buffered.enabled}}
-        {{i18n admin.badges.enabled}}
+        {{i18n 'admin.badges.enabled'}}
       </label>
     </div>
 
     <div class='buttons'>
-      <button {{action "save"}} {{bind-attr disabled=saving}} class='btn btn-primary'>{{i18n admin.badges.save}}</button>
+      <button {{action "save"}} {{bind-attr disabled=saving}} class='btn btn-primary'>{{i18n 'admin.badges.save'}}</button>
       <span class='saving'>{{savingStatus}}</span>
       {{#unless readOnly}}
-        <a {{action "destroy"}} class='delete-link'>{{i18n admin.badges.delete}}</a>
+        <a {{action "destroy"}} class='delete-link'>{{i18n 'admin.badges.delete'}}</a>
       {{/unless}}
     </div>
   </form>
@@ -140,7 +140,7 @@
 {{#if grant_count}}
   <div class="span13 current-badge-actions">
     <div>
-      {{#link-to 'badges.show' this}}{{i18n badges.granted count=grant_count}}{{/link-to}}
+      {{#link-to 'badges.show' this}}{{i18n 'badges.granted' count=grant_count}}{{/link-to}}
     </div>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/badges.hbs b/app/assets/javascripts/admin/templates/badges.hbs
index fe2d7ce80a..efee80a608 100644
--- a/app/assets/javascripts/admin/templates/badges.hbs
+++ b/app/assets/javascripts/admin/templates/badges.hbs
@@ -1,21 +1,21 @@
 <div class="badges">
 
   <div class='content-list span6'>
-    <h3>{{i18n admin.badges.title}}</h3>
+    <h3>{{i18n 'admin.badges.title'}}</h3>
     <ul>
       {{#each}}
       <li>
         {{#link-to 'adminBadges.show' id}}
           {{badge-button badge=this}}
           {{#if newBadge}}
-            <span class="list-badge">{{i18n filters.new.lower_title}}</span>
+            <span class="list-badge">{{i18n 'filters.new.lower_title'}}</span>
           {{/if}}
         {{/link-to}}
       </li>
       {{/each}}
     </ul>
     {{#link-to 'adminBadges.show' 'new' class="btn"}}
-      {{fa-icon "plus"}} {{i18n admin.badges.new}}
+      {{fa-icon "plus"}} {{i18n 'admin.badges.new'}}
     {{/link-to}}
     <br>
     <br>
diff --git a/app/assets/javascripts/admin/templates/customize.hbs b/app/assets/javascripts/admin/templates/customize.hbs
index 8ac29110e1..6b0c1214b4 100644
--- a/app/assets/javascripts/admin/templates/customize.hbs
+++ b/app/assets/javascripts/admin/templates/customize.hbs
@@ -1,10 +1,10 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminCustomize.colors'}}{{i18n admin.customize.colors.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminCustomize.css_html'}}{{i18n admin.customize.css_html.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminSiteText'}}{{i18n admin.site_text.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUserFields'}}{{i18n admin.user_fields.title}}{{/link-to}}</li>
+      <li>{{#link-to 'adminCustomize.colors'}}{{i18n 'admin.customize.colors.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminCustomize.css_html'}}{{i18n 'admin.customize.css_html.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminSiteText'}}{{i18n 'admin.site_text.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUserFields'}}{{i18n 'admin.user_fields.title'}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/customize_colors.hbs b/app/assets/javascripts/admin/templates/customize_colors.hbs
index 2f35d97e37..c82b5cd9a6 100644
--- a/app/assets/javascripts/admin/templates/customize_colors.hbs
+++ b/app/assets/javascripts/admin/templates/customize_colors.hbs
@@ -1,5 +1,5 @@
 <div class='content-list span6'>
-  <h3>{{i18n admin.customize.colors.long_title}}</h3>
+  <h3>{{i18n 'admin.customize.colors.long_title'}}</h3>
   <ul>
     {{#each model}}
       {{#unless is_base}}
@@ -7,7 +7,7 @@
       {{/unless}}
     {{/each}}
   </ul>
-  <button {{action "newColorScheme"}} class='btn'><i class="fa fa-plus"></i>{{i18n admin.customize.new}}</button>
+  <button {{action "newColorScheme"}} class='btn'><i class="fa fa-plus"></i>{{i18n 'admin.customize.new'}}</button>
 </div>
 
 {{#if selectedItem}}
@@ -17,16 +17,16 @@
         <h1>{{text-field class="style-name" value=name}}</h1>
 
         <div class="controls">
-          <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+          <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n 'admin.customize.save'}}</button>
           <button {{action "toggleEnabled"}} {{bind-attr disabled="disableEnable"}} class="btn">
             {{#if enabled}}
-              {{i18n disable}}
+              {{i18n 'disable'}}
             {{else}}
-              {{i18n enable}}
+              {{i18n 'enable'}}
             {{/if}}
           </button>
-          <button {{action "copy" this}} class='btn'><i class="fa fa-copy"></i> {{i18n admin.customize.copy}}</button>
-          <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n admin.customize.delete}}</button>
+          <button {{action "copy" this}} class='btn'><i class="fa fa-copy"></i> {{i18n 'admin.customize.copy'}}</button>
+          <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i> {{i18n 'admin.customize.delete'}}</button>
           <span {{bind-attr class=":saving savingStatus::hidden" }}>{{savingStatus}}</span>
         </div>
       {{/with}}
@@ -37,7 +37,7 @@
         <div class='search controls'>
           <label>
             {{input type="checkbox" checked=onlyOverridden}}
-            {{i18n admin.site_settings.show_overriden}}
+            {{i18n 'admin.site_settings.show_overriden'}}
           </label>
         </div>
       </div>
@@ -47,7 +47,7 @@
         <thead>
           <tr>
             <th></th>
-            <th class="hex">{{i18n admin.customize.color}}</th>
+            <th class="hex">{{i18n 'admin.customize.color'}}</th>
             <th></th>
           </tr>
         </thead>
@@ -61,20 +61,20 @@
               </td>
               <td class="hex">{{color-input hexValue=hex brightnessValue=brightness valid=valid}}</td>
               <td class="actions">
-                <button {{bind-attr class=":btn :revert savedIsOverriden::invisible"}} {{action "revert" this}} title="{{i18n admin.customize.colors.revert_title}}">{{i18n revert}}</button>
-                <button {{bind-attr class=":btn :undo changed::invisible"}} {{action "undo" this}} title="{{i18n admin.customize.colors.undo_title}}">{{i18n undo}}</button>
+                <button {{bind-attr class=":btn :revert savedIsOverriden::invisible"}} {{action "revert" this}} title="{{i18n 'admin.customize.colors.revert_title'}}">{{i18n 'revert'}}</button>
+                <button {{bind-attr class=":btn :undo changed::invisible"}} {{action "undo" this}} title="{{i18n 'admin.customize.colors.undo_title'}}">{{i18n 'undo'}}</button>
               </td>
             </tr>
           {{/each}}
         </tbody>
       </table>
       {{else}}
-        <p>{{i18n search.no_results}}</p>
+        <p>{{i18n 'search.no_results'}}</p>
       {{/if}}
     </div>
   </div>
 {{else}}
-  <p class="about">{{i18n admin.customize.colors.about}}</p>
+  <p class="about">{{i18n 'admin.customize.colors.about'}}</p>
 {{/if}}
 
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/customize_css_html.hbs b/app/assets/javascripts/admin/templates/customize_css_html.hbs
index 57bccda499..28c1b8cce1 100644
--- a/app/assets/javascripts/admin/templates/customize_css_html.hbs
+++ b/app/assets/javascripts/admin/templates/customize_css_html.hbs
@@ -1,12 +1,12 @@
 <div class='content-list span6'>
-  <h3>{{i18n admin.customize.css_html.long_title}}</h3>
+  <h3>{{i18n 'admin.customize.css_html.long_title'}}</h3>
   <ul>
     {{#each model}}
       <li><a {{action "selectStyle" this}} {{bind-attr class="this.selected:active"}}>{{this.description}}</a></li>
     {{/each}}
   </ul>
   <button {{action "newCustomization"}} class='btn'>
-    {{fa-icon "plus"}}{{i18n admin.customize.new}}
+    {{fa-icon "plus"}}{{i18n 'admin.customize.new'}}
   </button>
 </div>
 
@@ -17,12 +17,12 @@
 
       <div class='admin-controls'>
         <ul class="nav nav-pills">
-          <li><a {{bind-attr class="view.stylesheetActive:active"}} {{action "selectStylesheet" target="view"}}>{{i18n admin.customize.css}}</a></li>
-          <li><a {{bind-attr class="view.headerActive:active"}} {{action "selectHeader" target="view"}}>{{i18n admin.customize.header}}</a></li>
-          <li><a {{bind-attr class="view.footerActive:active"}} {{action "selectFooter" target="view"}}>{{i18n admin.customize.footer}}</a></li>
-          <li><a {{bind-attr class="view.mobileStylesheetActive:active"}} {{action "selectMobileStylesheet" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n admin.customize.css}}</a></li>
-          <li><a {{bind-attr class="view.mobileHeaderActive:active"}} {{action "selectMobileHeader" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n admin.customize.header}}</a></li>
-          <li><a {{bind-attr class="view.mobileFooterActive:active"}} {{action "selectMobileFooter" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n admin.customize.footer}}</a></li>
+          <li><a {{bind-attr class="view.stylesheetActive:active"}} {{action "selectStylesheet" target="view"}}>{{i18n 'admin.customize.css'}}</a></li>
+          <li><a {{bind-attr class="view.headerActive:active"}} {{action "selectHeader" target="view"}}>{{i18n 'admin.customize.header'}}</a></li>
+          <li><a {{bind-attr class="view.footerActive:active"}} {{action "selectFooter" target="view"}}>{{i18n 'admin.customize.footer'}}</a></li>
+          <li><a {{bind-attr class="view.mobileStylesheetActive:active"}} {{action "selectMobileStylesheet" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.css'}}</a></li>
+          <li><a {{bind-attr class="view.mobileHeaderActive:active"}} {{action "selectMobileHeader" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.header'}}</a></li>
+          <li><a {{bind-attr class="view.mobileFooterActive:active"}} {{action "selectMobileFooter" target="view"}}>{{fa-icon "mobile"}}&nbsp;{{i18n 'admin.customize.footer'}}</a></li>
         </ul>
       </div>
 
@@ -37,23 +37,23 @@
     {{/with}}
     <br>
     <div class='status-actions'>
-      <span>{{i18n admin.customize.override_default}} {{view Ember.Checkbox checkedBinding="selectedItem.override_default_style"}}</span>
-      <span>{{i18n admin.customize.enabled}}  {{view Ember.Checkbox checkedBinding="selectedItem.enabled"}}</span>
+      <span>{{i18n 'admin.customize.override_default'}} {{view Ember.Checkbox checkedBinding="selectedItem.override_default_style"}}</span>
+      <span>{{i18n 'admin.customize.enabled'}}  {{view Ember.Checkbox checkedBinding="selectedItem.enabled"}}</span>
       {{#unless selectedItem.changed}}
-      <a class='preview-link' {{bind-attr href="selectedItem.previewUrl"}} target='_blank' title="{{i18n admin.customize.explain_preview}}">{{i18n admin.customize.preview}}</a>
+      <a class='preview-link' {{bind-attr href="selectedItem.previewUrl"}} target='_blank' title="{{i18n 'admin.customize.explain_preview'}}">{{i18n 'admin.customize.preview'}}</a>
       |
-      <a href="/?preview-style=" target='_blank' title="{{i18n admin.customize.explain_undo_preview}}">{{i18n admin.customize.undo_preview}}</a>
+      <a href="/?preview-style=" target='_blank' title="{{i18n 'admin.customize.explain_undo_preview'}}">{{i18n 'admin.customize.undo_preview'}}</a>
       |
-      <a href="/?preview-style=default" target='_blank' title="{{i18n admin.customize.explain_rescue_preview}}">{{i18n admin.customize.rescue_preview}}</a><br>
+      <a href="/?preview-style=default" target='_blank' title="{{i18n 'admin.customize.explain_rescue_preview'}}">{{i18n 'admin.customize.rescue_preview'}}</a><br>
       {{/unless}}
     </div>
 
     <div class='buttons'>
-      <button {{action "save"}} {{bind-attr disabled="selectedItem.disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+      <button {{action "save"}} {{bind-attr disabled="selectedItem.disableSave"}} class='btn'>{{i18n 'admin.customize.save'}}</button>
       <span class='saving'>{{selectedItem.savingStatus}}</span>
-      <a {{action "destroy"}} class='delete-link'>{{i18n admin.customize.delete}}</a>
+      <a {{action "destroy"}} class='delete-link'>{{i18n 'admin.customize.delete'}}</a>
     </div>
   </div>
 {{else}}
-  <p class="about">{{i18n admin.customize.about}}</p>
+  <p class="about">{{i18n 'admin.customize.about'}}</p>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs
index 97d0390ded..4438803dc3 100644
--- a/app/assets/javascripts/admin/templates/dashboard.hbs
+++ b/app/assets/javascripts/admin/templates/dashboard.hbs
@@ -24,15 +24,15 @@
   <div class="dashboard-stats totals">
     <table>
       <tr>
-        <td class="title"><i class='fa fa-shield'></i> {{i18n admin.dashboard.admins}}</td>
+        <td class="title"><i class='fa fa-shield'></i> {{i18n 'admin.dashboard.admins'}}</td>
         <td class="value">{{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}}</td>
-        <td class="title"><i class='fa fa-ban'></i> {{i18n admin.dashboard.suspended}}</td>
+        <td class="title"><i class='fa fa-ban'></i> {{i18n 'admin.dashboard.suspended'}}</td>
         <td class="value">{{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}</td>
       </tr>
       <tr>
-        <td class="title"><i class='fa fa-shield'></i> {{i18n admin.dashboard.moderators}}</td>
+        <td class="title"><i class='fa fa-shield'></i> {{i18n 'admin.dashboard.moderators'}}</td>
         <td class="value">{{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}}</td>
-        <td class="title"><i class='fa fa-ban'></i> {{i18n admin.dashboard.blocked}}</td>
+        <td class="title"><i class='fa fa-ban'></i> {{i18n 'admin.dashboard.blocked'}}</td>
         <td class="value">{{#link-to 'adminUsersList.show' 'blocked'}}{{blocked}}{{/link-to}}</td>
       </tr>
     </table>
@@ -43,11 +43,11 @@
       <thead>
         <tr>
           <th>&nbsp;</th>
-          <th>{{i18n admin.dashboard.reports.today}}</th>
-          <th>{{i18n admin.dashboard.reports.yesterday}}</th>
-          <th>{{i18n admin.dashboard.reports.last_7_days}}</th>
-          <th>{{i18n admin.dashboard.reports.last_30_days}}</th>
-          <th>{{i18n admin.dashboard.reports.all}}</th>
+          <th>{{i18n 'admin.dashboard.reports.today'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.last_30_days'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.all'}}</th>
         </tr>
       </thead>
       {{#unless loading}}
@@ -67,12 +67,12 @@
     <table class="table table-condensed table-hover">
       <thead>
         <tr>
-          <th class="title" title="{{i18n admin.dashboard.private_messages_title}}"><i class="fa fa-envelope"></i> {{i18n admin.dashboard.private_messages_short}}</th>
-          <th>{{i18n admin.dashboard.reports.today}}</th>
-          <th>{{i18n admin.dashboard.reports.yesterday}}</th>
-          <th>{{i18n admin.dashboard.reports.last_7_days}}</th>
-          <th>{{i18n admin.dashboard.reports.last_30_days}}</th>
-          <th>{{i18n admin.dashboard.reports.all}}</th>
+          <th class="title" title="{{i18n 'admin.dashboard.private_messages_title'}}"><i class="fa fa-envelope"></i> {{i18n 'admin.dashboard.private_messages_short'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.today'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.last_7_days'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.last_30_days'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.all'}}</th>
         </tr>
       </thead>
       {{#unless loading}}
@@ -90,10 +90,10 @@
       <thead>
         <tr>
           <th>&nbsp;</th>
-          <th>{{i18n admin.dashboard.reports.today}}</th>
-          <th>{{i18n admin.dashboard.reports.yesterday}}</th>
-          <th>{{i18n admin.dashboard.reports.7_days_ago}}</th>
-          <th>{{i18n admin.dashboard.reports.30_days_ago}}</th>
+          <th>{{i18n 'admin.dashboard.reports.today'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.yesterday'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.7_days_ago'}}</th>
+          <th>{{i18n 'admin.dashboard.reports.30_days_ago'}}</th>
         </tr>
       </thead>
       {{#unless loading}}
@@ -110,7 +110,7 @@
       <div class="look-here"><i class="fa fa-exclamation-triangle"></i></div>
       <div class="problem-messages">
         <p {{bind-attr class="loadingProblems:invisible"}}>
-          {{i18n admin.dashboard.problems_found}}
+          {{i18n 'admin.dashboard.problems_found'}}
           <ul {{bind-attr class="loadingProblems:invisible"}}>
             {{#each problem in problems}}
               <li>{{{problem}}}</li>
@@ -118,8 +118,8 @@
           </ul>
         </p>
         <p class="actions">
-          <small>{{i18n admin.dashboard.last_checked}}: {{problemsTimestamp}}</small>
-          <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+          <small>{{i18n 'admin.dashboard.last_checked'}}: {{problemsTimestamp}}</small>
+          <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n 'admin.dashboard.refresh_problems'}}</button>
         </p>
       </div>
       <div class="clearfix"></div>
@@ -130,8 +130,8 @@
         <div class="look-here">&nbsp;</div>
         <div class="problem-messages">
           <p>
-            {{i18n admin.dashboard.no_problems}}
-            <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n admin.dashboard.refresh_problems}}</button>
+            {{i18n 'admin.dashboard.no_problems'}}
+            <button {{action "refreshProblems"}} class="btn btn-small"><i class="fa fa-refresh"></i>{{i18n 'admin.dashboard.refresh_problems'}}</button>
           </p>
         </div>
         <div class="clearfix"></div>
@@ -143,7 +143,7 @@
     <table class="table table-condensed table-hover">
       <thead>
         <tr>
-          <th class="title">{{top_referred_topics.title}} ({{i18n admin.dashboard.reports.last_30_days}})</th>
+          <th class="title">{{top_referred_topics.title}} ({{i18n 'admin.dashboard.reports.last_30_days'}})</th>
           <th>{{top_referred_topics.ytitles.num_clicks}}</th>
         </tr>
       </thead>
@@ -170,7 +170,7 @@
     <table class="table table-condensed table-hover">
       <thead>
         <tr>
-          <th class="title">{{top_traffic_sources.title}} ({{i18n admin.dashboard.reports.last_30_days}})</th>
+          <th class="title">{{top_traffic_sources.title}} ({{i18n 'admin.dashboard.reports.last_30_days'}})</th>
           <th>{{top_traffic_sources.ytitles.num_clicks}}</th>
           <th>{{top_traffic_sources.ytitles.num_topics}}</th>
         </tr>
@@ -193,7 +193,7 @@
     <table class="table table-condensed table-hover">
       <thead>
         <tr>
-          <th class="title">{{top_referrers.title}} ({{i18n admin.dashboard.reports.last_30_days}})</th>
+          <th class="title">{{top_referrers.title}} ({{i18n 'admin.dashboard.reports.last_30_days'}})</th>
           <th>{{top_referrers.ytitles.num_clicks}}</th>
           <th>{{top_referrers.ytitles.num_topics}}</th>
         </tr>
@@ -215,7 +215,7 @@
 <div class='clearfix'></div>
 
 <div class="dashboard-stats pull-right">
-  <div class="pull-right">{{i18n admin.dashboard.last_updated}} {{updatedTimestamp}}</div>
+  <div class="pull-right">{{i18n 'admin.dashboard.last_updated'}} {{updatedTimestamp}}</div>
   <div class='clearfix'></div>
 </div>
 <div class='clearfix'></div>
diff --git a/app/assets/javascripts/admin/templates/email.hbs b/app/assets/javascripts/admin/templates/email.hbs
index 14ee7296f1..40057afbe2 100644
--- a/app/assets/javascripts/admin/templates/email.hbs
+++ b/app/assets/javascripts/admin/templates/email.hbs
@@ -1,11 +1,11 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminEmail.index'}}{{i18n admin.email.settings}}{{/link-to}}</li>
-      <li>{{#link-to 'adminEmail.all'}}{{i18n admin.email.all}}{{/link-to}}</li>
-      <li>{{#link-to 'adminEmail.sent'}}{{i18n admin.email.sent}}{{/link-to}}</li>
-      <li>{{#link-to 'adminEmail.skipped'}}{{i18n admin.email.skipped}}{{/link-to}}</li>
-      <li>{{#link-to 'adminEmail.previewDigest'}}{{i18n admin.email.preview_digest}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.index'}}{{i18n 'admin.email.settings'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.all'}}{{i18n 'admin.email.all'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.sent'}}{{i18n 'admin.email.sent'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.skipped'}}{{i18n 'admin.email.skipped'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminEmail.previewDigest'}}{{i18n 'admin.email.preview_digest'}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/email_all.hbs b/app/assets/javascripts/admin/templates/email_all.hbs
index 702499c6b4..505d152e14 100644
--- a/app/assets/javascripts/admin/templates/email_all.hbs
+++ b/app/assets/javascripts/admin/templates/email_all.hbs
@@ -1,16 +1,16 @@
 <table class='table'>
   <thead>
     <tr>
-      <th>{{i18n admin.email.time}}</th>
-      <th>{{i18n admin.email.user}}</th>
-      <th>{{i18n admin.email.to_address}}</th>
-      <th>{{i18n admin.email.email_type}}</th>
-      <th>{{i18n admin.email.skipped_reason}}</th>
+      <th>{{i18n 'admin.email.time'}}</th>
+      <th>{{i18n 'admin.email.user'}}</th>
+      <th>{{i18n 'admin.email.to_address'}}</th>
+      <th>{{i18n 'admin.email.email_type'}}</th>
+      <th>{{i18n 'admin.email.skipped_reason'}}</th>
     </tr>
   </thead>
 
   <tr class="filters">
-    <td>{{i18n admin.email.logs.filters.title}}</td>
+    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
     <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
     <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
     <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -33,7 +33,7 @@
       <td>{{skipped_reason}}</td>
     </tr>
   {{else}}
-    <tr><td colspan="5">{{i18n admin.email.logs.none}}</td></tr>
+    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
   {{/each}}
 
 </table>
diff --git a/app/assets/javascripts/admin/templates/email_index.hbs b/app/assets/javascripts/admin/templates/email_index.hbs
index 461435534c..89efb036ae 100644
--- a/app/assets/javascripts/admin/templates/email_index.hbs
+++ b/app/assets/javascripts/admin/templates/email_index.hbs
@@ -1,6 +1,6 @@
 <table class="table">
   <tr>
-    <th>{{i18n admin.email.delivery_method}}</th>
+    <th>{{i18n 'admin.email.delivery_method'}}</th>
     <td>{{model.delivery_method}}</td>
   </tr>
 
@@ -14,14 +14,14 @@
 
 <div class='admin-controls'>
   {{#if sendingEmail}}
-  <div class='span15 controls'>{{i18n admin.email.sending_test}}</div>
+  <div class='span15 controls'>{{i18n 'admin.email.sending_test'}}</div>
   {{else}}
   <div class='controls'>
     {{text-field value=testEmailAddress placeholderKey="admin.email.test_email_address"}}
   </div>
   <div class='span10 controls'>
-    <button class='btn btn-primary' {{action "sendTestEmail"}} {{bind-attr disabled="sendTestEmailDisabled"}}>{{i18n admin.email.send_test}}</button>
-    {{#if sentTestEmail}}<span class='result-message'>{{i18n admin.email.sent_test}}</span>{{/if}}
+    <button class='btn btn-primary' {{action "sendTestEmail"}} {{bind-attr disabled="sendTestEmailDisabled"}}>{{i18n 'admin.email.send_test'}}</button>
+    {{#if sentTestEmail}}<span class='result-message'>{{i18n 'admin.email.sent_test'}}</span>{{/if}}
   </div>
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/email_preview_digest.hbs b/app/assets/javascripts/admin/templates/email_preview_digest.hbs
index b9119e5ead..d5f3f932b2 100644
--- a/app/assets/javascripts/admin/templates/email_preview_digest.hbs
+++ b/app/assets/javascripts/admin/templates/email_preview_digest.hbs
@@ -1,19 +1,19 @@
-<p>{{i18n admin.email.preview_digest_desc}}</p>
+<p>{{i18n 'admin.email.preview_digest_desc'}}</p>
 
 <div class='admin-controls'>
   <div class='span7 controls'>
-    <label for='last-seen'>{{i18n admin.email.last_seen_user}}</label>
+    <label for='last-seen'>{{i18n 'admin.email.last_seen_user'}}</label>
     {{input type="date" value=lastSeen id="last-seen"}}
   </div>
   <div>
-    <button class='btn' {{action "refresh"}}>{{i18n admin.email.refresh}}</button>
+    <button class='btn' {{action "refresh"}}>{{i18n 'admin.email.refresh'}}</button>
   </div>
   <div class="span7 toggle">
-    <label>{{i18n admin.email.format}}</label>
+    <label>{{i18n 'admin.email.format'}}</label>
     {{#if showHtml}}
-      <span>{{i18n admin.email.html}}</span> | <a href='#' {{action "toggleShowHtml"}}>{{i18n admin.email.text}}</a>
+      <span>{{i18n 'admin.email.html'}}</span> | <a href='#' {{action "toggleShowHtml"}}>{{i18n 'admin.email.text'}}</a>
     {{else}}
-      <a href='#' {{action "toggleShowHtml"}}>{{i18n admin.email.html}}</a> | <span>{{i18n admin.email.text}}</span>
+      <a href='#' {{action "toggleShowHtml"}}>{{i18n 'admin.email.html'}}</a> | <span>{{i18n 'admin.email.text'}}</span>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/email_sent.hbs b/app/assets/javascripts/admin/templates/email_sent.hbs
index f3c2cc436b..6c61a7799e 100644
--- a/app/assets/javascripts/admin/templates/email_sent.hbs
+++ b/app/assets/javascripts/admin/templates/email_sent.hbs
@@ -1,16 +1,16 @@
 <table class='table'>
   <thead>
     <tr>
-      <th>{{i18n admin.email.sent_at}}</th>
-      <th>{{i18n admin.email.user}}</th>
-      <th>{{i18n admin.email.to_address}}</th>
-      <th>{{i18n admin.email.email_type}}</th>
-      <th>{{i18n admin.email.reply_key}}</th>
+      <th>{{i18n 'admin.email.sent_at'}}</th>
+      <th>{{i18n 'admin.email.user'}}</th>
+      <th>{{i18n 'admin.email.to_address'}}</th>
+      <th>{{i18n 'admin.email.email_type'}}</th>
+      <th>{{i18n 'admin.email.reply_key'}}</th>
     </tr>
   </thead>
 
   <tr class="filters">
-    <td>{{i18n admin.email.logs.filters.title}}</td>
+    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
     <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
     <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
     <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -33,7 +33,7 @@
       <td>{{reply_key}}</td>
     </tr>
   {{else}}
-    <tr><td colspan="5">{{i18n admin.email.logs.none}}</td></tr>
+    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
   {{/each}}
 
 </table>
diff --git a/app/assets/javascripts/admin/templates/email_skipped.hbs b/app/assets/javascripts/admin/templates/email_skipped.hbs
index 702499c6b4..505d152e14 100644
--- a/app/assets/javascripts/admin/templates/email_skipped.hbs
+++ b/app/assets/javascripts/admin/templates/email_skipped.hbs
@@ -1,16 +1,16 @@
 <table class='table'>
   <thead>
     <tr>
-      <th>{{i18n admin.email.time}}</th>
-      <th>{{i18n admin.email.user}}</th>
-      <th>{{i18n admin.email.to_address}}</th>
-      <th>{{i18n admin.email.email_type}}</th>
-      <th>{{i18n admin.email.skipped_reason}}</th>
+      <th>{{i18n 'admin.email.time'}}</th>
+      <th>{{i18n 'admin.email.user'}}</th>
+      <th>{{i18n 'admin.email.to_address'}}</th>
+      <th>{{i18n 'admin.email.email_type'}}</th>
+      <th>{{i18n 'admin.email.skipped_reason'}}</th>
     </tr>
   </thead>
 
   <tr class="filters">
-    <td>{{i18n admin.email.logs.filters.title}}</td>
+    <td>{{i18n 'admin.email.logs.filters.title'}}</td>
     <td>{{text-field value=filter.user placeholderKey="admin.email.logs.filters.user_placeholder"}}</td>
     <td>{{text-field value=filter.address placeholderKey="admin.email.logs.filters.address_placeholder"}}</td>
     <td>{{text-field value=filter.type placeholderKey="admin.email.logs.filters.type_placeholder"}}</td>
@@ -33,7 +33,7 @@
       <td>{{skipped_reason}}</td>
     </tr>
   {{else}}
-    <tr><td colspan="5">{{i18n admin.email.logs.none}}</td></tr>
+    <tr><td colspan="5">{{i18n 'admin.email.logs.none'}}</td></tr>
   {{/each}}
 
 </table>
diff --git a/app/assets/javascripts/admin/templates/flags-list.hbs b/app/assets/javascripts/admin/templates/flags-list.hbs
index 3afa757d08..e6079d5658 100644
--- a/app/assets/javascripts/admin/templates/flags-list.hbs
+++ b/app/assets/javascripts/admin/templates/flags-list.hbs
@@ -4,8 +4,8 @@
       <tr>
         <th class='user'></th>
         <th class='excerpt'></th>
-        <th class='flaggers'>{{i18n admin.flags.flagged_by}}</th>
-        <th class='flaggers'>{{#if adminOldFlagsView}}{{i18n admin.flags.resolved_by}}{{/if}}</th>
+        <th class='flaggers'>{{i18n 'admin.flags.flagged_by'}}</th>
+        <th class='flaggers'>{{#if adminOldFlagsView}}{{i18n 'admin.flags.resolved_by'}}{{/if}}</th>
       </tr>
     </thead>
     <tbody>
@@ -16,12 +16,12 @@
             {{#if flaggedPost.postAuthorFlagged}}
               {{#if flaggedPost.user}}
                 {{#link-to 'adminUser' flaggedPost.user}}{{avatar flaggedPost.user imageSize="small"}}{{/link-to}}
-                {{#if flaggedPost.wasEdited}}<i class="fa fa-pencil" title="{{i18n admin.flags.was_edited}}"></i>{{/if}}
+                {{#if flaggedPost.wasEdited}}<i class="fa fa-pencil" title="{{i18n 'admin.flags.was_edited'}}"></i>{{/if}}
               {{/if}}
             {{/if}}
             {{#if adminActiveFlagsView}}
               {{#if flaggedPost.previous_flags_count}}
-                <span title="{{i18n admin.flags.previous_flags_count count=flaggedPost.previous_flags_count}}" class="badge-notification flagged-posts">{{flaggedPost.previous_flags_count}}</span>
+                <span title="{{i18n 'admin.flags.previous_flags_count' count=flaggedPost.previous_flags_count}}" class="badge-notification flagged-posts">{{flaggedPost.previous_flags_count}}</span>
               {{/if}}
             {{/if}}
           </td>
@@ -78,7 +78,7 @@
                         {{format-age disposedAt}}
                         {{{dispositionIcon}}}
                         {{#if tookAction}}
-                          <i class='fa fa-gavel' title='{{i18n admin.flags.took_action}}'></i>
+                          <i class='fa fa-gavel' title='{{i18n 'admin.flags.took_action'}}'></i>
                         {{/if}}
                       </td>
                     </tr>
@@ -95,7 +95,7 @@
             <td></td>
             <td colspan="3">
               <div>
-                {{{i18n admin.flags.topic_flagged}}}&nbsp;<a href='{{unbound flaggedPost.url}}' class="btn">{{i18n admin.flags.visit_topic}}</a>
+                {{{i18n 'admin.flags.topic_flagged'}}}&nbsp;<a href='{{unbound flaggedPost.url}}' class="btn">{{i18n 'admin.flags.visit_topic'}}</a>
               </div>
             </td>
           </tr>
@@ -114,12 +114,12 @@
                     <p>
                       {{#link-to 'adminUser' reply.user}}{{avatar reply.user imageSize="small"}}{{/link-to}}&nbsp;{{{reply.excerpt}}}
                       {{#if hasMore}}
-                        <a href="{{unbound permalink}}">{{i18n admin.flags.more}}</a>
+                        <a href="{{unbound permalink}}">{{i18n 'admin.flags.more'}}</a>
                       {{/if}}
                     </p>
                   {{/if}}
                   <a href="{{unbound permalink}}">
-                    <button class='btn btn-reply'><i class="fa fa-reply"></i>&nbsp;{{i18n admin.flags.reply_message}}</button>
+                    <button class='btn btn-reply'><i class="fa fa-reply"></i>&nbsp;{{i18n 'admin.flags.reply_message'}}</button>
                   </a>
                 {{/if}}
               </div>
@@ -130,14 +130,14 @@
         <tr>
           <td colspan="4" class="action">
             {{#if adminActiveFlagsView}}
-              <button title='{{i18n admin.flags.agree_title}}' class='btn' {{action "showAgreeFlagModal" flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree}}&hellip;</button>
+              <button title='{{i18n 'admin.flags.agree_title'}}' class='btn' {{action "showAgreeFlagModal" flaggedPost}}><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree'}}&hellip;</button>
               {{#if flaggedPost.postHidden}}
-                <button title='{{i18n admin.flags.disagree_flag_unhide_post_title}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag_unhide_post}}</button>
+                <button title='{{i18n 'admin.flags.disagree_flag_unhide_post_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n 'admin.flags.disagree_flag_unhide_post'}}</button>
               {{else}}
-                <button title='{{i18n admin.flags.disagree_flag_title}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n admin.flags.disagree_flag}}</button>
+                <button title='{{i18n 'admin.flags.disagree_flag_title'}}' class='btn' {{action "disagreeFlags" flaggedPost}}><i class="fa fa-thumbs-o-down"></i>{{i18n 'admin.flags.disagree_flag'}}</button>
               {{/if}}
-              <button title='{{i18n admin.flags.defer_flag_title}}' class='btn' {{action "deferFlags" flaggedPost}}><i class="fa fa-external-link"></i>{{i18n admin.flags.defer_flag}}</button>
-              <button title='{{i18n admin.flags.delete_title}}' class='btn btn-danger' {{action "showDeleteFlagModal" flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n admin.flags.delete}}&hellip;</button>
+              <button title='{{i18n 'admin.flags.defer_flag_title'}}' class='btn' {{action "deferFlags" flaggedPost}}><i class="fa fa-external-link"></i>{{i18n 'admin.flags.defer_flag'}}</button>
+              <button title='{{i18n 'admin.flags.delete_title'}}' class='btn btn-danger' {{action "showDeleteFlagModal" flaggedPost}}><i class="fa fa-trash-o"></i>{{i18n 'admin.flags.delete'}}&hellip;</button>
             {{/if}}
           </td>
         </tr>
@@ -149,5 +149,5 @@
 
   {{loading-spinner condition=view.loading}}
 {{else}}
-  <p>{{i18n admin.flags.no_results}}</p>
+  <p>{{i18n 'admin.flags.no_results'}}</p>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/flags.hbs b/app/assets/javascripts/admin/templates/flags.hbs
index 78e11492bf..e99f63cfa5 100644
--- a/app/assets/javascripts/admin/templates/flags.hbs
+++ b/app/assets/javascripts/admin/templates/flags.hbs
@@ -1,8 +1,8 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminFlags.list' 'active'}}{{i18n admin.flags.active}}{{/link-to}}</li>
-      <li>{{#link-to 'adminFlags.list' 'old'}}{{i18n admin.flags.old}}{{/link-to}}</li>
+      <li>{{#link-to 'adminFlags.list' 'active'}}{{i18n 'admin.flags.active'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminFlags.list' 'old'}}{{i18n 'admin.flags.old'}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/group.hbs b/app/assets/javascripts/admin/templates/group.hbs
index 396e39b88c..e37eb39a7d 100644
--- a/app/assets/javascripts/admin/templates/group.hbs
+++ b/app/assets/javascripts/admin/templates/group.hbs
@@ -5,25 +5,25 @@
 {{/if}}
 
 <div class="control-group">
-  <label class="control-label">{{i18n admin.groups.group_members}}</label>
+  <label class="control-label">{{i18n 'admin.groups.group_members'}}</label>
   <div class="controls">
     {{user-selector usernames=usernames id="group-users" placeholderKey="admin.groups.selector_placeholder" tabindex="1" disabled=automatic}}
   </div>
 </div>
 <div class="control-group">
   <div class="controls">
-    {{input type="checkbox" checked=visible}} {{i18n groups.visible}}
+    {{input type="checkbox" checked=visible}} {{i18n 'groups.visible'}}
   </div>
 </div>
 <div class="control-group">
-  <label class="control-label">{{i18n groups.alias_levels.title}}</label>
+  <label class="control-label">{{i18n 'groups.alias_levels.title'}}</label>
   <div class="controls">
     {{combo-box valueAttribute="value" value=alias_level content=aliasLevelOptions}}
   </div>
 </div>
 <div class='controls'>
-  <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+  <button {{action "save"}} {{bind-attr disabled="disableSave"}} class='btn'>{{i18n 'admin.customize.save'}}</button>
   {{#unless automatic}}
-    <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i>{{i18n admin.customize.delete}}</button>
+    <button {{action "destroy"}} class='btn btn-danger'><i class="fa fa-trash-o"></i>{{i18n 'admin.customize.delete'}}</button>
   {{/unless}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/groups.hbs b/app/assets/javascripts/admin/templates/groups.hbs
index aac3928e60..061bf715de 100644
--- a/app/assets/javascripts/admin/templates/groups.hbs
+++ b/app/assets/javascripts/admin/templates/groups.hbs
@@ -1,6 +1,6 @@
 <div class='row groups'>
   <div class='content-list span6'>
-    <h3>{{i18n admin.groups.edit}}</h3>
+    <h3>{{i18n 'admin.groups.edit'}}</h3>
     <ul>
       {{#each group in arrangedContent}}
         <li>
@@ -9,8 +9,8 @@
       {{/each}}
     </ul>
     <div class='controls'>
-      <button class='btn' {{bind-attr disabled="refreshingAutoGroups"}} {{action "refreshAutoGroups"}}><i class="fa fa-refresh"></i>{{i18n admin.groups.refresh}}</button>
-      <button class='btn' {{action "newGroup"}}><i class="fa fa-plus"></i>{{i18n admin.groups.new}}</button>
+      <button class='btn' {{bind-attr disabled="refreshingAutoGroups"}} {{action "refreshAutoGroups"}}><i class="fa fa-refresh"></i>{{i18n 'admin.groups.refresh'}}</button>
+      <button class='btn' {{action "newGroup"}}><i class="fa fa-plus"></i>{{i18n 'admin.groups.new'}}</button>
     </div>
   </div>
 
diff --git a/app/assets/javascripts/admin/templates/groups_index.hbs b/app/assets/javascripts/admin/templates/groups_index.hbs
index 5c29aa24ae..f8a3f440e6 100644
--- a/app/assets/javascripts/admin/templates/groups_index.hbs
+++ b/app/assets/javascripts/admin/templates/groups_index.hbs
@@ -1 +1 @@
-{{i18n admin.groups.about}}
+{{i18n 'admin.groups.about'}}
diff --git a/app/assets/javascripts/admin/templates/logs.hbs b/app/assets/javascripts/admin/templates/logs.hbs
index 483381353c..c85bb02d7c 100644
--- a/app/assets/javascripts/admin/templates/logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs.hbs
@@ -1,16 +1,13 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminLogs.staffActionLogs'}}{{i18n admin.logs.staff_actions.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminLogs.screenedEmails'}}{{i18n admin.logs.screened_emails.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminLogs.screenedIpAddresses'}}{{i18n admin.logs.screened_ips.title}}{{/link-to}}</li>
-      <li>{{#link-to 'adminLogs.screenedUrls'}}{{i18n admin.logs.screened_urls.title}}{{/link-to}}</li>
-      <li><a href="/logs" data-auto-route="true">{{i18n admin.logs.logster.title}}</a></li>
+      <li>{{#link-to 'adminLogs.staffActionLogs'}}{{i18n 'admin.logs.staff_actions.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminLogs.screenedEmails'}}{{i18n 'admin.logs.screened_emails.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminLogs.screenedIpAddresses'}}{{i18n 'admin.logs.screened_ips.title'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminLogs.screenedUrls'}}{{i18n 'admin.logs.screened_urls.title'}}{{/link-to}}</li>
+      <li><a href="/logs" data-auto-route="true">{{i18n 'admin.logs.logster.title'}}</a></li>
     </ul>
   </div>
-  <div class="pull-right">
-    <button {{action "exportScreenedIps"}} class="btn" title="{{i18n admin.export_csv.screened_ips.title}}">{{fa-icon "download"}}{{i18n admin.export_csv.button_text}}</button>
-  </div>
 </div>
 
 <div class="admin-container">
diff --git a/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs b/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs
index f3f5acf196..eced3892f9 100644
--- a/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs
+++ b/app/assets/javascripts/admin/templates/logs/_site_customization_change_details.hbs
@@ -1,22 +1,22 @@
 <section class="field">
-  <b>{{i18n admin.customize.css}}</b>:
+  <b>{{i18n 'admin.customize.css'}}</b>:
   {{#if stylesheet}}
-    ({{i18n character_count count=stylesheet.length}})
+    ({{i18n 'character_count' count=stylesheet.length}})
   {{/if}}
   <br/>
   {{textarea value=stylesheet class="plain"}}
 </section>
 <section class="field">
-  <b>{{i18n admin.customize.header}}</b>:
+  <b>{{i18n 'admin.customize.header'}}</b>:
   {{#if header}}
-    ({{i18n character_count count=header.length}})
+    ({{i18n 'character_count' count=header.length}})
   {{/if}}
   <br/>
   {{textarea value=header class="plain"}}
 </section>
 <section class="field">
-  <b>{{i18n admin.customize.enabled}}</b>: {{enabled}}
+  <b>{{i18n 'admin.customize.enabled'}}</b>: {{enabled}}
 </section>
 <section class="field">
-  <b>{{i18n admin.customize.override_default}}</b>: {{override_default_style}}
+  <b>{{i18n 'admin.customize.override_default'}}</b>: {{override_default_style}}
 </section>
diff --git a/app/assets/javascripts/admin/templates/logs/details_modal.hbs b/app/assets/javascripts/admin/templates/logs/details_modal.hbs
index 232e993736..d789dd9cc8 100644
--- a/app/assets/javascripts/admin/templates/logs/details_modal.hbs
+++ b/app/assets/javascripts/admin/templates/logs/details_modal.hbs
@@ -2,5 +2,5 @@
   <pre>{{details}}</pre>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
 </div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs b/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
index d61eb44574..f231c39194 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_emails.hbs
@@ -1,16 +1,20 @@
-<p>{{i18n admin.logs.screened_emails.description}}</p>
+<p>
+  {{i18n 'admin.logs.screened_emails.description'}}
+  <button class="btn pull-right" {{action "exportScreenedEmailList"}} title="{{i18n 'admin.export_csv.button_title.screened_email'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+</p>
+</br>
 
 {{#loading-spinner condition=loading}}
   {{#if model.length}}
 
     <div class='table screened-emails'>
       <div class="heading-container">
-        <div class="col heading first email">{{i18n admin.logs.screened_emails.email}}</div>
-        <div class="col heading action">{{i18n admin.logs.action}}</div>
-        <div class="col heading match_count">{{i18n admin.logs.match_count}}</div>
-        <div class="col heading last_match_at">{{i18n admin.logs.last_match_at}}</div>
-        <div class="col heading created_at">{{i18n admin.logs.created_at}}</div>
-        <div class="col heading ip_address">{{i18n admin.logs.ip_address}}</div>
+        <div class="col heading first email">{{i18n 'admin.logs.screened_emails.email'}}</div>
+        <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
+        <div class="col heading match_count">{{i18n 'admin.logs.match_count'}}</div>
+        <div class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</div>
+        <div class="col heading created_at">{{i18n 'admin.logs.created_at'}}</div>
+        <div class="col heading ip_address">{{i18n 'admin.logs.ip_address'}}</div>
         <div class="col heading action"></div>
         <div class="clearfix"></div>
       </div>
@@ -19,6 +23,6 @@
     </div>
 
   {{else}}
-    {{i18n search.no_results}}
+    {{i18n 'search.no_results'}}
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
index 9cbd963f87..7522d0af63 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_emails_list_item.hbs
@@ -6,5 +6,5 @@
 <div class="col last_match_at">{{age-with-tooltip last_match_at}}</div>
 <div class="col created_at">{{age-with-tooltip created_at}}</div>
 <div class="col ip_address">{{ip_address}}</div>
-<div class="col action"><button class="btn" {{action "clearBlock" this}}><i class='fa fa-check'></i> {{i18n admin.logs.screened_emails.actions.allow}}</button></div>
+<div class="col action"><button class="btn" {{action "clearBlock" this}}><i class='fa fa-check'></i> {{i18n 'admin.logs.screened_emails.actions.allow'}}</button></div>
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
index 4a4350fafa..c1b27eb88f 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses.hbs
@@ -1,5 +1,8 @@
-<p>{{i18n admin.logs.screened_ips.description}}</p>
-<button class="btn pull-right" {{action "rollUp"}} title="{{i18n admin.logs.screened_ips.roll_up.title}}">{{i18n admin.logs.screened_ips.roll_up.text}}</button>
+<p>{{i18n 'admin.logs.screened_ips.description'}}</p>
+<div class="pull-right">
+  <button class="btn" {{action "rollUp"}} title="{{i18n 'admin.logs.screened_ips.roll_up.title'}}">{{i18n 'admin.logs.screened_ips.roll_up.text'}}</button>
+  <button class="btn" {{action "exportScreenedIpList"}} title="{{i18n 'admin.export_csv.button_title.screened_ip'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+</div>
 {{screened-ip-address-form action="recordAdded"}}
 <br/>
 
@@ -8,11 +11,11 @@
 
     <div class='table admin-logs-table screened-ip-addresses'>
       <div class="heading-container">
-        <div class="col heading first ip_address">{{i18n admin.logs.ip_address}}</div>
-        <div class="col heading action">{{i18n admin.logs.action}}</div>
-        <div class="col heading match_count">{{i18n admin.logs.match_count}}</div>
-        <div class="col heading last_match_at">{{i18n admin.logs.last_match_at}}</div>
-        <div class="col heading created_at">{{i18n admin.logs.created_at}}</div>
+        <div class="col heading first ip_address">{{i18n 'admin.logs.ip_address'}}</div>
+        <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
+        <div class="col heading match_count">{{i18n 'admin.logs.match_count'}}</div>
+        <div class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</div>
+        <div class="col heading created_at">{{i18n 'admin.logs.created_at'}}</div>
         <div class="col heading actions"></div>
         <div class="clearfix"></div>
       </div>
@@ -21,6 +24,6 @@
     </div>
 
   {{else}}
-    {{i18n search.no_results}}
+    {{i18n 'search.no_results'}}
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
index ed9e7fe8b2..94bc4155e9 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_ip_addresses_list_item.hbs
@@ -27,13 +27,13 @@
     <button class="btn btn-danger" {{action "destroy" this}}><i class="fa fa-trash-o"></i></button>
     <button class="btn" {{action "edit" this}}><i class="fa fa-pencil"></i></button>
     {{#if isBlocked}}
-      <button class="btn" {{action "allow" this}}><i {{bind-attr class=":fa doNothingIcon"}}></i> {{i18n admin.logs.screened_ips.actions.do_nothing}}</button>
+      <button class="btn" {{action "allow" this}}><i {{bind-attr class=":fa doNothingIcon"}}></i> {{i18n 'admin.logs.screened_ips.actions.do_nothing'}}</button>
     {{else}}
-      <button class="btn" {{action "block" this}}><i {{bind-attr class=":fa blockIcon"}}></i> {{i18n admin.logs.screened_ips.actions.block}}</button>
+      <button class="btn" {{action "block" this}}><i {{bind-attr class=":fa blockIcon"}}></i> {{i18n 'admin.logs.screened_ips.actions.block'}}</button>
     {{/if}}
   {{else}}
-    <button class="btn" {{action "save" this}}>{{i18n admin.logs.save}}</button>
-    <a {{action "cancel" this}}>{{i18n cancel}}</a>
+    <button class="btn" {{action "save" this}}>{{i18n 'admin.logs.save'}}</button>
+    <a {{action "cancel" this}}>{{i18n 'cancel'}}</a>
   {{/unless}}
 </div>
 <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs b/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
index 4a87eaf9ce..701909ff56 100644
--- a/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
+++ b/app/assets/javascripts/admin/templates/logs/screened_urls.hbs
@@ -1,20 +1,24 @@
-<p>{{i18n admin.logs.screened_urls.description}}</p>
+<p>
+  {{i18n 'admin.logs.screened_urls.description'}}
+  <button class="btn pull-right" {{action "exportScreenedUrlList"}} title="{{i18n 'admin.export_csv.button_title.screened_url'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+</p>
+</br>
 
 {{#loading-spinner condition=loading}}
   {{#if model.length}}
     <div class='table screened-urls'>
       <div class="heading-container">
-        <div class="col heading first domain">{{i18n admin.logs.screened_urls.domain}}</div>
-        <div class="col heading action">{{i18n admin.logs.action}}</div>
-        <div class="col heading match_count">{{i18n admin.logs.match_count}}</div>
-        <div class="col heading last_match_at">{{i18n admin.logs.last_match_at}}</div>
-        <div class="col heading created_at">{{i18n admin.logs.created_at}}</div>
+        <div class="col heading first domain">{{i18n 'admin.logs.screened_urls.domain'}}</div>
+        <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
+        <div class="col heading match_count">{{i18n 'admin.logs.match_count'}}</div>
+        <div class="col heading last_match_at">{{i18n 'admin.logs.last_match_at'}}</div>
+        <div class="col heading created_at">{{i18n 'admin.logs.created_at'}}</div>
         <div class="clearfix"></div>
       </div>
 
       {{view 'screened-urls-list' content=controller}}
     </div>
   {{else}}
-    {{i18n search.no_results}}
+    {{i18n 'search.no_results'}}
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
index 301ebd9d5b..7fb1a8d253 100644
--- a/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
+++ b/app/assets/javascripts/admin/templates/logs/site_customization_change_modal.hbs
@@ -1,10 +1,10 @@
 <div>
   <ul class="nav nav-pills">
     <li {{bind-attr class="newSelected:active"}}>
-      <a href="#" {{action "selectNew"}}>{{i18n admin.logs.staff_actions.new_value}}</a>
+      <a href="#" {{action "selectNew"}}>{{i18n 'admin.logs.staff_actions.new_value'}}</a>
     </li>
     <li {{bind-attr class="previousSelected:active"}}>
-      <a href="#" {{action "selectPrevious"}}>{{i18n admin.logs.staff_actions.previous_value}}</a>
+      <a href="#" {{action "selectPrevious"}}>{{i18n 'admin.logs.staff_actions.previous_value'}}</a>
     </li>
   </ul>
   <div class="modal-body">
@@ -14,7 +14,7 @@
           {{partial "admin/templates/logs/site_customization_change_details"}}
         {{/with}}
       {{else}}
-        {{i18n admin.logs.staff_actions.deleted}}
+        {{i18n 'admin.logs.staff_actions.deleted'}}
       {{/if}}
     </div>
     <div {{bind-attr class=":modal-tab :previous-tab previousSelected::invisible"}}>
@@ -23,11 +23,11 @@
           {{partial "admin/templates/logs/site_customization_change_details"}}
         {{/with}}
       {{else}}
-        {{i18n admin.logs.staff_actions.no_previous}}
+        {{i18n 'admin.logs.staff_actions.no_previous'}}
       {{/if}}
     </div>
   </div>
   <div class="modal-footer">
-    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
   </div>
 </div>
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
index c12978703a..10ae175053 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs.hbs
@@ -1,45 +1,50 @@
 <div class="staff-action-logs-controls">
   <a {{action "clearAllFilters"}} {{bind-attr class=":clear-filters :filter filtersExists::invisible"}}>
-    <span class="label">{{i18n admin.logs.staff_actions.clear_filters}}</span>
+    <span class="label">{{i18n 'admin.logs.staff_actions.clear_filters'}}</span>
   </a>
   {{#if actionFilter}}
     <a {{action "clearFilter" "action_name"}} class="filter">
-      <span class="label">{{i18n admin.logs.action}}</span>: {{actionFilter}}
+      <span class="label">{{i18n 'admin.logs.action'}}</span>: {{actionFilter}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.acting_user}}
     <a {{action "clearFilter" "acting_user"}} class="filter">
-      <span class="label">{{i18n admin.logs.staff_actions.staff_user}}</span>: {{filters.acting_user}}
+      <span class="label">{{i18n 'admin.logs.staff_actions.staff_user'}}</span>: {{filters.acting_user}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.target_user}}
     <a {{action "clearFilter" "target_user"}} class="filter">
-      <span class="label">{{i18n admin.logs.staff_actions.target_user}}</span>: {{filters.target_user}}
+      <span class="label">{{i18n 'admin.logs.staff_actions.target_user'}}</span>: {{filters.target_user}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
   {{#if filters.subject}}
     <a {{action "clearFilter" "subject"}} class="filter">
-      <span class="label">{{i18n admin.logs.staff_actions.subject}}</span>: {{filters.subject}}
+      <span class="label">{{i18n 'admin.logs.staff_actions.subject'}}</span>: {{filters.subject}}
       <i class="fa fa-times-circle"></i>
     </a>
   {{/if}}
 </div>
 
+<div class="pull-right">
+  <button class="btn" {{action "exportStaffActionLogs"}} title="{{i18n 'admin.export_csv.button_title.staff_action'}}">{{fa-icon "download"}}{{i18n 'admin.export_csv.button_text'}}</button>
+</div>
+</br>
+
 <div class="staff-action-logs-instructions" {{bind-attr class=":staff-action-logs-instructions showInstructions::invisible"}}>
-  {{i18n admin.logs.staff_actions.instructions}}
+  {{i18n 'admin.logs.staff_actions.instructions'}}
 </div>
 
 <div class='table staff-actions'>
   <div class="heading-container">
-    <div class="col heading first staff_user">{{i18n admin.logs.staff_actions.staff_user}}</div>
-    <div class="col heading action">{{i18n admin.logs.action}}</div>
-    <div class="col heading subject">{{i18n admin.logs.staff_actions.subject}}</div>
-    <div class="col heading created_at">{{i18n admin.logs.staff_actions.when}}</div>
-    <div class="col heading details">{{i18n admin.logs.staff_actions.details}}</div>
-    <div class="col heading context">{{i18n admin.logs.staff_actions.context}}</div>
+    <div class="col heading first staff_user">{{i18n 'admin.logs.staff_actions.staff_user'}}</div>
+    <div class="col heading action">{{i18n 'admin.logs.action'}}</div>
+    <div class="col heading subject">{{i18n 'admin.logs.staff_actions.subject'}}</div>
+    <div class="col heading created_at">{{i18n 'admin.logs.staff_actions.when'}}</div>
+    <div class="col heading details">{{i18n 'admin.logs.staff_actions.details'}}</div>
+    <div class="col heading context">{{i18n 'admin.logs.staff_actions.context'}}</div>
     <div class="clearfix"></div>
   </div>
 
@@ -47,7 +52,7 @@
     {{#if model.length}}
       {{view "staff-action-logs-list" content=controller}}
     {{else}}
-      {{i18n search.no_results}}
+      {{i18n 'search.no_results'}}
     {{/if}}
   {{/loading-spinner}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
index c0be5acc5a..cbcea891af 100644
--- a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
+++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.hbs
@@ -18,10 +18,10 @@
 <div class="col value details">
   {{{formattedDetails}}}
   {{#if useCustomModalForDetails}}
-    <a {{action "showCustomDetailsModal" this}}>{{i18n admin.logs.staff_actions.show}}</a>
+    <a {{action "showCustomDetailsModal" this}}>{{i18n 'admin.logs.staff_actions.show'}}</a>
   {{/if}}
   {{#if useModalForDetails}}
-    <a {{action "showDetailsModal" this}}>{{i18n admin.logs.staff_actions.show}}</a>
+    <a {{action "showDetailsModal" this}}>{{i18n 'admin.logs.staff_actions.show'}}</a>
   {{/if}}
 </div>
 <div class="col value context">{{context}}</div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
index 324d6f7bc5..14e1ae9c51 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_agree_flag.hbs
@@ -1,11 +1,11 @@
 {{#if user_deleted}}
-  <button title="{{i18n admin.flags.agree_flag_restore_post_title}}" {{action "agreeFlagRestorePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n admin.flags.agree_flag_restore_post}}</button>
+  <button title="{{i18n 'admin.flags.agree_flag_restore_post_title'}}" {{action "agreeFlagRestorePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye"></i>{{i18n 'admin.flags.agree_flag_restore_post'}}</button>
 {{else}}
   {{#unless postHidden}}
-    <button title="{{i18n admin.flags.agree_flag_hide_post_title}}" {{action "agreeFlagHidePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n admin.flags.agree_flag_hide_post}}</button>
+    <button title="{{i18n 'admin.flags.agree_flag_hide_post_title'}}" {{action "agreeFlagHidePost"}} class="btn"><i class="fa fa-thumbs-o-up"></i><i class="fa fa-eye-slash"></i>{{i18n 'admin.flags.agree_flag_hide_post'}}</button>
   {{/unless}}
 {{/if}}
-<button title="{{i18n admin.flags.agree_flag_title}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.agree_flag}}</button>
+<button title="{{i18n 'admin.flags.agree_flag_title'}}" {{action "agreeFlagKeepPost"}} class="btn"><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.agree_flag'}}</button>
 {{#if canDeleteAsSpammer}}
-  <button title="{{i18n admin.flags.delete_spammer_title}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n admin.flags.delete_spammer}}</button>
+  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs b/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
index d05abafdca..835a105cda 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_badge_preview.hbs
@@ -1,31 +1,31 @@
 <div class="badge-query-preview">
   {{#if errors}}
-    <p class="error-header">{{i18n admin.badges.preview.sql_error_header}}</p>
+    <p class="error-header">{{i18n 'admin.badges.preview.sql_error_header'}}</p>
 
     <pre class="badge-errors">{{errors}}</pre>
 
     <!--
     TODO we want some help pages for this, link to those instead
     <p>
-      {{i18n admin.badges.preview.error_help}}
+      {{i18n 'admin.badges.preview.error_help'}}
     </p>
     <ul>
       <li><a href="https://meta.discourse.org/t/triggered-custom-badge-queries/19336">https://meta.discourse.org/t/triggered-custom-badge-queries/19336</a></li>
     </ul>
     -->
   {{else}}
-    <p class="grant-count">{{{i18n admin.badges.preview.grant_count count=count}}}</p>
+    <p class="grant-count">{{{i18n 'admin.badges.preview.grant_count' count=count}}}</p>
 
     {{#if count_warning}}
       <div class="count-warning">
-        <p class="heading"><i class="fa fa-warning"></i> {{i18n admin.badges.preview.bad_count_warning.header}}</p>
-        <p class="body">{{i18n admin.badges.preview.bad_count_warning.text}}</p>
+        <p class="heading"><i class="fa fa-warning"></i> {{i18n 'admin.badges.preview.bad_count_warning.header'}}</p>
+        <p class="body">{{i18n 'admin.badges.preview.bad_count_warning.text'}}</p>
       </div>
     {{/if}}
 
     {{#if sample}}
       <p class="sample">
-        {{i18n admin.badges.preview.sample}}
+        {{i18n 'admin.badges.preview.sample'}}
       </p>
       <ul>
         {{#each html in processed_sample}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs b/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
index 831ee53891..5762101a1f 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_delete_flag.hbs
@@ -1,5 +1,5 @@
-<button title="{{i18n admin.flags.delete_post_defer_flag_title}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n admin.flags.delete_post_defer_flag}}</button>
-<button title="{{i18n admin.flags.delete_post_agree_flag_title}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n admin.flags.delete_post_agree_flag}}</button>
+<button title="{{i18n 'admin.flags.delete_post_defer_flag_title'}}" {{action "deletePostDeferFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-external-link"></i>{{i18n 'admin.flags.delete_post_defer_flag'}}</button>
+<button title="{{i18n 'admin.flags.delete_post_agree_flag_title'}}" {{action "deletePostAgreeFlag"}} class="btn"><i class="fa fa-trash-o"></i><i class="fa fa-thumbs-o-up"></i>{{i18n 'admin.flags.delete_post_agree_flag'}}</button>
 {{#if canDeleteAsSpammer}}
-  <button title="{{i18n admin.flags.delete_spammer_title}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n admin.flags.delete_spammer}}</button>
+  <button title="{{i18n 'admin.flags.delete_spammer_title'}}" {{action "deleteSpammer" user}} class="btn btn-danger"><i class="fa fa-exclamation-triangle"></i>{{i18n 'admin.flags.delete_spammer'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs b/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
index 0cb9eb9ca8..8c32447c2f 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_edit_badge_groupings.hbs
@@ -20,9 +20,9 @@
     {{/each}}
     </ul>
   </div>
-  <button class='btn' {{action "add"}}>{{i18n admin.badges.new}}</button>
+  <button class='btn' {{action "add"}}>{{i18n 'admin.badges.new'}}</button>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "saveAll"}} {{bind-attr disabled="submitDisabled"}}>{{i18n admin.badges.save}}</button>
-  <a {{action "cancel"}}>{{i18n cancel}}</a>
+  <button class='btn btn-primary' {{action "saveAll"}} {{bind-attr disabled="submitDisabled"}}>{{i18n 'admin.badges.save'}}</button>
+  <a {{action "cancel"}}>{{i18n 'cancel'}}</a>
 </div>
diff --git a/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs b/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs
index 4967f31e6b..93a3a96bc9 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_start_backup.hbs
@@ -1,3 +1,3 @@
-<button {{action "startBackup"}} class="btn btn-primary">{{i18n yes_value}}</button>
-<button {{action "startBackupWithoutUpload"}} class="btn">{{i18n admin.backups.operations.backup.without_uploads}}</button>
-<button {{action "cancel"}} class="btn">{{i18n no_value}}</button>
+<button {{action "startBackup"}} class="btn btn-primary">{{i18n 'yes_value'}}</button>
+<button {{action "startBackupWithoutUpload"}} class="btn">{{i18n 'admin.backups.operations.backup.without_uploads'}}</button>
+<button {{action "cancel"}} class="btn">{{i18n 'no_value'}}</button>
diff --git a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs
index 1f31982469..7a82cc0712 100644
--- a/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs
+++ b/app/assets/javascripts/admin/templates/modal/admin_suspend_user.hbs
@@ -1,15 +1,15 @@
 <div class="modal-body">
   <form>
-    {{i18n admin.user.suspend_duration}}
+    {{i18n 'admin.user.suspend_duration'}}
     {{text-field value=duration maxlength="5" autofocus="autofocus"}}
-    {{i18n admin.user.suspend_duration_units}}<br/>
+    {{i18n 'admin.user.suspend_duration_units'}}<br/>
     <br/>
-    {{{i18n admin.user.suspend_reason_label}}}<br/>
+    {{{i18n 'admin.user.suspend_reason_label'}}}<br/>
     <br/>
     {{text-field value=reason class="span8"}}
   </form>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-danger' {{action "suspend"}} {{bind-attr disabled="submitDisabled"}}><i class='fa fa-ban'></i>{{i18n admin.user.suspend}}</button>
-  <a {{action "closeModal"}}>{{i18n cancel}}</a>
+  <button class='btn btn-danger' {{action "suspend"}} {{bind-attr disabled="submitDisabled"}}><i class='fa fa-ban'></i>{{i18n 'admin.user.suspend'}}</button>
+  <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
 </div>
diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs
index e1f011b5a4..98e7097408 100644
--- a/app/assets/javascripts/admin/templates/reports.hbs
+++ b/app/assets/javascripts/admin/templates/reports.hbs
@@ -1,22 +1,22 @@
 <h3>{{title}}</h3>
 
 <div>
-  {{i18n admin.dashboard.reports.start_date}} {{input type="date" value=startDate}}
-  {{i18n admin.dashboard.reports.end_date}} {{input type="date" value=endDate}}
-  <button {{action "refreshReport"}} class='btn btn-primary'>{{i18n admin.dashboard.reports.refresh_report}}</button>
+  {{i18n 'admin.dashboard.reports.start_date'}} {{input type="date" value=startDate}}
+  {{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}}
+  <button {{action "refreshReport"}} class='btn btn-primary'>{{i18n 'admin.dashboard.reports.refresh_report'}}</button>
 </div>
 
 <div class='view-options'>
   {{#if viewingTable}}
-    {{i18n admin.dashboard.reports.view_table}}
+    {{i18n 'admin.dashboard.reports.view_table'}}
   {{else}}
-    <a href {{action "viewAsTable"}}>{{i18n admin.dashboard.reports.view_table}}</a>
+    <a href {{action "viewAsTable"}}>{{i18n 'admin.dashboard.reports.view_table'}}</a>
   {{/if}}
   |
   {{#if viewingBarChart}}
-    {{i18n admin.dashboard.reports.view_chart}}
+    {{i18n 'admin.dashboard.reports.view_chart'}}
   {{else}}
-    <a href {{action "viewAsBarChart"}}>{{i18n admin.dashboard.reports.view_chart}}</a>
+    <a href {{action "viewAsBarChart"}}>{{i18n 'admin.dashboard.reports.view_chart'}}</a>
   {{/if}}
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/site_settings.hbs b/app/assets/javascripts/admin/templates/site_settings.hbs
index 440c919d21..e1bbacc1f7 100644
--- a/app/assets/javascripts/admin/templates/site_settings.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings.hbs
@@ -2,12 +2,12 @@
   <div class='search controls'>
     <label>
       {{input type="checkbox" checked=onlyOverridden}}
-      {{i18n admin.site_settings.show_overriden}}
+      {{i18n 'admin.site_settings.show_overriden'}}
     </label>
   </div>
   <div class='controls'>
     {{text-field value=filter placeholderKey="type_to_filter"}}
-    <button {{action "clearFilter"}} class="btn">{{i18n admin.site_settings.clear_filter}}</button>
+    <button {{action "clearFilter"}} class="btn">{{i18n 'admin.site_settings.clear_filter'}}</button>
   </div>
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs b/app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs
index 66939c4da7..2e1a5c9971 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_bool.hbs
@@ -14,6 +14,6 @@
   </div>
 {{else}}
   {{#if overridden}}
-    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
+    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n 'admin.site_settings.reset'}}</button>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs b/app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs
index c53b1cf5d7..9a9ff20fce 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_enum.hbs
@@ -12,6 +12,6 @@
   </div>
 {{else}}
   {{#if overridden}}
-    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
+    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n 'admin.site_settings.reset'}}</button>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_list.hbs b/app/assets/javascripts/admin/templates/site_settings/setting_list.hbs
index f50e4214ff..802a53324e 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_list.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_list.hbs
@@ -12,6 +12,6 @@
     </div>
 {{else}}
   {{#if overridden}}
-      <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
+      <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n 'admin.site_settings.reset'}}</button>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_settings/setting_string.hbs b/app/assets/javascripts/admin/templates/site_settings/setting_string.hbs
index a5369cd157..52279773b1 100644
--- a/app/assets/javascripts/admin/templates/site_settings/setting_string.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings/setting_string.hbs
@@ -13,6 +13,6 @@
   </div>
 {{else}}
   {{#if overridden}}
-    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n admin.site_settings.reset}}</button>
+    <button class='btn' href='#' {{action "resetDefault" this}}><i class="fa fa-undo"></i>{{i18n 'admin.site_settings.reset'}}</button>
   {{/if}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_settings_category.hbs b/app/assets/javascripts/admin/templates/site_settings_category.hbs
index c7a762e296..002baae2e9 100644
--- a/app/assets/javascripts/admin/templates/site_settings_category.hbs
+++ b/app/assets/javascripts/admin/templates/site_settings_category.hbs
@@ -2,5 +2,5 @@
   {{collection contentBinding="filteredContent" classNames="form-horizontal settings" itemView="site-setting"}}
 {{else}}
   <br/>
-  {{i18n admin.site_settings.no_results}}
+  {{i18n 'admin.site_settings.no_results'}}
 {{/if}}
diff --git a/app/assets/javascripts/admin/templates/site_text_edit.hbs b/app/assets/javascripts/admin/templates/site_text_edit.hbs
index d87d17bd59..6db9dd716b 100644
--- a/app/assets/javascripts/admin/templates/site_text_edit.hbs
+++ b/app/assets/javascripts/admin/templates/site_text_edit.hbs
@@ -17,10 +17,10 @@
 <div class='controls'>
   <button class='btn' {{action "saveChanges"}} {{bind-attr disabled="saveDisabled"}}>
     {{#if saving}}
-      {{i18n saving}}
+      {{i18n 'saving'}}
     {{else}}
-      {{i18n save}}
+      {{i18n 'save'}}
     {{/if}}
   </button>
-  {{#if saved}}{{i18n saved}}{{/if}}
+  {{#if saved}}{{i18n 'saved'}}{{/if}}
 </div>
diff --git a/app/assets/javascripts/admin/templates/site_text_index.hbs b/app/assets/javascripts/admin/templates/site_text_index.hbs
index 71b256c9c5..5a448def37 100644
--- a/app/assets/javascripts/admin/templates/site_text_index.hbs
+++ b/app/assets/javascripts/admin/templates/site_text_index.hbs
@@ -1 +1 @@
-<p>{{i18n admin.site_text.none}}</p>
+<p>{{i18n 'admin.site_text.none'}}</p>
diff --git a/app/assets/javascripts/admin/templates/user-fields.hbs b/app/assets/javascripts/admin/templates/user-fields.hbs
index c829ef18c2..d20eac4dd1 100644
--- a/app/assets/javascripts/admin/templates/user-fields.hbs
+++ b/app/assets/javascripts/admin/templates/user-fields.hbs
@@ -1,7 +1,7 @@
 <div class='user-fields'>
-  <h2>{{i18n admin.user_fields.title}}</h2>
+  <h2>{{i18n 'admin.user_fields.title'}}</h2>
 
-  <p class="desc">{{i18n admin.user_fields.help}}</p>
+  <p class="desc">{{i18n 'admin.user_fields.help'}}</p>
 
   {{#if model}}
     {{#each f in model itemController="admin-user-field-item" itemView="admin-user-field-item"}}
@@ -17,19 +17,19 @@
             {{combo-box content=fieldTypes valueAttribute="id" value=f.buffered.field_type}}
           </div>
           <div class='form-element controls'>
-            <button {{action "save"}}class='btn btn-primary'>{{fa-icon 'check'}} {{i18n admin.user_fields.save}}</button>
-            <button {{action "cancel"}} class='btn btn-danger'>{{fa-icon 'times'}} {{i18n admin.user_fields.cancel}}</button>
+            <button {{action "save"}}class='btn btn-primary'>{{fa-icon 'check'}} {{i18n 'admin.user_fields.save'}}</button>
+            <button {{action "cancel"}} class='btn btn-danger'>{{fa-icon 'times'}} {{i18n 'admin.user_fields.cancel'}}</button>
           </div>
         </div>
         <div class="row">
           <div class='form-element'>
             <label>
-              {{input type="checkbox" checked=f.buffered.editable}} {{i18n admin.user_fields.editable.title}}
+              {{input type="checkbox" checked=f.buffered.editable}} {{i18n 'admin.user_fields.editable.title'}}
             </label>
           </div>
           <div class='form-element'>
             <label>
-              {{input type="checkbox" checked=f.buffered.required}} {{i18n admin.user_fields.required.title}}
+              {{input type="checkbox" checked=f.buffered.required}} {{i18n 'admin.user_fields.required.title'}}
             </label>
           </div>
         </div>
@@ -41,8 +41,8 @@
           <div class='form-display'>
           </div>
           <div class='form-element controls'>
-            <button {{action "edit"}}class='btn btn-default'>{{fa-icon 'pencil'}} {{i18n admin.user_fields.edit}}</button>
-            <button {{action "destroy"}}class='btn btn-danger'>{{fa-icon 'trash-o'}} {{i18n admin.user_fields.delete}}</button>
+            <button {{action "edit"}}class='btn btn-default'>{{fa-icon 'pencil'}} {{i18n 'admin.user_fields.edit'}}</button>
+            <button {{action "destroy"}}class='btn btn-danger'>{{fa-icon 'trash-o'}} {{i18n 'admin.user_fields.delete'}}</button>
           </div>
         </div>
         <div class="row">{{f.flags}}</div>
@@ -53,6 +53,6 @@
 
   <button {{bind-attr disabled="createDisabled"}} class='btn btn-primary' {{action "createField"}}>
     {{fa-icon "plus"}}
-    {{i18n admin.user_fields.create}}
+    {{i18n 'admin.user_fields.create'}}
   </button>
 </div>
diff --git a/app/assets/javascripts/admin/templates/user_badges.hbs b/app/assets/javascripts/admin/templates/user_badges.hbs
index c454e4a7db..a4bfc236e1 100644
--- a/app/assets/javascripts/admin/templates/user_badges.hbs
+++ b/app/assets/javascripts/admin/templates/user_badges.hbs
@@ -8,26 +8,26 @@
 
 {{#loading-spinner condition=loading}}
   <div class='admin-container user-badges'>
-    <h2>{{i18n admin.badges.grant_badge}}</h2>
+    <h2>{{i18n 'admin.badges.grant_badge'}}</h2>
     {{#if noBadges}}
-      <p>{{i18n admin.badges.no_badges}}</p>
+      <p>{{i18n 'admin.badges.no_badges'}}</p>
     {{else}}
       <br>
       {{combo-box valueAttribute="id" value=controller.selectedBadgeId content=controller.grantableBadges}}
-      <button class='btn btn-primary' {{action "grantBadge" controller.selectedBadgeId}}>{{i18n admin.badges.grant}}</button>
+      <button class='btn btn-primary' {{action "grantBadge" controller.selectedBadgeId}}>{{i18n 'admin.badges.grant'}}</button>
     {{/if}}
 
     <br>
     <br>
 
-    <h2>{{i18n admin.badges.granted_badges}}</h2>
+    <h2>{{i18n 'admin.badges.granted_badges'}}</h2>
     <br>
 
     <table>
       <tr>
-        <th>{{i18n admin.badges.badge}}</th>
-        <th>{{i18n admin.badges.granted_by}}</th>
-        <th>{{i18n admin.badges.granted_at}}</th>
+        <th>{{i18n 'admin.badges.badge'}}</th>
+        <th>{{i18n 'admin.badges.granted_by'}}</th>
+        <th>{{i18n 'admin.badges.granted_at'}}</th>
         <th></th>
       </tr>
 
@@ -42,13 +42,13 @@
           </td>
           <td>{{age-with-tooltip granted_at}}</td>
           <td>
-            <button class='btn' {{action "revokeBadge" this}}>{{i18n admin.badges.revoke}}</button>
+            <button class='btn' {{action "revokeBadge" this}}>{{i18n 'admin.badges.revoke'}}</button>
           </td>
         </tr>
       {{else}}
         <tr>
           <td colspan="5">
-            <p>{{i18n admin.badges.no_user_badges name=user.username}}</p>
+            <p>{{i18n 'admin.badges.no_user_badges' name=user.username}}</p>
           </td>
         </tr>
       {{/each}}
diff --git a/app/assets/javascripts/admin/templates/user_index.hbs b/app/assets/javascripts/admin/templates/user_index.hbs
index 63b9d64253..a3725767ed 100644
--- a/app/assets/javascripts/admin/templates/user_index.hbs
+++ b/app/assets/javascripts/admin/templates/user_index.hbs
@@ -4,68 +4,68 @@
     {{#if active}}
       {{#link-to 'user' model class="btn"}}
         <i class='fa fa-user'></i>
-        {{i18n admin.user.show_public_profile}}
+        {{i18n 'admin.user.show_public_profile'}}
       {{/link-to}}
       {{#if can_impersonate}}
-          <button class='btn btn-danger' {{action "impersonate" target="content"}} title="{{i18n admin.impersonate.help}}">
+          <button class='btn btn-danger' {{action "impersonate" target="content"}} title="{{i18n 'admin.impersonate.help'}}">
             <i class='fa fa-crosshairs'></i>
-            {{i18n admin.impersonate.title}}
+            {{i18n 'admin.impersonate.title'}}
           </button>
       {{/if}}
       {{#if currentUser.admin}}
       <button class='btn' {{action "log_out" target="content"}}>
         <i class='fa fa-power-off'></i>
-        {{i18n admin.user.log_out}}
+        {{i18n 'admin.user.log_out'}}
       </button>
       {{/if}}
     {{/if}}
   </div>
 
   <div class='display-row username'>
-    <div class='field'>{{i18n user.username.title}}</div>
+    <div class='field'>{{i18n 'user.username.title'}}</div>
     <div class='value'>{{username}}</div>
     <div class='controls'>
       {{#link-to 'preferences.username' model class="btn"}}
         <i class='fa fa-pencil'></i>
-        {{i18n user.change_username.title}}
+        {{i18n 'user.change_username.title'}}
       {{/link-to}}
     </div>
   </div>
 
   {{#if canCheckEmails}}
     <div class='display-row email'>
-      <div class='field'>{{i18n user.email.title}}</div>
+      <div class='field'>{{i18n 'user.email.title'}}</div>
       <div class='value'>
         {{#unless active}}
-          <div class='controls'>{{i18n admin.users.not_verified}}</div>
+          <div class='controls'>{{i18n 'admin.users.not_verified'}}</div>
         {{/unless}}
         {{#if email}}
           <a href="mailto:{{unbound email}}">{{email}}</a>
         {{else}}
-          <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+          <button class="btn" title="{{i18n 'admin.users.check_email.title'}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n 'admin.users.check_email.text'}}</button>
         {{/if}}
       </div>
     </div>
 
     <div class='display-row associations'>
-      <div class='field'>{{i18n user.associated_accounts}}</div>
+      <div class='field'>{{i18n 'user.associated_accounts'}}</div>
       <div class='value'>
         {{#if associated_accounts}}
           {{associated_accounts}}
         {{else}}
-          <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+          <button class="btn" title="{{i18n 'admin.users.check_email.title'}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n 'admin.users.check_email.text'}}</button>
         {{/if}}
       </div>
     </div>
   {{/if}}
 
   <div class='display-row'>
-    <div class='field'>{{i18n user.avatar.title}}</div>
+    <div class='field'>{{i18n 'user.avatar.title'}}</div>
     <div class='value'>{{avatar content imageSize="large"}}</div>
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n user.title.title}}</div>
+    <div class='field'>{{i18n 'user.title.title'}}</div>
     <div class='value'>
       {{#if editingTitle}}
         {{text-field value=title autofocus="autofocus"}}
@@ -75,23 +75,23 @@
     </div>
     <div class='controls'>
       {{#if editingTitle}}
-        <button class='btn' {{action "saveTitle"}}>{{i18n admin.user.save_title}}</button>
-        <a href="#" {{action "toggleTitleEdit"}}>{{i18n cancel}}</a>
+        <button class='btn' {{action "saveTitle"}}>{{i18n 'admin.user.save_title'}}</button>
+        <a href="#" {{action "toggleTitleEdit"}}>{{i18n 'cancel'}}</a>
       {{else}}
-        <button class='btn' {{action "toggleTitleEdit"}}><i class="fa fa-pencil"></i>{{i18n admin.user.edit_title}}</button>
+        <button class='btn' {{action "toggleTitleEdit"}}><i class="fa fa-pencil"></i>{{i18n 'admin.user.edit_title'}}</button>
       {{/if}}
     </div>
   </div>
 
   {{#if currentUser.admin}}
     <div class='display-row'>
-      <div class='field'>{{i18n admin.groups.title}}</div>
+      <div class='field'>{{i18n 'admin.groups.title'}}</div>
       <div class='value'>
         {{admin-group-selector selected=model.groups available=availableGroups}}
       </div>
       <div class='controls'>
         {{#if custom_groups}}
-          {{i18n admin.groups.primary}}
+          {{i18n 'admin.groups.primary'}}
           {{combo-box content=custom_groups value=primary_group_id nameProperty="name" none="admin.groups.no_primary"}}
         {{/if}}
         {{#if primaryGroupDirty}}
@@ -103,12 +103,12 @@
   {{/if}}
 
   <div class='display-row'>
-    <div class='field'>{{i18n user.ip_address.title}}</div>
+    <div class='field'>{{i18n 'user.ip_address.title'}}</div>
     <div class='value'>{{ip_address}}</div>
     <div class='controls'>
       {{#if currentUser.staff}}
         <button class='btn' {{action "refreshBrowsers" target="content"}}>
-          {{i18n admin.user.refresh_browsers}}
+          {{i18n 'admin.user.refresh_browsers'}}
         </button>
         {{ip-lookup ip=ip_address userId=id}}
       {{/if}}
@@ -116,7 +116,7 @@
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n user.registration_ip_address.title}}</div>
+    <div class='field'>{{i18n 'user.registration_ip_address.title'}}</div>
     <div class='value'>{{registration_ip_address}}</div>
     <div class='controls'>
       {{#if currentUser.staff}}
@@ -127,12 +127,12 @@
 
   {{#if showBadges}}
     <div class='display-row'>
-      <div class='field'>{{i18n admin.badges.title}}</div>
+      <div class='field'>{{i18n 'admin.badges.title'}}</div>
       <div class='value'>
-        {{i18n badges.badge_count count=badge_count}}
+        {{i18n 'badges.badge_count' count=badge_count}}
       </div>
       <div class='controls'>
-        {{#link-to 'adminUser.badges' this class="btn"}}<i class="fa fa-certificate"></i>{{i18n admin.badges.edit_badges}}{{/link-to}}
+        {{#link-to 'adminUser.badges' this class="btn"}}<i class="fa fa-certificate"></i>{{i18n 'admin.badges.edit_badges'}}{{/link-to}}
       </div>
     </div>
   {{/if}}
@@ -157,30 +157,30 @@
 
 
 <section class='details'>
-  <h1>{{i18n admin.user.permissions}}</h1>
+  <h1>{{i18n 'admin.user.permissions'}}</h1>
 
   {{#if showApproval}}
     <div class='display-row'>
-      <div class='field'>{{i18n admin.users.approved}}</div>
+      <div class='field'>{{i18n 'admin.users.approved'}}</div>
       <div class='value'>
         {{#if approved}}
-          {{i18n admin.user.approved_by}}
+          {{i18n 'admin.user.approved_by'}}
 
           {{#link-to 'adminUser' approvedBy}}{{avatar approvedBy imageSize="small"}}{{/link-to}}
           {{#link-to 'adminUser' approvedBy}}{{approvedBy.username}}{{/link-to}}
         {{else}}
-          {{i18n no_value}}
+          {{i18n 'no_value'}}
         {{/if}}
 
       </div>
       <div class='controls'>
         {{#if approved}}
-          {{i18n admin.user.approve_success}}
+          {{i18n 'admin.user.approve_success'}}
         {{else}}
           {{#if can_approve}}
             <button class='btn' {{action "approve" target="content"}}>
               <i class='fa fa-check'></i>
-              {{i18n admin.user.approve}}
+              {{i18n 'admin.user.approve'}}
             </button>
           {{/if}}
         {{/if}}
@@ -189,31 +189,31 @@
   {{/if}}
 
   <div class='display-row'>
-    <div class='field'>{{i18n admin.users.active}}</div>
+    <div class='field'>{{i18n 'admin.users.active'}}</div>
     <div class='value'>
       {{#if active}}
-        {{i18n yes_value}}
+        {{i18n 'yes_value'}}
       {{else}}
-        {{i18n no_value}}
+        {{i18n 'no_value'}}
       {{/if}}
     </div>
     <div class='controls'>
       {{#if active}}
         {{#if can_deactivate}}
-          <button class='btn' {{action "deactivate" target="content"}}>{{i18n admin.user.deactivate_account}}</button>
-          {{i18n admin.user.deactivate_explanation}}
+          <button class='btn' {{action "deactivate" target="content"}}>{{i18n 'admin.user.deactivate_account'}}</button>
+          {{i18n 'admin.user.deactivate_explanation'}}
         {{/if}}
       {{else}}
         {{#if can_send_activation_email}}
           <button class='btn' {{action "sendActivationEmail" target="content"}}>
             <i class='fa fa-envelope'></i>
-            {{i18n admin.user.send_activation_email}}
+            {{i18n 'admin.user.send_activation_email'}}
           </button>
         {{/if}}
         {{#if can_activate}}
           <button class='btn' {{action "activate" target="content"}}>
             <i class='fa fa-check'></i>
-            {{i18n admin.user.activate}}
+            {{i18n 'admin.user.activate'}}
           </button>
         {{/if}}
       {{/if}}
@@ -221,57 +221,57 @@
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n admin.api.key}}</div>
+    <div class='field'>{{i18n 'admin.api.key'}}</div>
 
     {{#if api_key}}
       <div class='long-value'>
         {{api_key.key}}
-        <button class='btn' {{action "regenerateApiKey"}}><i class="fa fa-undo"></i>{{i18n admin.api.regenerate}}</button>
-        <button {{action "revokeApiKey"}} class="btn"><i class="fa fa-times"></i>{{i18n admin.api.revoke}}</button>
+        <button class='btn' {{action "regenerateApiKey"}}><i class="fa fa-undo"></i>{{i18n 'admin.api.regenerate'}}</button>
+        <button {{action "revokeApiKey"}} class="btn"><i class="fa fa-times"></i>{{i18n 'admin.api.revoke'}}</button>
       </div>
     {{else}}
       <div class='value'>
       &mdash;
       </div>
       <div class='controls'>
-        <button {{action "generateApiKey"}} class="btn"><i class="fa fa-key"></i>{{i18n admin.api.generate}}</button>
+        <button {{action "generateApiKey"}} class="btn"><i class="fa fa-key"></i>{{i18n 'admin.api.generate'}}</button>
       </div>
     {{/if}}
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.admin}}</div>
+    <div class='field'>{{i18n 'admin.user.admin'}}</div>
     <div class='value'>{{admin}}</div>
     <div class='controls'>
       {{#if can_revoke_admin}}
         <button class='btn' {{action "revokeAdmin" target="content"}}>
           <i class='fa fa-shield'></i>
-          {{i18n admin.user.revoke_admin}}
+          {{i18n 'admin.user.revoke_admin'}}
         </button>
       {{/if}}
       {{#if can_grant_admin}}
         <button class='btn' {{action "grantAdmin" target="content"}}>
           <i class='fa fa-shield'></i>
-          {{i18n admin.user.grant_admin}}
+          {{i18n 'admin.user.grant_admin'}}
         </button>
       {{/if}}
     </div>
 
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.moderator}}</div>
+    <div class='field'>{{i18n 'admin.user.moderator'}}</div>
     <div class='value'>{{moderator}}</div>
     <div class='controls'>
       {{#if can_revoke_moderation}}
         <button class='btn' {{action "revokeModeration" target="content"}}>
           <i class='fa fa-shield'></i>
-          {{i18n admin.user.revoke_moderation}}
+          {{i18n 'admin.user.revoke_moderation'}}
         </button>
       {{/if}}
       {{#if can_grant_moderation}}
         <button class='btn' {{action "grantModeration" target="content"}}>
           <i class='fa fa-shield'></i>
-          {{i18n admin.user.grant_moderation}}
+          {{i18n 'admin.user.grant_moderation'}}
         </button>
       {{/if}}
     </div>
@@ -279,7 +279,7 @@
   </div>
 
   <div class='display-row'>
-    <div class='field'>{{i18n trust_level}}</div>
+    <div class='field'>{{i18n 'trust_level'}}</div>
     <div class="value">
       {{combo-box content=trustLevels value=trust_level nameProperty="detailedName"}}
       {{#if dirty}}
@@ -292,36 +292,36 @@
     <div class="controls">
       {{#if model.canLockTrustLevel}}
         {{#if model.trust_level_locked}}
-        <i title='{{i18n admin.user.trust_level_locked_tip}}' {{action "lockTrustLevel" false target="model"}} class='fa fa-lock'></i> <button class="btn" {{action "lockTrustLevel" false target="model"}}>{{i18n admin.user.unlock_trust_level}}</button>
+        <i title='{{i18n 'admin.user.trust_level_locked_tip'}}' {{action "lockTrustLevel" false target="model"}} class='fa fa-lock'></i> <button class="btn" {{action "lockTrustLevel" false target="model"}}>{{i18n 'admin.user.unlock_trust_level'}}</button>
         {{else}}
-        <i title='{{i18n admin.user.trust_level_unlocked_tip}}' class='fa fa-unlock'></i> <button class="btn" {{action "lockTrustLevel" true target="model"}}>{{i18n admin.user.lock_trust_level}}</button>
+        <i title='{{i18n 'admin.user.trust_level_unlocked_tip'}}' class='fa fa-unlock'></i> <button class="btn" {{action "lockTrustLevel" true target="model"}}>{{i18n 'admin.user.lock_trust_level'}}</button>
         {{/if}}
       {{/if}}
       {{#if tl3Requirements}}
-        {{#link-to 'adminUser.tl3Requirements' this class="btn"}}{{i18n admin.user.trust_level_3_requirements}}{{/link-to}}
+        {{#link-to 'adminUser.tl3Requirements' this class="btn"}}{{i18n 'admin.user.trust_level_3_requirements'}}{{/link-to}}
       {{/if}}
 
     </div>
   </div>
 
   <div {{bind-attr class=":display-row isSuspended:highlight-danger"}}>
-    <div class='field'>{{i18n admin.user.suspended}}</div>
+    <div class='field'>{{i18n 'admin.user.suspended'}}</div>
     <div class='value'>{{isSuspended}}</div>
     <div class='controls'>
     {{#if isSuspended}}
       <button class='btn btn-danger' {{action "unsuspend" target="content"}}>
         <i class='fa fa-ban'></i>
-        {{i18n admin.user.unsuspend}}
+        {{i18n 'admin.user.unsuspend'}}
       </button>
       {{suspendDuration}}
-      {{i18n admin.user.suspended_explanation}}
+      {{i18n 'admin.user.suspended_explanation'}}
     {{else}}
       {{#if canSuspend}}
         <button class='btn btn-danger' {{action "showSuspendModal" this}}>
           <i class='fa fa-ban'></i>
-          {{i18n admin.user.suspend}}
+          {{i18n 'admin.user.suspend'}}
         </button>
-        {{i18n admin.user.suspended_explanation}}
+        {{i18n 'admin.user.suspended_explanation'}}
       {{/if}}
     {{/if}}
     </div>
@@ -329,64 +329,64 @@
 
   {{#if isSuspended}}
   <div class='display-row highlight-danger'>
-    <div class='field'>{{i18n admin.user.suspended_by}}</div>
+    <div class='field'>{{i18n 'admin.user.suspended_by'}}</div>
     <div class='value'>
       {{#link-to 'adminUser' suspendedBy}}{{avatar suspendedBy imageSize="tiny"}}{{/link-to}}
       {{#link-to 'adminUser' suspendedBy}}{{suspendedBy.username}}{{/link-to}}
     </div>
     <div class='controls'>
-      <b>{{i18n admin.user.suspend_reason}}</b>:
+      <b>{{i18n 'admin.user.suspend_reason'}}</b>:
       {{suspend_reason}}
     </div>
   </div>
   {{/if}}
 
   <div class='display-row' {{bind-attr class=":display-row blocked:highlight-danger"}}>
-    <div class='field'>{{i18n admin.user.blocked}}</div>
+    <div class='field'>{{i18n 'admin.user.blocked'}}</div>
     <div class='value'>{{blocked}}</div>
     <div class='controls'>
       {{#if blocked}}
         <button class='btn' {{action "unblock" target="content"}}>
           <i class='fa fa-thumbs-o-up'></i>
-          {{i18n admin.user.unblock}}
+          {{i18n 'admin.user.unblock'}}
         </button>
-        {{i18n admin.user.block_explanation}}
+        {{i18n 'admin.user.block_explanation'}}
       {{/if}}
     </div>
   </div>
 </section>
 
 <section class='details'>
-  <h1>{{i18n admin.user.activity}}</h1>
+  <h1>{{i18n 'admin.user.activity'}}</h1>
 
   <div class='display-row'>
-    <div class='field'>{{i18n created}}</div>
+    <div class='field'>{{i18n 'created'}}</div>
     <div class='value'>{{{created_at_age}}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.users.last_emailed}}</div>
+    <div class='field'>{{i18n 'admin.users.last_emailed'}}</div>
     <div class='value'>{{{last_emailed_age}}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n last_seen}}</div>
+    <div class='field'>{{i18n 'last_seen'}}</div>
     <div class='value'>{{{last_seen_age}}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.like_count}}</div>
+    <div class='field'>{{i18n 'admin.user.like_count'}}</div>
     <div class='value'>{{like_given_count}} / {{like_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.topics_entered}}</div>
+    <div class='field'>{{i18n 'admin.user.topics_entered'}}</div>
     <div class='value'>{{topics_entered}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.post_count}}</div>
+    <div class='field'>{{i18n 'admin.user.post_count'}}</div>
     <div class='value'>{{post_count}}</div>
     <div class='controls'>
       {{#if can_delete_all_posts}}
         <button class='btn btn-danger' {{action "deleteAllPosts" target="content"}}>
           <i class='fa fa-trash-o'></i>
-          {{i18n admin.user.delete_all_posts}}
+          {{i18n 'admin.user.delete_all_posts'}}
         </button>
       {{else}}
         {{deleteAllPostsExplanation}}
@@ -394,54 +394,54 @@
     </div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.posts_read_count}}</div>
+    <div class='field'>{{i18n 'admin.user.posts_read_count'}}</div>
     <div class='value'>{{posts_read_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.warnings_received_count}}</div>
+    <div class='field'>{{i18n 'admin.user.warnings_received_count'}}</div>
     <div class='value'>{{warnings_received_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.flags_given_received_count}}</div>
+    <div class='field'>{{i18n 'admin.user.flags_given_received_count'}}</div>
     <div class='value'>{{flags_given_count}} / {{flags_received_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.private_topics_count}}</div>
+    <div class='field'>{{i18n 'admin.user.private_topics_count'}}</div>
     <div class='value'>{{private_topics_count}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n admin.user.time_read}}</div>
+    <div class='field'>{{i18n 'admin.user.time_read'}}</div>
     <div class='value'>{{{time_read}}}</div>
   </div>
   <div class='display-row'>
-    <div class='field'>{{i18n user.invited.days_visited}}</div>
+    <div class='field'>{{i18n 'user.invited.days_visited'}}</div>
     <div class='value'>{{{days_visited}}}</div>
   </div>
 </section>
 
 {{#if single_sign_on_record}}
 <section class='details'>
-  <h1>{{i18n admin.user.sso.title}}</h1>
+  <h1>{{i18n 'admin.user.sso.title'}}</h1>
 
   {{#with single_sign_on_record}}
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_id}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_id'}}</div>
       <div class='value'>{{external_id}}</div>
     </div>
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_username}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_username'}}</div>
       <div class='value'>{{external_username}}</div>
     </div>
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_name}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_name'}}</div>
       <div class='value'>{{external_name}}</div>
     </div>
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_email}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_email'}}</div>
       <div class='value'>{{external_email}}</div>
     </div>
     <div class='display-row'>
-      <div class='field'>{{i18n admin.user.sso.external_avatar_url}}</div>
+      <div class='field'>{{i18n 'admin.user.sso.external_avatar_url'}}</div>
       <div class='value'>{{external_avatar_url}}</div>
     </div>
   {{/with}}
@@ -452,7 +452,7 @@
   <hr/>
   <button {{bind-attr class=":btn :btn-danger :pull-right deleteForbidden:hidden"}} {{action "destroy" target="content"}} {{bind-attr disabled="deleteForbidden"}}>
     <i class="fa fa-exclamation-triangle"></i>
-    {{i18n admin.user.delete}}
+    {{i18n 'admin.user.delete'}}
   </button>
   {{#if deleteExplanation}}
     <div class="clearfix"></div>
diff --git a/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs b/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
index cb57aa4875..b1086cc84d 100644
--- a/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
+++ b/app/assets/javascripts/admin/templates/user_tl3_requirements.hbs
@@ -2,15 +2,15 @@
   <div class='span15'>
     <ul class="nav nav-pills">
       <li>{{#link-to 'adminUser' this}}<i class="fa fa-caret-left"></i> &nbsp;{{username}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'regular'}}{{i18n admin.user.trust_level_2_users}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'regular'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li>
     </ul>
   </div>
 </div>
 
 <div class="admin-container tl3-requirements">
-  <h2>{{username}} - {{i18n admin.user.tl3_requirements.title}}</h2>
+  <h2>{{username}} - {{i18n 'admin.user.tl3_requirements.title'}}</h2>
   <br/>
-  <p>{{i18n admin.user.tl3_requirements.table_title}}</p>
+  <p>{{i18n 'admin.user.tl3_requirements.table_title'}}</p>
 
   {{#with tl3Requirements}}
     <table class="table" style="width: auto;">
@@ -18,81 +18,81 @@
         <tr>
           <th></th>
           <th></th>
-          <th>{{i18n admin.user.tl3_requirements.value_heading}}</th>
-          <th>{{i18n admin.user.tl3_requirements.requirement_heading}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.value_heading'}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.requirement_heading'}}</th>
         </tr>
       </thead>
       <tbody>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.visits}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.visits'}}</th>
           <td><i {{bind-attr class=":fa met.days_visited:fa-check:fa-times"}}></i></td>
           <td>
-            {{days_visited_percent}}% ({{days_visited}} / {{time_period}} {{i18n admin.user.tl3_requirements.days}})
+            {{days_visited_percent}}% ({{days_visited}} / {{time_period}} {{i18n 'admin.user.tl3_requirements.days'}})
           </td>
           <td>{{min_days_visited_percent}}%</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.topics_replied_to}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.topics_replied_to'}}</th>
           <td><i {{bind-attr class=":fa met.topics_replied_to:fa-check:fa-times"}}></i></td>
           <td>{{num_topics_replied_to}}</td>
           <td>{{min_topics_replied_to}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.topics_viewed}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.topics_viewed'}}</th>
           <td><i {{bind-attr class=":fa met.topics_viewed:fa-check:fa-times"}}></i></td>
           <td>{{topics_viewed}}</td>
           <td>{{min_topics_viewed}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.topics_viewed_all_time}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.topics_viewed_all_time'}}</th>
           <td><i {{bind-attr class=":fa met.topics_viewed_all_time:fa-check:fa-times"}}></i></td>
           <td>{{topics_viewed_all_time}}</td>
           <td>{{min_topics_viewed_all_time}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.posts_read}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.posts_read'}}</th>
           <td><i {{bind-attr class=":fa met.posts_read:fa-check:fa-times"}}></i></td>
           <td>{{posts_read}}</td>
           <td>{{min_posts_read}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.posts_read_all_time}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.posts_read_all_time'}}</th>
           <td><i {{bind-attr class=":fa met.posts_read_all_time:fa-check:fa-times"}}></i></td>
           <td>{{posts_read_all_time}}</td>
           <td>{{min_posts_read_all_time}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.flagged_posts}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.flagged_posts'}}</th>
           <td><i {{bind-attr class=":fa met.flagged_posts:fa-check:fa-times"}}></i></td>
           <td>{{num_flagged_posts}}</td>
-          <td>{{i18n max_of_count count=max_flagged_posts}}</td>
+          <td>{{i18n 'max_of_count' count=max_flagged_posts}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.flagged_by_users}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.flagged_by_users'}}</th>
           <td><i {{bind-attr class=":fa met.flagged_by_users:fa-check:fa-times"}}></i></td>
           <td>{{num_flagged_by_users}}</td>
-          <td>{{i18n max_of_count count=max_flagged_by_users}}</td>
+          <td>{{i18n 'max_of_count' count=max_flagged_by_users}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.likes_given}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.likes_given'}}</th>
           <td><i {{bind-attr class=":fa met.likes_given:fa-check:fa-times"}}></i></td>
           <td>{{num_likes_given}}</td>
           <td>{{min_likes_given}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.likes_received}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.likes_received'}}</th>
           <td><i {{bind-attr class=":fa met.likes_received:fa-check:fa-times"}}></i></td>
           <td>{{num_likes_received}}</td>
           <td>{{min_likes_received}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.likes_received_days}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.likes_received_days'}}</th>
           <td><i {{bind-attr class=":fa met.likes_received_days:fa-check:fa-times"}}></i></td>
           <td>{{num_likes_received_days}}</td>
           <td>{{min_likes_received_days}}</td>
         </tr>
         <tr>
-          <th>{{i18n admin.user.tl3_requirements.likes_received_users}}</th>
+          <th>{{i18n 'admin.user.tl3_requirements.likes_received_users'}}</th>
           <td><i {{bind-attr class=":fa met.likes_received_users:fa-check:fa-times"}}></i></td>
           <td>{{num_likes_received_users}}</td>
           <td>{{min_likes_received_users}}</td>
@@ -107,31 +107,31 @@
       {{#if tl3Requirements.requirements_lost}}
         {{! tl implicitly not locked }}
         {{#if tl3Requirements.on_grace_period}}
-          <i class="fa fa-times"></i> {{i18n admin.user.tl3_requirements.on_grace_period}}
+          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
         {{else}} {{! not on grace period }}
-          <i class="fa fa-times"></i> {{i18n admin.user.tl3_requirements.does_not_qualify}}
-                                      {{i18n admin.user.tl3_requirements.will_be_demoted}}
+          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
+                                      {{i18n 'admin.user.tl3_requirements.will_be_demoted'}}
         {{/if}}
       {{else}} {{! requirements not lost - remains tl3 }}
         {{#if tl3Requirements.trust_level_locked}}
-          <i class="fa fa-lock"></i> {{i18n admin.user.tl3_requirements.locked_will_not_be_demoted}}
+          <i class="fa fa-lock"></i> {{i18n 'admin.user.tl3_requirements.locked_will_not_be_demoted'}}
         {{else}} {{! tl not locked }}
-          <i class="fa fa-check"></i> {{i18n admin.user.tl3_requirements.qualifies}}
+          <i class="fa fa-check"></i> {{i18n 'admin.user.tl3_requirements.qualifies'}}
           {{#if tl3Requirements.on_grace_period}}
-            {{i18n admin.user.tl3_requirements.on_grace_period}}
+            {{i18n 'admin.user.tl3_requirements.on_grace_period'}}
           {{/if}}
         {{/if}}
       {{/if}}
     {{else}} {{! is not tl3 }}
       {{#if tl3Requirements.requirements_met}}
         {{! met & not tl3 - will be promoted}}
-        <i class="fa fa-check"></i> {{i18n admin.user.tl3_requirements.qualifies}}
-                                    {{i18n admin.user.tl3_requirements.will_be_promoted}}
+        <i class="fa fa-check"></i> {{i18n 'admin.user.tl3_requirements.qualifies'}}
+                                    {{i18n 'admin.user.tl3_requirements.will_be_promoted'}}
       {{else}} {{! requirements not met - remains regular }}
         {{#if tl3Requirements.trust_level_locked}}
-          <i class="fa fa-lock"></i> {{i18n admin.user.tl3_requirements.locked_will_not_be_promoted}}
+          <i class="fa fa-lock"></i> {{i18n 'admin.user.tl3_requirements.locked_will_not_be_promoted'}}
         {{else}}
-          <i class="fa fa-times"></i> {{i18n admin.user.tl3_requirements.does_not_qualify}}
+          <i class="fa fa-times"></i> {{i18n 'admin.user.tl3_requirements.does_not_qualify'}}
         {{/if}}
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 333e3f664a..750685509a 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -14,7 +14,7 @@
   {{text-field value=listFilter placeholder=searchHint}}
   {{#unless showEmails}}
     <div class="pull-right">
-      <button {{action "showEmails"}} class="btn">{{i18n admin.users.show_emails}}</button>
+      <button {{action "showEmails"}} class="btn">{{i18n 'admin.users.show_emails'}}</button>
     </div>
   {{/unless}}
 </div>
@@ -27,26 +27,26 @@
           <th>{{input type="checkbox" checked=selectAll}}</th>
         {{/if}}
         <th>&nbsp;</th>
-        <th>{{i18n username}}</th>
-        <th>{{i18n email}}</th>
-        <th>{{i18n admin.users.last_emailed}}</th>
-        <th>{{i18n last_seen}}</th>
-        <th>{{i18n admin.user.topics_entered}}</th>
-        <th>{{i18n admin.user.posts_read_count}}</th>
-        <th>{{i18n admin.user.time_read}}</th>
-        <th>{{i18n created}}</th>
+        <th>{{i18n 'username'}}</th>
+        <th>{{i18n 'email'}}</th>
+        <th>{{i18n 'admin.users.last_emailed'}}</th>
+        <th>{{i18n 'last_seen'}}</th>
+        <th>{{i18n 'admin.user.topics_entered'}}</th>
+        <th>{{i18n 'admin.user.posts_read_count'}}</th>
+        <th>{{i18n 'admin.user.time_read'}}</th>
+        <th>{{i18n 'created'}}</th>
         {{#if showApproval}}
-          <th>{{i18n admin.users.approved}}</th>
+          <th>{{i18n 'admin.users.approved'}}</th>
         {{/if}}
         <th>&nbsp;</th>
       </tr>
 
       {{#each user in model}}
-        <tr {{bind-attr class="selected user.active::not-activated"}}>
+        <tr {{bind-attr class="user.selected user.active::not-activated"}}>
           {{#if controller.showApproval}}
             <td>
               {{#if user.can_approve}}
-                {{input type="checkbox" checked=selected}}
+                {{input type="checkbox" checked=user.selected}}
               {{/if}}
             </td>
           {{/if}}
@@ -64,21 +64,21 @@
           {{#if showApproval}}
           <td>
             {{#if user.approved}}
-              {{i18n yes_value}}
+              {{i18n 'yes_value'}}
             {{else}}
-              {{i18n no_value}}
+              {{i18n 'no_value'}}
             {{/if}}
           </td>
           {{/if}}
           <td>
-            {{#if user.admin}}<i class="fa fa-shield" title="{{i18n admin.title}}"></i>{{/if}}
-            {{#if user.moderator}}<i class="fa fa-shield" title="{{i18n admin.moderator}}"></i>{{/if}}
-          <td>
+            {{#if user.admin}}<i class="fa fa-shield" title="{{i18n 'admin.title'}}"></i>{{/if}}
+            {{#if user.moderator}}<i class="fa fa-shield" title="{{i18n 'admin.moderator'}}"></i>{{/if}}
+          </td>
         </tr>
       {{/each}}
 
     </table>
   {{else}}
-    <p>{{i18n search.no_results}}</p>
+    <p>{{i18n 'search.no_results'}}</p>
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/admin/templates/users_list.hbs b/app/assets/javascripts/admin/templates/users_list.hbs
index 6cdf5c5ddf..14032b4e20 100644
--- a/app/assets/javascripts/admin/templates/users_list.hbs
+++ b/app/assets/javascripts/admin/templates/users_list.hbs
@@ -1,19 +1,19 @@
 <div class='admin-controls'>
   <div class='span15'>
     <ul class="nav nav-pills">
-      <li>{{#link-to 'adminUsersList.show' 'active'}}{{i18n admin.users.nav.active}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'new'}}{{i18n admin.users.nav.new}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'active'}}{{i18n 'admin.users.nav.active'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'new'}}{{i18n 'admin.users.nav.new'}}{{/link-to}}</li>
       {{#if siteSettings.must_approve_users}}
-        <li>{{#link-to 'adminUsersList.show' 'pending'}}{{i18n admin.users.nav.pending}}{{/link-to}}</li>
+        <li>{{#link-to 'adminUsersList.show' 'pending'}}{{i18n 'admin.users.nav.pending'}}{{/link-to}}</li>
       {{/if}}
-      <li>{{#link-to 'adminUsersList.show' 'staff'}}{{i18n admin.users.nav.staff}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'suspended'}}{{i18n admin.users.nav.suspended}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'blocked'}}{{i18n admin.users.nav.blocked}}{{/link-to}}</li>
-      <li>{{#link-to 'adminUsersList.show' 'suspect'}}{{i18n admin.users.nav.suspect}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'staff'}}{{i18n 'admin.users.nav.staff'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'suspended'}}{{i18n 'admin.users.nav.suspended'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'blocked'}}{{i18n 'admin.users.nav.blocked'}}{{/link-to}}</li>
+      <li>{{#link-to 'adminUsersList.show' 'suspect'}}{{i18n 'admin.users.nav.suspect'}}{{/link-to}}</li>
     </ul>
   </div>
   <div class="pull-right">
-    <button {{action "exportUsers"}} class="btn" title="{{i18n admin.export_csv.users.title}}"><i class="fa fa-download"></i>{{i18n admin.export_csv.button_text}}</button>
+    <button {{action "exportUsers"}} class="btn" title="{{i18n 'admin.export_csv.button_title.user'}}"><i class="fa fa-download"></i>{{i18n 'admin.export_csv.button_text'}}</button>
   </div>
 </div>
 
diff --git a/app/assets/javascripts/admin/templates/version_checks.hbs b/app/assets/javascripts/admin/templates/version_checks.hbs
index 49009e47dc..fefee6fec5 100644
--- a/app/assets/javascripts/admin/templates/version_checks.hbs
+++ b/app/assets/javascripts/admin/templates/version_checks.hbs
@@ -5,15 +5,15 @@
           {{custom-html 'upgrade-header'}}
           <tr>
             <th>&nbsp;</th>
-            <th>{{i18n admin.dashboard.installed_version}}</th>
-            <th>{{i18n admin.dashboard.latest_version}}</th>
+            <th>{{i18n 'admin.dashboard.installed_version'}}</th>
+            <th>{{i18n 'admin.dashboard.latest_version'}}</th>
             <th>&nbsp;</th>
             <th>&nbsp;</th>
           </tr>
         </thead>
         {{#unless loading}}
           <tbody>
-            <td class="title">{{i18n admin.dashboard.version}}</td>
+            <td class="title">{{i18n 'admin.dashboard.version'}}</td>
             <td class="version-number"><a {{bind-attr href="versionCheck.gitLink"}} target="_blank">{{ versionCheck.installed_version }}</a></td>
 
             {{#if versionCheck.noCheckPerformed}}
@@ -22,7 +22,7 @@
                 <span class="icon critical-updates-available">☹</span>
               </td>
               <td class="version-notes">
-                <span class="normal-note">{{i18n admin.dashboard.no_check_performed}}</span>
+                <span class="normal-note">{{i18n 'admin.dashboard.no_check_performed'}}</span>
               </td>
             {{else}}
               {{#if versionCheck.staleData}}
@@ -37,9 +37,9 @@
                 <td class="version-notes">
                   <span class="normal-note">
                     {{#if versionCheck.version_check_pending}}
-                      {{i18n admin.dashboard.version_check_pending}}
+                      {{i18n 'admin.dashboard.version_check_pending'}}
                     {{else}}
-                      {{i18n admin.dashboard.stale_data}}
+                      {{i18n 'admin.dashboard.stale_data'}}
                     {{/if}}
                   </span>
                 </td>
@@ -60,11 +60,11 @@
                 </td>
                 <td class="version-notes">
                   {{#if versionCheck.upToDate }}
-                    {{i18n admin.dashboard.up_to_date}}
+                    {{i18n 'admin.dashboard.up_to_date'}}
                   {{else}}
-                    <span class="critical-note">{{i18n admin.dashboard.critical_available}}</span>
-                    <span class="normal-note">{{i18n admin.dashboard.updates_available}}</span>
-                    {{i18n admin.dashboard.please_upgrade}}
+                    <span class="critical-note">{{i18n 'admin.dashboard.critical_available'}}</span>
+                    <span class="normal-note">{{i18n 'admin.dashboard.updates_available'}}</span>
+                    {{i18n 'admin.dashboard.please_upgrade'}}
                   {{/if}}
                 </td>
               {{/if}}
diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index 89ec703135..64a1f7dd39 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -6,4 +6,16 @@ require_asset ("./main_include.js")
 DiscoursePluginRegistry.javascripts.each { |js| require_asset(js) }
 DiscoursePluginRegistry.handlebars.each { |hb| require_asset(hb) }
 
+# Load any glob dependencies
+DiscoursePluginRegistry.asset_globs.each do |g|
+  root, extension = *g
+  Dir.glob("#{root}/**/*") do |f|
+    if File.directory?(f)
+      depend_on(f)
+    elsif f.to_s.end_with?(".#{extension}")
+      require_asset(f)
+    end
+  end
+end
+
 %>
diff --git a/app/assets/javascripts/discourse/components/discourse-action-history.js.es6 b/app/assets/javascripts/discourse/components/discourse-action-history.js.es6
index d941bca62c..7dba3c5828 100644
--- a/app/assets/javascripts/discourse/components/discourse-action-history.js.es6
+++ b/app/assets/javascripts/discourse/components/discourse-action-history.js.es6
@@ -1,23 +1,16 @@
-/**
-  This component handles rendering of what actions have been taken on a post. It uses
-  buffer rendering for performance rather than a template.
+import StringBuffer from 'discourse/mixins/string-buffer';
 
-  @class ActionsHistoryComponent
-  @extends Em.Component
-  @namespace Discourse
-  @module Discourse
-**/
-export default Em.Component.extend({
+export default Em.Component.extend(StringBuffer, {
   tagName: 'section',
   classNameBindings: [':post-actions', 'hidden'],
   actionsHistory: Em.computed.alias('post.actionsHistory'),
   emptyHistory: Em.computed.empty('actionsHistory'),
   hidden: Em.computed.and('emptyHistory', 'post.notDeleted'),
-  shouldRerender: Discourse.View.renderIfChanged('actionsHistory.@each', 'actionsHistory.users.length', 'post.deleted'),
+
+  rerenderTriggers: ['actionsHistory.@each', 'actionsHistory.users.length', 'post.deleted'],
 
   // This was creating way too many bound ifs and subviews in the handlebars version.
-  render: function(buffer) {
-
+  renderString: function(buffer) {
     if (!this.get('emptyHistory')) {
       this.get('actionsHistory').forEach(function(c) {
         buffer.push("<div class='post-action'>");
diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6
index 7dca11a0cf..0f6f60f674 100644
--- a/app/assets/javascripts/discourse/components/global-notice.js.es6
+++ b/app/assets/javascripts/discourse/components/global-notice.js.es6
@@ -1,8 +1,9 @@
-export default Ember.Component.extend({
+import StringBuffer from 'discourse/mixins/string-buffer';
 
-  shouldRerender: Discourse.View.renderIfChanged("site.isReadOnly"),
+export default Ember.Component.extend(StringBuffer, {
+  rerenderTriggers: ['site.isReadOnly'],
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     var notices = [];
 
     if (this.site.get("isReadOnly")) {
diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6
index ff5b01acd5..e66fdd276c 100644
--- a/app/assets/javascripts/discourse/components/navigation-item.js.es6
+++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6
@@ -1,17 +1,11 @@
-/**
-  This view handles rendering of a navigation item
+import StringBuffer from 'discourse/mixins/string-buffer';
 
-  @class NavigationItemComponent
-  @extends Ember.Component
-  @namespace Discourse
-  @module Discourse
-**/
-export default Ember.Component.extend({
+export default Ember.Component.extend(StringBuffer, {
   tagName: 'li',
   classNameBindings: ['active', 'content.hasIcon:has-icon'],
   attributeBindings: ['title'],
   hidden: Em.computed.not('content.visible'),
-  shouldRerender: Discourse.View.renderIfChanged('content.count'),
+  rerenderTriggers: ['content.count'],
 
   title: function() {
     var categoryName = this.get('content.categoryName'),
@@ -42,7 +36,7 @@ export default Ember.Component.extend({
     return I18n.t("filters." + name + ".title", extra);
   }.property('content.count'),
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     var content = this.get('content');
     buffer.push("<a href='" + content.get('href') + "'>");
     if (content.get('hasIcon')) {
diff --git a/app/assets/javascripts/discourse/components/post-gutter.js.es6 b/app/assets/javascripts/discourse/components/post-gutter.js.es6
index 6f263277d5..925434b50d 100644
--- a/app/assets/javascripts/discourse/components/post-gutter.js.es6
+++ b/app/assets/javascripts/discourse/components/post-gutter.js.es6
@@ -1,8 +1,12 @@
 var MAX_SHOWN = 5;
 
-export default Em.Component.extend({
+import StringBuffer from 'discourse/mixins/string-buffer';
+
+export default Em.Component.extend(StringBuffer, {
   classNameBindings: [':gutter'],
 
+  rerenderTriggers: ['expanded'],
+
   // Roll up links to avoid duplicates
   collapsed: function() {
     var seen = {},
@@ -21,7 +25,7 @@ export default Em.Component.extend({
     return result;
   }.property('links'),
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     var links = this.get('collapsed'),
         toRender = links,
         collapsed = !this.get('expanded');
@@ -62,10 +66,6 @@ export default Em.Component.extend({
     }
   },
 
-  _rerenderIfNeeded: function() {
-    this.rerender();
-  }.observes('expanded'),
-
   click: function(e) {
     var $target = $(e.target);
     if ($target.hasClass('toggle-more')) {
diff --git a/app/assets/javascripts/discourse/components/poster-avatar.js.es6 b/app/assets/javascripts/discourse/components/poster-avatar.js.es6
deleted file mode 100644
index 03875b6a79..0000000000
--- a/app/assets/javascripts/discourse/components/poster-avatar.js.es6
+++ /dev/null
@@ -1,12 +0,0 @@
-export default Ember.Component.extend({
-  tagName: 'a',
-  attributeBindings: ['href','data-user-card'],
-  classNames: ['trigger-user-card'],
-  href: Em.computed.oneWay('post.usernameUrl'),
-  "data-user-card": Em.computed.oneWay('post.username'),
-
-  render: function(buffer) {
-    var avatar = Handlebars.helpers.avatar(this.get('post'), {hash: {imageSize: 'large'}});
-    buffer.push(avatar);
-  }
-});
diff --git a/app/assets/javascripts/discourse/components/top-title.js.es6 b/app/assets/javascripts/discourse/components/top-title.js.es6
index 31c03461d5..cfa065429f 100644
--- a/app/assets/javascripts/discourse/components/top-title.js.es6
+++ b/app/assets/javascripts/discourse/components/top-title.js.es6
@@ -1,8 +1,10 @@
-export default Ember.Component.extend({
-  tagName: 'h2',
+import StringBuffer from 'discourse/mixins/string-buffer';
 
-  _shouldRerender: Discourse.View.renderIfChanged('period.title'),
-  render: function(buffer) {
+export default Ember.Component.extend(StringBuffer, {
+  tagName: 'h2',
+  rerenderTriggers: ['period.title'],
+
+  renderString: function(buffer) {
     buffer.push("<i class='fa fa-calendar-o'></i> " + this.get('period.title'));
   }
 });
diff --git a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6 b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
index cf21baa2a4..ff9b0131e4 100644
--- a/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-post-badges.js.es6
@@ -1,3 +1,4 @@
+import StringBuffer from 'discourse/mixins/string-buffer';
 
 // Creates a link
 function link(buffer, prop, url, cssClass, i18nKey, text) {
@@ -7,12 +8,12 @@ function link(buffer, prop, url, cssClass, i18nKey, text) {
   buffer.push("<a href='" + url + "' class='badge " + cssClass + " badge-notification' title='" + title + "'>" + (text || prop) + "</a>\n");
 }
 
-export default Ember.Component.extend({
+export default Ember.Component.extend(StringBuffer, {
   tagName: 'span',
   classNameBindings: [':topic-post-badges'],
-  _shouldRerender: Discourse.View.renderIfChanged('url', 'unread', 'newPosts', 'unseen'),
+  rerenderTriggers: ['url', 'unread', 'newPosts', 'unseen'],
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     var url = this.get('url');
 
     link(buffer, this.get('unread'), url, 'unread', 'unread_posts');
diff --git a/app/assets/javascripts/discourse/components/topic-status.js.es6 b/app/assets/javascripts/discourse/components/topic-status.js.es6
index 1d0883f2e7..dd8b0f8c0b 100644
--- a/app/assets/javascripts/discourse/components/topic-status.js.es6
+++ b/app/assets/javascripts/discourse/components/topic-status.js.es6
@@ -1,18 +1,12 @@
-/**
-  This view is for rendering an icon representing the status of a topic
+import StringBuffer from 'discourse/mixins/string-buffer';
 
-  @class TopicStatusComponent
-  @extends Ember.Component
-  @namespace Discourse
-  @module Discourse
-**/
-export default Ember.Component.extend({
+export default Ember.Component.extend(StringBuffer, {
   classNames: ['topic-statuses'],
 
   hasDisplayableStatus: Em.computed.or('topic.archived','topic.closed', 'topic.pinned', 'topic.unpinned', 'topic.invisible', 'topic.archetypeObject.notDefault', 'topic.is_warning'),
-  shouldRerender: Discourse.View.renderIfChanged('topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'),
+  rerenderTriggers: ['topic.archived', 'topic.closed', 'topic.pinned', 'topic.visible', 'topic.unpinned', 'topic.is_warning'],
 
-  didInsertElement: function(){
+  watchClick: function(){
     var self = this;
 
     this.$('a').click(function(){
@@ -27,13 +21,13 @@ export default Ember.Component.extend({
 
       return false;
     });
-  },
+  }.on('didInsertElement'),
 
   canAct: function() {
     return Discourse.User.current() && !this.get('disableActions');
   }.property('disableActions'),
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     if (!this.get('hasDisplayableStatus')) { return; }
 
     var self = this;
@@ -41,7 +35,7 @@ export default Ember.Component.extend({
     var renderIconIf = function(conditionProp, name, key, actionable) {
       if (!self.get(conditionProp)) { return; }
       var title = Handlebars.Utils.escapeExpression(I18n.t("topic_statuses." + key + ".help"));
-      var startTag = actionable ? "a href='#'" : "span";
+      var startTag = actionable ? "a href" : "span";
       var endTag = actionable ? "a" : "span";
 
       buffer.push("<" + startTag + " title='" + title + "' class='topic-status'><i class='fa fa-" + name + "'></i></" + endTag + ">");
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 9e2e43e8c6..c15d158ad4 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -73,14 +73,34 @@ export default DiscourseController.extend({
     if (c) { c.updateDraftStatus(); }
   },
 
-  appendText: function(text) {
+  appendText: function(text, opts) {
     var c = this.get('model');
-    if (c) { c.appendText(text); }
+    if (c) {
+      opts = opts || {};
+      var wmd = $('#wmd-input');
+      var val = wmd.val() || '';
+      var position = opts.position === "cursor" ? wmd.caret() : val.length;
+
+      var caret = c.appendText(text, position, opts);
+      if(wmd[0]){
+        Em.run.next(function(){
+          Discourse.Utilities.setCaretPosition(wmd[0], caret);
+        });
+      }
+    }
   },
 
-  appendBlockAtCursor: function(text) {
-    var c = this.get('model');
-    if (c) { c.appendText(text, $('#wmd-input').caret(), {block: true}); }
+  appendTextAtCursor: function(text, opts) {
+    opts = opts || {};
+    opts.position = "cursor";
+    this.appendText(text, opts);
+  },
+
+  appendBlockAtCursor: function(text, opts) {
+    opts = opts || {};
+    opts.position = "cursor";
+    opts.block = true;
+    this.appendText(text, opts);
   },
 
   categories: function() {
@@ -445,6 +465,11 @@ export default DiscourseController.extend({
 
   canEdit: function() {
     return this.get("model.action") === "edit" && Discourse.User.current().get("can_edit");
-  }.property("model.action")
+  }.property("model.action"),
+
+  visible: function() {
+    var state = this.get('model.composeState');
+    return state && state !== 'closed';
+  }.property('model.composeState')
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6 b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
index 9003d53dc4..6d38365bd7 100644
--- a/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
+++ b/app/assets/javascripts/discourse/controllers/forgot-password.js.es6
@@ -46,7 +46,7 @@ export default DiscourseController.extend(ModalFunctionality, {
       }).then(success, fail).finally(function(){
         setTimeout(function(){
           self.set('disabled',false);
-        }, 10*1000);
+        }, 1000);
       });
 
       return false;
diff --git a/app/assets/javascripts/discourse/controllers/search.js.es6 b/app/assets/javascripts/discourse/controllers/search.js.es6
index 24c327a012..4efcd31dca 100644
--- a/app/assets/javascripts/discourse/controllers/search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/search.js.es6
@@ -4,13 +4,23 @@ var _dontSearch = false;
 
 export default Em.Controller.extend(Discourse.Presence, {
 
+  contextType: function(key, value){
+    if(arguments.length > 1) {
+      // a bit hacky, consider cleaning this up, need to work through all observers though
+      var context = $.extend({}, this.get('searchContext'));
+      context.type = value;
+      this.set('searchContext', context);
+    }
+    return this.get('searchContext.type');
+  }.property('searchContext'),
+
   contextChanged: function(){
     if (this.get('searchContextEnabled')) {
       _dontSearch = true;
       this.set('searchContextEnabled', false);
       _dontSearch = false;
     }
-  }.observes("searchContext"),
+  }.observes('searchContext'),
 
   searchContextDescription: function(){
     var ctx = this.get('searchContext');
@@ -22,6 +32,8 @@ export default Em.Controller.extend(Discourse.Presence, {
           return I18n.t('search.context.user', {username: Em.get(ctx, 'user.username')});
         case 'category':
           return I18n.t('search.context.category', {category: Em.get(ctx, 'category.name')});
+        case 'private_messages':
+          return I18n.t('search.context.private_messages');
       }
     }
   }.property('searchContext'),
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index fac35fa4d9..7cd9ecdeed 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -78,6 +78,10 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, {
   },
 
   actions: {
+    deleteTopic: function() {
+      this.deleteTopic();
+    },
+
     // Post related methods
     replyToPost: function(post) {
       var composerController = this.get('controllers.composer'),
@@ -370,8 +374,13 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, {
     },
 
     togglePinnedForUser: function() {
-      if (this.get('pinned_at'))
-        this.get('pinned') ? this.get('content').clearPin() : this.get('content').rePin();
+      if (this.get('pinned_at')) {
+        if (this.get('pinned')) {
+          this.get('content').clearPin();
+        } else {
+          this.get('content').rePin();
+        }
+      }
     },
 
     replyAsNewTopic: function(post) {
diff --git a/app/assets/javascripts/discourse/controllers/user-card.js.es6 b/app/assets/javascripts/discourse/controllers/user-card.js.es6
index 90cfd46013..a3b71cfb18 100644
--- a/app/assets/javascripts/discourse/controllers/user-card.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-card.js.es6
@@ -13,23 +13,19 @@ export default ObjectController.extend({
   postStream: Em.computed.alias('controllers.topic.postStream'),
   enoughPostsForFiltering: Em.computed.gte('participant.post_count', 2),
   viewingTopic: Em.computed.match('controllers.application.currentPath', /^topic\./),
+  viewingAdmin: Em.computed.match('controllers.application.currentPath', /^admin\./),
   showFilter: Em.computed.and('viewingTopic', 'postStream.hasNoFilters', 'enoughPostsForFiltering'),
-
-  // showFilter: Em.computed.and('postStream.hasNoFilters', 'enoughPostsForFiltering'),
   showName: Discourse.computed.propertyNotEqual('user.name', 'user.username'),
-
   hasUserFilters: Em.computed.gt('postStream.userFilters.length', 0),
-
   isSuspended: Em.computed.notEmpty('user.suspend_reason'),
-
   showBadges: Discourse.computed.setting('enable_badges'),
+  showMoreBadges: Em.computed.gt('moreBadgesCount', 0),
+  showDelete: Em.computed.and("viewingAdmin", "showName", "user.canBeDeleted"),
 
   moreBadgesCount: function() {
     return this.get('user.badge_count') - this.get('user.featured_user_badges.length');
   }.property('user.badge_count', 'user.featured_user_badges.@each'),
 
-  showMoreBadges: Em.computed.gt('moreBadgesCount', 0),
-
   hasCardBadgeImage: function() {
     var img = this.get('user.card_badge.image');
     return img && img.indexOf('fa-') !== 0;
@@ -77,6 +73,7 @@ export default ObjectController.extend({
     self.set('cardTarget', target);
 
     Discourse.User.findByUsername(username).then(function (user) {
+      user = Discourse.User.create(user);
       self.setProperties({ user: user, avatar: user, visible: true});
       self.appEvents.trigger('usercard:shown');
     }).finally(function(){
diff --git a/app/assets/javascripts/discourse/controllers/user-invited.js.es6 b/app/assets/javascripts/discourse/controllers/user-invited.js.es6
index 4d5fea2f4e..7499b2e5a4 100644
--- a/app/assets/javascripts/discourse/controllers/user-invited.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-invited.js.es6
@@ -80,7 +80,7 @@ export default Ember.ObjectController.extend({
       var self = this;
       var model = self.get('model');
 
-      if(self.get('canLoadMore')) {
+      if (self.get('canLoadMore') && !self.get('invitesLoading')) {
         self.set('invitesLoading', true);
         Discourse.Invite.findInvitedBy(self.get('user'), self.get('searchTerm'), model.invites.length).then(function(invite_model) {
           self.set('invitesLoading', false);
diff --git a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6 b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
index c39d34df95..2d252ac156 100644
--- a/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-topics-list.js.es6
@@ -1,8 +1,8 @@
 import ObjectController from 'discourse/controllers/object';
 
 // Lists of topics on a user's page.
-export default ObjectController.extend({
-  needs: ["application"],
+export default ObjectController.extend(Discourse.HasCurrentUser, {
+  needs: ["application", "user"],
   hideCategory: false,
   showParticipants: false,
 
@@ -14,6 +14,11 @@ export default ObjectController.extend({
     loadMore: function() {
       this.get('model').loadMore();
     }
-  }
+  },
+
+  showNewPM: function(){
+    return this.get('controllers.user.viewingSelf') &&
+           Discourse.User.currentProp('can_send_private_messages');
+  }.property('controllers.user.viewingSelf'),
 
 });
diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6
index b4cb4bd0d9..edc98dff7c 100644
--- a/app/assets/javascripts/discourse/ember/resolver.js.es6
+++ b/app/assets/javascripts/discourse/ember/resolver.js.es6
@@ -71,8 +71,10 @@ export default Ember.DefaultResolver.extend({
   customResolve: function(parsedName) {
     // If we end with the name we want, use it. This allows us to define components within plugins.
     var suffix = parsedName.type + 's/' + parsedName.fullNameWithoutType,
+        dashed = Ember.String.dasherize(suffix),
         moduleName = Ember.keys(requirejs.entries).find(function(e) {
-          return e.indexOf(suffix, e.length - suffix.length) !== -1;
+          return (e.indexOf(suffix, e.length - suffix.length) !== -1) ||
+                 (e.indexOf(dashed, e.length - dashed.length) !== -1);
         });
 
     var module;
diff --git a/app/assets/javascripts/discourse/helpers/i18n_helpers.js b/app/assets/javascripts/discourse/helpers/i18n_helpers.js
index 324229c974..69e7db0db5 100644
--- a/app/assets/javascripts/discourse/helpers/i18n_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/i18n_helpers.js
@@ -26,7 +26,11 @@ I18n.toHumanSize = function(number, options) {
 Handlebars.registerHelper('i18n', function(property, options) {
   // Resolve any properties
   var params = options.hash,
-    self = this;
+      self = this;
+
+  if (options.types[0] !== "STRING") {
+    Em.warn("Using the `{{i18n}}` helper without quotes is deprecated.");
+  }
 
   _.each(params, function(value, key) {
     params[key] = Em.Handlebars.get(self, value, options);
@@ -49,14 +53,13 @@ Ember.Handlebars.registerBoundHelper("boundI18n", function(property, options) {
   @for Handlebars
 **/
 Ember.Handlebars.registerHelper('countI18n', function(key, options) {
-  var view = Discourse.View.extend({
+  var view = Discourse.View.extend(Discourse.StringBuffer, {
     tagName: 'span',
-    shouldRerender: Discourse.View.renderIfChanged('count', 'suffix'),
+    rerenderTriggers: ['count', 'suffix'],
 
-    render: function(buffer) {
+    renderString: function(buffer) {
       buffer.push(I18n.t(key + (this.get('suffix') || ''), { count: this.get('count') }));
     }
-
   });
   return Ember.Handlebars.helpers.view.call(this, view, options);
 });
diff --git a/app/assets/javascripts/discourse/lib/Markdown.Editor.js b/app/assets/javascripts/discourse/lib/Markdown.Editor.js
index 589d213cf6..41679bb8d0 100644
--- a/app/assets/javascripts/discourse/lib/Markdown.Editor.js
+++ b/app/assets/javascripts/discourse/lib/Markdown.Editor.js
@@ -1214,6 +1214,17 @@
         makeSpritedButtonRow();
 
         var keyEvent = "keydown";
+
+        var extendedEvents = [];
+
+        if(window.PagedownCustom){
+          window.PagedownCustom.appendButtons.concat(window.PagedownCustom.insertButtons).forEach(function(button){
+            if(button.shortcut){
+              extendedEvents.push([button.shortcut, button.execute]);
+            }
+          });
+        }
+
         util.addEvent(inputBox, keyEvent, function (key) {
 
             // Check to see if we have a button key and, if so execute the callback.
@@ -1222,6 +1233,12 @@
                 var keyCode = key.charCode || key.keyCode;
                 var keyCodeStr = String.fromCharCode(keyCode).toLowerCase();
 
+                for(var i=0; i<extendedEvents.length; i++){
+                  if(keyCodeStr===extendedEvents[i][0]){
+                    extendedEvents[i][1]();
+                  }
+                }
+
                 switch (keyCodeStr) {
                     case "b":
                         doClick(buttons.bold);
@@ -1439,6 +1456,19 @@
             }));
             buttons.heading = makeButton("wmd-heading-button", getString("heading"), bindCommand("doHeading"));
             buttons.hr = makeButton("wmd-hr-button", getString("hr"), bindCommand("doHorizontalRule"));
+
+            // If we have any buttons to append, do it!
+            if (typeof PagedownCustom != "undefined") {
+                var appendButtons = PagedownCustom.appendButtons
+                if (appendButtons && (appendButtons.length > 0)) {
+                    for (var i=0; i< appendButtons.length; i++) {
+                        var b = appendButtons[i];
+                        makeButton(b.id, b.description, b.execute)
+                    }
+                }
+            }
+
+
             //makeSpacer(3);
             //buttons.undo = makeButton("wmd-undo-button", getString("undo"), null);
             //buttons.undo.execute = function (manager) { if (manager) manager.undo(); };
@@ -1450,23 +1480,23 @@
             //buttons.redo = makeButton("wmd-redo-button", redoTitle, null);
             //buttons.redo.execute = function (manager) { if (manager) manager.redo(); };
 
-            if (helpOptions) {
-                var helpButton = document.createElement("li");
-                var helpButtonImage = document.createElement("span");
-                helpButton.appendChild(helpButtonImage);
-                helpButton.className = "wmd-button wmd-help-button";
-                helpButton.id = "wmd-help-button" + postfix;
-                helpButton.isHelp = true;
-                helpButton.style.right = "0px";
-                helpButton.title = getString("help");
-                helpButton.onclick = helpOptions.handler;
+            // if (helpOptions) {
+            //     var helpButton = document.createElement("li");
+            //     var helpButtonImage = document.createElement("span");
+            //     helpButton.appendChild(helpButtonImage);
+            //     helpButton.className = "wmd-button wmd-help-button";
+            //     helpButton.id = "wmd-help-button" + postfix;
+            //     helpButton.isHelp = true;
+            //     helpButton.style.right = "0px";
+            //     helpButton.title = getString("help");
+            //     helpButton.onclick = helpOptions.handler;
+            //
+            //     setupButton(helpButton, true);
+            //     buttonRow.appendChild(helpButton);
+            //     buttons.help = helpButton;
+            // }
 
-                setupButton(helpButton, true);
-                buttonRow.appendChild(helpButton);
-                buttons.help = helpButton;
-            }
-
-            setUndoRedoButtonStates();
+            // setUndoRedoButtonStates();
         }
 
         function setUndoRedoButtonStates() {
diff --git a/app/assets/javascripts/discourse/lib/search-for-term.js.es6 b/app/assets/javascripts/discourse/lib/search-for-term.js.es6
index 592195f72e..9f9c3fabaa 100644
--- a/app/assets/javascripts/discourse/lib/search-for-term.js.es6
+++ b/app/assets/javascripts/discourse/lib/search-for-term.js.es6
@@ -39,9 +39,8 @@ export default function searchForTerm(term, opts) {
     });
 
     results.categories = results.categories.map(function(category){
-      category = Discourse.Category.list().findProperty('id', category.id);
-      return category;
-    });
+      return Discourse.Category.list().findProperty('id', category.id);
+    }).compact();
 
     var r = results.grouped_search_result;
     results.resultTypes = [];
diff --git a/app/assets/javascripts/discourse/mixins/string-buffer.js.es6 b/app/assets/javascripts/discourse/mixins/string-buffer.js.es6
new file mode 100644
index 0000000000..070dfd1270
--- /dev/null
+++ b/app/assets/javascripts/discourse/mixins/string-buffer.js.es6
@@ -0,0 +1,27 @@
+export default Ember.Mixin.create({
+
+  _watchProps: function() {
+    var args = this.get('rerenderTriggers');
+    if (!Ember.isNone(args)) {
+      var self = this;
+      args.forEach(function(k) {
+        self.addObserver(k, self.rerenderString);
+      });
+    }
+  }.on('init'),
+
+  render: function(buffer) {
+    this.renderString(buffer);
+  },
+
+  _rerenderString: function() {
+    var buffer = [];
+    this.renderString(buffer);
+    this.$().html(buffer.join(''));
+  },
+
+  rerenderString: function() {
+    Ember.run.once(this, '_rerenderString');
+  }
+
+});
diff --git a/app/assets/javascripts/discourse/models/category_list.js b/app/assets/javascripts/discourse/models/category_list.js
index c0478499d3..ee8b08c158 100644
--- a/app/assets/javascripts/discourse/models/category_list.js
+++ b/app/assets/javascripts/discourse/models/category_list.js
@@ -8,7 +8,7 @@
 **/
 Discourse.CategoryList = Ember.ArrayProxy.extend({
   init: function() {
-    this.content = [];
+    this.set('content', []);
     this._super();
   }
 });
diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js
index 164e3c604b..2d9523cace 100644
--- a/app/assets/javascripts/discourse/models/composer.js
+++ b/app/assets/javascripts/discourse/models/composer.js
@@ -100,33 +100,29 @@ Discourse.Composer = Discourse.Model.extend({
 
   hidePreview: Em.computed.not('showPreview'),
 
-  // Whether to disable the post button
+  // whether to disable the post button
   cantSubmitPost: function() {
-
-    // Can't submit while loading
+    // can't submit while loading
     if (this.get('loading')) return true;
 
-    // Title is required when:
-    //    - creating a new topic
-    //    - editing the 1st post
-    //    - creating a private message
-
+    // title is required when
+    //  - creating a new topic/private message
+    //  - editing the 1st post
     if (this.get('canEditTitle') && !this.get('titleLengthValid')) return true;
 
-    // Need at least one user when sending a private message
-    if ( this.get('creatingPrivateMessage') &&
-         this.get('targetUsernames') &&
-        (this.get('targetUsernames').trim() + ',').indexOf(',') === 0) {
-      return true;
-    }
-
     // reply is always required
     if (this.get('missingReplyCharacters') > 0) return true;
 
-    return this.get('canCategorize') &&
-        !Discourse.SiteSettings.allow_uncategorized_topics &&
-        !this.get('categoryId') &&
-        !Discourse.User.currentProp('staff');
+    if (this.get("privateMessage")) {
+      // need at least one user when sending a PM
+      return this.get('targetUsernames') && (this.get('targetUsernames').trim() + ',').indexOf(',') === 0;
+    } else {
+      // has a category? (when needed)
+      return this.get('canCategorize') &&
+            !Discourse.SiteSettings.allow_uncategorized_topics &&
+            !this.get('categoryId') &&
+            !Discourse.User.currentProp('staff');
+    }
   }.property('loading', 'canEditTitle', 'titleLength', 'targetUsernames', 'replyLength', 'categoryId', 'missingReplyCharacters'),
 
   /**
@@ -306,7 +302,18 @@ Discourse.Composer = Discourse.Model.extend({
       }
     }
 
+    if(opts && opts.space){
+      if(before.length > 0 && !before[before.length-1].match(/\s/)){
+        before = before + " ";
+      }
+      if(after.length > 0 && !after[0].match(/\s/)){
+        after = " " + after;
+      }
+    }
+
     this.set('reply', before + text + after);
+
+    return before.length + text.length;
   },
 
   togglePreview: function() {
diff --git a/app/assets/javascripts/discourse/models/post_stream.js b/app/assets/javascripts/discourse/models/post_stream.js
index 026b84e3cf..cfdfa67d6b 100644
--- a/app/assets/javascripts/discourse/models/post_stream.js
+++ b/app/assets/javascripts/discourse/models/post_stream.js
@@ -1,59 +1,17 @@
-/**
-  We use this class to keep on top of streaming and filtering posts within a topic.
-
-  @class PostStream
-  @extends Ember.Object
-  @namespace Discourse
-  @module Discourse
-**/
 Discourse.PostStream = Em.Object.extend({
 
-  /**
-    Are we currently loading posts in any way?
-
-    @property loading
-  **/
   loading: Em.computed.or('loadingAbove', 'loadingBelow', 'loadingFilter', 'stagingPost'),
-
   notLoading: Em.computed.not('loading'),
-
   filteredPostsCount: Em.computed.alias("stream.length"),
 
-  /**
-    Have we loaded any posts?
-
-    @property hasPosts
-  **/
-  hasPosts: function(){
+  hasPosts: function() {
     return this.get('posts.length') > 0;
   }.property("posts.@each"),
 
-  /**
-    Do we have a stream list of post ids?
-
-    @property hasStream
-  **/
   hasStream: Em.computed.gt('filteredPostsCount', 0),
-
-  /**
-    Can we append more posts to our current stream?
-
-    @property canAppendMore
-  **/
   canAppendMore: Em.computed.and('notLoading', 'hasPosts', 'lastPostNotLoaded'),
-
-  /**
-    Can we prepend more posts to our current stream?
-
-    @property canPrependMore
-  **/
   canPrependMore: Em.computed.and('notLoading', 'hasPosts', 'firstPostNotLoaded'),
 
-  /**
-    Have we loaded the first post in the stream?
-
-    @property firstPostPresent
-  **/
   firstPostPresent: function() {
     if (!this.get('hasLoadedData')) { return false; }
     return !!this.get('posts').findProperty('id', this.get('firstPostId'));
@@ -61,47 +19,22 @@ Discourse.PostStream = Em.Object.extend({
 
   firstPostNotLoaded: Em.computed.not('firstPostPresent'),
 
-  /**
-    The first post that we have loaded. Useful for checking to see if we should scroll upwards
-
-    @property firstLoadedPost
-  **/
   firstLoadedPost: function() {
     return _.first(this.get('posts'));
   }.property('posts.@each'),
 
-  /**
-    The last post we have loaded. Useful for checking to see if we should load more
-
-    @property lastLoadedPost
-  **/
   lastLoadedPost: function() {
     return _.last(this.get('posts'));
   }.property('posts.@each'),
 
-  /**
-    Returns the id of the first post in the set
-
-    @property firstPostId
-  **/
   firstPostId: function() {
     return this.get('stream')[0];
   }.property('stream.@each'),
 
-  /**
-    Returns the id of the last post in the set
-
-    @property lastPostId
-  **/
   lastPostId: function() {
     return _.last(this.get('stream'));
   }.property('stream.@each'),
 
-  /**
-    Have we loaded the last post in the stream?
-
-    @property loadedAllPosts
-  **/
   loadedAllPosts: function() {
     if (!this.get('hasLoadedData')) { return false; }
     return !!this.get('posts').findProperty('id', this.get('lastPostId'));
@@ -149,7 +82,7 @@ Discourse.PostStream = Em.Object.extend({
     var firstIndex = this.indexOf(firstPost);
     if (firstIndex === -1) { return []; }
 
-    var startIndex = firstIndex - Discourse.SiteSettings.posts_chunksize;
+    var startIndex = firstIndex - this.get('topic.chunk_size');
     if (startIndex < 0) { startIndex = 0; }
     return stream.slice(startIndex, firstIndex);
 
@@ -173,7 +106,7 @@ Discourse.PostStream = Em.Object.extend({
     if ((lastIndex + 1) >= this.get('highest_post_number')) { return []; }
 
     // find our window of posts
-    return stream.slice(lastIndex+1, lastIndex+Discourse.SiteSettings.posts_chunksize+1);
+    return stream.slice(lastIndex+1, lastIndex + this.get('topic.chunk_size') + 1);
   }.property('lastLoadedPost', 'stream.@each'),
 
 
@@ -527,7 +460,7 @@ Discourse.PostStream = Em.Object.extend({
     this.get('stream').removeObjects(postIds);
     this.get('posts').removeObjects(posts);
     postIds.forEach(function(id){
-      identityMap.remove(id);
+      identityMap.delete(id);
     });
   },
 
diff --git a/app/assets/javascripts/discourse/models/site.js b/app/assets/javascripts/discourse/models/site.js
index c66481c991..e81c16002b 100644
--- a/app/assets/javascripts/discourse/models/site.js
+++ b/app/assets/javascripts/discourse/models/site.js
@@ -1,11 +1,3 @@
-/**
-  A data model representing the site (instance of Discourse)
-
-  @class Site
-  @extends Discourse.Model
-  @namespace Discourse
-  @module Discourse
-**/
 Discourse.Site = Discourse.Model.extend({
 
   isReadOnly: Em.computed.alias('is_readonly'),
@@ -66,7 +58,12 @@ Discourse.Site = Discourse.Model.extend({
 
   updateCategory: function(newCategory) {
     var existingCategory = this.get('categories').findProperty('id', Em.get(newCategory, 'id'));
-    if (existingCategory) existingCategory.setProperties(newCategory);
+    if (existingCategory) {
+      // Don't update null permissions
+      if (newCategory.permission === null) { delete newCategory.permission; }
+
+      existingCategory.setProperties(newCategory);
+    }
   }
 });
 
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index 7088433927..47e36a415e 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -11,6 +11,9 @@ Discourse.User = Discourse.Model.extend({
   hasPMs: Em.computed.gt("private_messages_stats.all", 0),
   hasStartedPMs: Em.computed.gt("private_messages_stats.mine", 0),
   hasUnreadPMs: Em.computed.gt("private_messages_stats.unread", 0),
+  hasPosted: Em.computed.gt("post_count", 0),
+  hasNotPosted: Em.computed.not("hasPosted"),
+  canBeDeleted: Em.computed.and("can_be_deleted", "hasNotPosted"),
 
   /**
     The user's stream
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 794448f8d1..83f8a53a7e 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -15,7 +15,7 @@ var ApplicationRoute = Discourse.Route.extend({
     composePrivateMessage: function(user) {
       var self = this;
       this.transitionTo('userActivity', user).then(function () {
-        self.controllerFor('user-activity').send('composePrivateMessage');
+        self.controllerFor('user-activity').send('composePrivateMessage', user);
       });
     },
 
@@ -27,10 +27,16 @@ var ApplicationRoute = Discourse.Route.extend({
       }
 
       var exceptionController = this.controllerFor('exception'),
-          errorString = err.toString();
-      if (err.statusText) {
-        errorString = err.statusText;
-      }
+          errorString = err.toString(),
+          stack = err.stack;
+
+      // If we have a stack call `toString` on it. It gives us a better
+      // stack trace since `console.error` uses the stack track of this
+      // error callback rather than the original error.
+      if (stack) { errorString = stack.toString(); }
+
+      if (err.statusText) { errorString = err.statusText; }
+
       var c = window.console;
       if (c && c.error) {
         c.error(errorString);
diff --git a/app/assets/javascripts/discourse/routes/build-user-topic-list-route.js.es6 b/app/assets/javascripts/discourse/routes/build-user-topic-list-route.js.es6
index a65533f9e0..ae1ff7ba3b 100644
--- a/app/assets/javascripts/discourse/routes/build-user-topic-list-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-user-topic-list-route.js.es6
@@ -25,7 +25,12 @@ export default function (viewName, path) {
         showParticipants: true
       });
 
-      this.controllerFor('user').set("pmView", viewName);
+      this.controllerFor('user').set('pmView', viewName);
+      this.controllerFor('search').set('contextType', 'private_messages');
+    },
+
+    deactivate: function(){
+      this.controllerFor('search').set('contextType', 'user');
     }
   });
 }
diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6
index 910abb196f..e72b26d9b7 100644
--- a/app/assets/javascripts/discourse/routes/user.js.es6
+++ b/app/assets/javascripts/discourse/routes/user.js.es6
@@ -15,11 +15,11 @@ export default Discourse.Route.extend({
       Discourse.logout();
     },
 
-    composePrivateMessage: function() {
-      var user = this.modelFor('user');
+    composePrivateMessage: function(user) {
+      var recipient = user ? user.get('username') : '';
       return this.controllerFor('composer').open({
         action: Discourse.Composer.PRIVATE_MESSAGE,
-        usernames: user.get('username'),
+        usernames: recipient,
         archetypeId: 'private_message',
         draftKey: 'new_private_message'
       });
diff --git a/app/assets/javascripts/discourse/templates/about.hbs b/app/assets/javascripts/discourse/templates/about.hbs
index 09b02a525c..030eb611a7 100644
--- a/app/assets/javascripts/discourse/templates/about.hbs
+++ b/app/assets/javascripts/discourse/templates/about.hbs
@@ -1,12 +1,12 @@
 <div class='container body-page'>
   <section class='about'>
-    <h2>{{i18n about.title title=title}}</h2>
+    <h2>{{i18n 'about.title' title=title}}</h2>
     <p>{{description}}</p>
   </section>
 
   {{#if admins}}
     <section class='about admins'>
-      <h3>{{i18n about.our_admins}}</h3>
+      <h3>{{i18n 'about.our_admins'}}</h3>
 
       {{#each admins}}
         {{user-small user=this}}
@@ -18,7 +18,7 @@
 
   {{#if moderators}}
     <section class='about moderators'>
-      <h3>{{i18n about.our_moderators}}</h3>
+      <h3>{{i18n 'about.our_moderators'}}</h3>
 
       <div class='users'>
         {{#each moderators}}
@@ -30,35 +30,35 @@
   {{/if}}
 
   <section class='about stats'>
-    <h3>{{i18n about.stats}}</h3>
+    <h3>{{i18n 'about.stats'}}</h3>
 
     <table class='table'>
       <tr>
         <th>&nbsp;</th>
-        <th>{{i18n about.stat.all_time}}</th>
-        <th>{{i18n about.stat.last_7_days}}</th>
+        <th>{{i18n 'about.stat.all_time'}}</th>
+        <th>{{i18n 'about.stat.last_7_days'}}</th>
+      </tr>
       <tr>
-        <td class='title'>{{i18n about.topic_count}}</td>
+        <td class='title'>{{i18n 'about.topic_count'}}</td>
         <td>{{number stats.topic_count}}</td>
         <td>{{number stats.topics_7_days}}</td>
       </tr>
       <tr>
-        <td>{{i18n about.post_count}}</td>
+        <td>{{i18n 'about.post_count'}}</td>
         <td>{{number stats.post_count}}</td>
         <td>{{number stats.posts_7_days}}</td>
       </tr>
       <tr>
-        <td>{{i18n about.user_count}}</td>
+        <td>{{i18n 'about.user_count'}}</td>
         <td>{{number stats.user_count}}</td>
         <td>{{number stats.users_7_days}}</td>
       </tr>
       <tr>
-        <td>{{i18n about.like_count}}</td>
+        <td>{{i18n 'about.like_count'}}</td>
         <td>{{number stats.like_count}}</td>
         <td>{{number stats.likes_7_days}}</td>
       </tr>
     </table>
-    </table>
   </section>
 
 </div>
diff --git a/app/assets/javascripts/discourse/templates/badges/index.hbs b/app/assets/javascripts/discourse/templates/badges/index.hbs
index 35b52a7fe6..a69a185277 100644
--- a/app/assets/javascripts/discourse/templates/badges/index.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/index.hbs
@@ -1,5 +1,5 @@
 <div class='container badges'>
-  <h1>{{i18n badges.title}}</h1>
+  <h1>{{i18n 'badges.title'}}</h1>
 
   <table class='badges-listing'>
     <tbody>
@@ -12,7 +12,7 @@
             <td class='granted'>{{#if this.has_badge}}<i class='fa fa-check'></i>{{/if}}</td>
             <td class='badge'>{{user-badge badge=this}}</td>
             <td class='description'>{{{displayDescriptionHtml}}}</td>
-            <td class='grant-count'><span title="{{i18n badges.granted count=grant_count}}">{{grant_count}}</span></td>
+            <td class='grant-count'><span title="{{i18n 'badges.granted' count=grant_count}}">{{grant_count}}</span></td>
           </tr>
         {{/each}}
       {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/badges/show.hbs b/app/assets/javascripts/discourse/templates/badges/show.hbs
index 85dc9da6a7..7d69a13889 100644
--- a/app/assets/javascripts/discourse/templates/badges/show.hbs
+++ b/app/assets/javascripts/discourse/templates/badges/show.hbs
@@ -1,6 +1,6 @@
 <div class='container show-badge'>
   <h1>
-    {{#link-to 'badges.index'}}{{i18n badges.title}}{{/link-to}}
+    {{#link-to 'badges.index'}}{{i18n 'badges.title'}}{{/link-to}}
     <i class='fa fa-angle-right'></i>
     {{displayName}}
   </h1>
@@ -10,8 +10,8 @@
       <tr>
         <td class='badge'>{{user-badge badge=this}}</td>
         <td class='description'>{{displayDescription}}</td>
-        <td class='grant-count'>{{i18n badges.granted count=grant_count}}</td>
-        <td class='info'>{{i18n badges.allow_title}} {{{view.allowTitle}}}<br>{{i18n badges.multiple_grant}} {{{view.multipleGrant}}}
+        <td class='grant-count'>{{i18n 'badges.granted' count=grant_count}}</td>
+        <td class='info'>{{i18n 'badges.allow_title'}} {{{view.allowTitle}}}<br>{{i18n 'badges.multiple_grant'}} {{{view.multipleGrant}}}
         </td>
       </tr>
     </tbody>
diff --git a/app/assets/javascripts/discourse/templates/choose_topic.hbs b/app/assets/javascripts/discourse/templates/choose_topic.hbs
index c06bca4cc5..d098ea8b3a 100644
--- a/app/assets/javascripts/discourse/templates/choose_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/choose_topic.hbs
@@ -1,12 +1,12 @@
-<label for='choose-topic-title'>{{i18n choose_topic.title.search}}</label>
+<label for='choose-topic-title'>{{i18n 'choose_topic.title.search'}}</label>
 
 {{text-field value=view.topicTitle placeholderKey="choose_topic.title.placeholder" id="choose-topic-title"}}
 
 {{#if view.loading}}
-  <p>{{i18n loading}}</p>
+  <p>{{i18n 'loading'}}</p>
 {{else}}
   {{#if view.noResults}}
-    <p>{{i18n choose_topic.none_found}}</p>
+    <p>{{i18n 'choose_topic.none_found'}}</p>
   {{else}}
     {{#each view.topics}}
       <div class='controls'>
diff --git a/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs b/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs
index c6fe0211cb..7d5f954ad1 100644
--- a/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/auto-close-form.hbs
@@ -2,7 +2,7 @@
   <div>
     <label>
       {{fa-icon clock-o}}
-      {{i18n composer.auto_close.label}}
+      {{i18n 'composer.auto_close.label'}}
       {{text-field value=autoCloseTime}}
       {{autoCloseUnits}}
     </label>
@@ -13,7 +13,7 @@
   <div>
     <label>
       {{input type="checkbox" name="autoCloseBasedOnLastPost" checked=autoCloseBasedOnLastPost}}
-      {{i18n composer.auto_close.based_on_last_post}}
+      {{i18n 'composer.auto_close.based_on_last_post'}}
     </label>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
index 80c9517a18..028b30eab5 100644
--- a/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/avatar-uploader.hbs
@@ -1,10 +1,10 @@
 <input type="file" accept="image/*" style="display:none" />
-<button class="btn" {{action "selectFile"}} {{bind-attr disabled="uploading"}} title="{{i18n user.change_avatar.upload_title}}">
+<button class="btn" {{action "selectFile"}} {{bind-attr disabled="uploading"}} title="{{i18n 'user.change_avatar.upload_title'}}">
   <i class="fa fa-picture-o"></i>&nbsp;{{uploadButtonText}}
 </button>
 {{#if uploading}}
-  <span>{{i18n upload_selector.uploading}} {{view.uploadProgress}}%</span>
+  <span>{{i18n 'upload_selector.uploading'}} {{view.uploadProgress}}%</span>
 {{/if}}
 {{#if imageIsNotASquare}}
-  <div class="warning">{{i18n user.change_avatar.image_is_not_a_square}}</div>
+  <div class="warning">{{i18n 'user.change_avatar.image_is_not_a_square'}}</div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
index a29a6b4f90..1cd3fbc1ca 100644
--- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs
@@ -3,16 +3,16 @@
     <table class="topic-list">
       <thead>
         <tr>
-          <th class="default">{{i18n topic.title}}</th>
+          <th class="default">{{i18n 'topic.title'}}</th>
           {{#unless controller.hideCategory}}
-            <th class="category">{{i18n category_title}}</th>
+            <th class="category">{{i18n 'category_title'}}</th>
           {{/unless}}
-          <th class="num posts">{{i18n posts}}</th>
+          <th class="num posts">{{i18n 'posts'}}</th>
           {{#if controller.showParticipants}}
-            <th class="posters">{{i18n users}}</th>
+            <th class="posters">{{i18n 'users'}}</th>
           {{/if}}
-          <th class="num views">{{i18n views}}</th>
-          <th class="num activity">{{i18n activity}}</th>
+          <th class="num views">{{i18n 'views'}}</th>
+          <th class="num activity">{{i18n 'activity'}}</th>
         </tr>
       </thead>
 
@@ -52,7 +52,7 @@
     </table>
   {{else}}
     <div class='alert alert-info'>
-      {{i18n choose_topic.none_found}}
+      {{i18n 'choose_topic.none_found'}}
     </div>
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/components/category-drop.hbs b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
index 835e9ceb7e..d9412d0e84 100644
--- a/app/assets/javascripts/discourse/templates/components/category-drop.hbs
+++ b/app/assets/javascripts/discourse/templates/components/category-drop.hbs
@@ -7,7 +7,7 @@
   </a>
 {{else}}
   {{#if noSubcategories}}
-    <a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{i18n categories.no_subcategory}}</a>
+    <a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{i18n 'categories.no_subcategory'}}</a>
   {{else}}
     <a href='#' {{action "expand"}} class='badge-category home' {{bind-attr style="badgeStyle"}}>{{allCategoriesLabel}}</a>
   {{/if}}
@@ -18,7 +18,7 @@
   <section {{bind-attr class="expanded::hidden :category-dropdown-menu"}} class='chooser'>
     <div class='cat'><a {{bind-attr href=allCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{allCategoriesLabel}}</a></div>
     {{#if subCategory}}
-    <div class='cat'><a {{bind-attr href=noCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{i18n categories.no_subcategory}}</a></div>
+    <div class='cat'><a {{bind-attr href=noCategoriesUrl}} data-drop-close="true" class='badge-category home'>{{i18n 'categories.no_subcategory'}}</a></div>
     {{/if}}
     {{#if renderCategories}}
     {{#each categories}}<div class='cat'>{{category-link this allowUncategorized=true}}</div>{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
index c675c2f5e8..825bcc44be 100644
--- a/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
+++ b/app/assets/javascripts/discourse/templates/components/discourse-banner.hbs
@@ -1,7 +1,7 @@
 <div class="row">
   <div id="banner" {{bind-attr class="overlay"}}>
     <div id="banner-content">
-      <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n banner.close}}"></i></div>
+      <div class="close" {{action "dismiss"}}><i class="fa fa-times" title="{{i18n 'banner.close'}}"></i></div>
       {{{banner.html}}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
index 67ba6ca3e2..8820b7c6fa 100644
--- a/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
+++ b/app/assets/javascripts/discourse/templates/components/image-uploader.hbs
@@ -5,6 +5,6 @@
   {{#if backgroundStyle}}
     <button {{action "trash"}} class="btn btn-danger pad-left no-text"><i class="fa fa-trash-o"></i></button>
   {{/if}}
-  <span {{bind-attr class=":btn uploading::hidden"}}>{{i18n upload_selector.uploading}} {{uploadProgress}}%</span>
+  <span {{bind-attr class=":btn uploading::hidden"}}>{{i18n 'upload_selector.uploading'}} {{uploadProgress}}%</span>
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
index 396235b569..d34809fa61 100644
--- a/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
+++ b/app/assets/javascripts/discourse/templates/components/ip-lookup.hbs
@@ -1,36 +1,36 @@
 {{#if ip}}
   <button class="btn" {{action "lookup"}}>
-    {{fa-icon "globe"}}{{i18n admin.user.ip_lookup}}
+    {{fa-icon "globe"}}{{i18n 'admin.user.ip_lookup'}}
   </button>
 {{/if}}
 {{#if show}}
   <div class="location-box">
     <a class="close pull-right" {{action "hide"}}>{{fa-icon "times"}}</a>
-    <h4>{{i18n ip_lookup.title}}</h4>
+    <h4>{{i18n 'ip_lookup.title'}}</h4>
     <dl>
       {{#if location}}
         {{#if location.hostname}}
-          <dt>{{i18n ip_lookup.hostname}}</dt>
+          <dt>{{i18n 'ip_lookup.hostname'}}</dt>
           <dd>{{location.hostname}}</dd>
         {{/if}}
 
-        <dt>{{i18n ip_lookup.location}}</dt>
+        <dt>{{i18n 'ip_lookup.location'}}</dt>
         <dd>
           {{#if location.loc}}
             <a href="https://maps.google.com/maps?q={{unbound location.loc}}" target="_blank">{{location.loc}}</a><br>
             {{city}}
           {{else}}
-            {{i18n ip_lookup.location_not_found}}
+            {{i18n 'ip_lookup.location_not_found'}}
           {{/if}}
         </dd>
 
         {{#if location.org}}
-          <dt>{{i18n ip_lookup.organisation}}</dt>
+          <dt>{{i18n 'ip_lookup.organisation'}}</dt>
           <dd>{{location.org}}</dd>
         {{/if}}
 
         {{#if location.phone}}
-          <dt>{{i18n ip_lookup.phone}}</dt>
+          <dt>{{i18n 'ip_lookup.phone'}}</dt>
           <dd>{{location.phone}}</dd>
         {{/if}}
       {{else}}
@@ -38,11 +38,11 @@
       {{/if}}
 
       <dt>
-        {{i18n ip_lookup.other_accounts}}
+        {{i18n 'ip_lookup.other_accounts'}}
         <strong>{{totalOthersWithSameIP}}</strong>
         {{#if other_accounts.length}}
           <button class="btn btn-danger pull-right" {{action "deleteOtherAccounts"}}>
-            {{fa-icon "warning"}}{{i18n ip_lookup.delete_other_accounts count=otherAccountsToDelete}}
+            {{fa-icon "warning"}}{{i18n 'ip_lookup.delete_other_accounts' count=otherAccountsToDelete}}
           </button>
         {{/if}}
       </dt>
@@ -52,11 +52,11 @@
             <table class="table table-condensed table-hover">
               <thead>
                 <tr>
-                  <th>{{i18n ip_lookup.username}}</th>
-                  <th>{{i18n ip_lookup.trust_level}}</th>
-                  <th>{{i18n ip_lookup.read_time}}</th>
-                  <th>{{i18n ip_lookup.topics_entered}}</th>
-                  <th>{{i18n ip_lookup.post_count}}</th>
+                  <th>{{i18n 'ip_lookup.username'}}</th>
+                  <th>{{i18n 'ip_lookup.trust_level'}}</th>
+                  <th>{{i18n 'ip_lookup.read_time'}}</th>
+                  <th>{{i18n 'ip_lookup.topics_entered'}}</th>
+                  <th>{{i18n 'ip_lookup.post_count'}}</th>
                 </tr>
               </thead>
               <tbody>
diff --git a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
index 54360aea35..87551bc801 100644
--- a/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/private-message-map.hbs
@@ -1,4 +1,4 @@
-<h3><i class='fa fa-envelope'></i> {{i18n private_message_info.title}}</h3>
+<h3><i class='fa fa-envelope'></i> {{i18n 'private_message_info.title'}}</h3>
 <div class='participants clearfix'>
   {{#each details.allowed_groups}}
     <div class='user group'>
@@ -21,6 +21,6 @@
 </div>
 {{#if details.can_invite_to}}
   <div class='controls'>
-    <button class='btn' {{action "showPrivateInvite"}}>{{i18n private_message_info.invite}}</button>
+    <button class='btn' {{action "showPrivateInvite"}}>{{i18n 'private_message_info.invite'}}</button>
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs b/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
index d4a7df9a96..5f58a282c4 100644
--- a/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
+++ b/app/assets/javascripts/discourse/templates/components/screened-ip-address-form.hbs
@@ -1,4 +1,4 @@
-<b>{{i18n admin.logs.screened_ips.form.label}}</b>
+<b>{{i18n 'admin.logs.screened_ips.form.label'}}</b>
 {{text-field value=ip_address disabled=formSubmitted class="ip-address-input" placeholderKey="admin.logs.screened_ips.form.ip_address" autocorrect="off" autocapitalize="off"}}
 {{combo-box content=actionNames value=actionName}}
-<button class="btn" {{action "submit" target="view"}} {{bind-attr disabled="formSubmitted"}}>{{i18n admin.logs.screened_ips.form.add}}</button>
+<button class="btn" {{action "submit" target="view"}} {{bind-attr disabled="formSubmitted"}}>{{i18n 'admin.logs.screened_ips.form.add'}}</button>
diff --git a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs b/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
index c6b6d21c39..5475461580 100644
--- a/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
+++ b/app/assets/javascripts/discourse/templates/components/toggle-deleted.hbs
@@ -1,7 +1,7 @@
 {{#if postStream.show_deleted}}
-  <p>{{i18n deleted_filter.disabled_description}}</p>
-  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n deleted_filter.enable}}</button>
+  <p>{{i18n 'deleted_filter.disabled_description'}}</p>
+  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n 'deleted_filter.enable'}}</button>
 {{else}}
-  <p>{{i18n deleted_filter.enabled_description}}</p>
-  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n deleted_filter.disable}}</button>
+  <p>{{i18n 'deleted_filter.enabled_description'}}</p>
+  <button class='btn btn-danger' {{action "toggleDeleted"}}>{{i18n 'deleted_filter.disable'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs b/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
index bfc26874f5..803a45f478 100644
--- a/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
+++ b/app/assets/javascripts/discourse/templates/components/toggle-summary.hbs
@@ -1,12 +1,12 @@
 {{#if postStream.summary}}
-  <p>{{{i18n summary.enabled_description}}}</p>
-  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n summary.disable}}</button>
+  <p>{{{i18n 'summary.enabled_description'}}}</p>
+  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n 'summary.disable'}}</button>
 {{else}}
   {{#if topic.estimatedReadingTime}}
-    <p>{{{i18n summary.description_time count="topic.posts_count" readingTime="topic.estimatedReadingTime"}}}</p>
+    <p>{{{i18n 'summary.description_time' count="topic.posts_count" readingTime="topic.estimatedReadingTime"}}}</p>
   {{else}}
-    <p>{{{i18n summary.description count="topic.posts_count"}}}</p>
+    <p>{{{i18n 'summary.description' count="topic.posts_count"}}}</p>
   {{/if}}
 
-  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n summary.enable}}</button>
+  <button class='btn btn-primary' {{action "toggleSummary"}}>{{i18n 'summary.enable'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
index 1ea79eb44f..e26d698d38 100644
--- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs
+++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs
@@ -1,5 +1,5 @@
 <nav class='buttons'>
-  <button class='btn' {{action "toggleMap"}} title="{{i18n topic.toggle_information}}">
+  <button class='btn' {{action "toggleMap"}} title="{{i18n 'topic.toggle_information'}}">
     <i {{bind-attr class=":fa toggleMapClass"}}></i>
   </button>
 </nav>
@@ -8,40 +8,40 @@
   <ul class="clearfix">
     <li>
       <a href='{{unbound topic.url}}'>
-      <h4>{{i18n created_lowercase}}</h4>
+      <h4>{{i18n 'created_lowercase'}}</h4>
       {{avatar details.created_by imageSize="tiny"}}
       {{format-date topic.created_at}}
       </a>
     </li>
     <li>
       <a {{bind-attr href="topic.lastPostUrl"}}>
-      <h4>{{i18n last_post_lowercase}}</h4>
+      <h4>{{i18n 'last_post_lowercase'}}</h4>
       {{avatar details.last_poster imageSize="tiny"}}
       {{format-date topic.last_posted_at}}
       </a>
     </li>
     <li>
       {{posts-count-column topic=topic tagName="span"}}
-      <h4>{{i18n posts_lowercase}}</h4>
+      <h4>{{i18n 'posts_lowercase'}}</h4>
     </li>
     <li class='secondary'>
       {{number topic.views class=topic.viewsHeat}}
-      <h4>{{i18n views_lowercase}}</h4>
+      <h4>{{i18n 'views_lowercase'}}</h4>
     </li>
     <li class='secondary'>
       {{number topic.participant_count}}
-      <h4>{{i18n users_lowercase}}</h4>
+      <h4>{{i18n 'users_lowercase'}}</h4>
     </li>
     {{#if topic.like_count}}
       <li class='secondary'>
         {{number topic.like_count}}
-        <h4>{{i18n likes_lowercase}}</h4>
+        <h4>{{i18n 'likes_lowercase'}}</h4>
       </li>
     {{/if}}
     {{#if details.links.length}}
       <li class='secondary'>
         {{number details.links.length}}
-        <h4>{{i18n links_lowercase}}</h4>
+        <h4>{{i18n 'links_lowercase'}}</h4>
       </li>
     {{/if}}
     {{#if showPosterAvatar}}
@@ -68,7 +68,7 @@
           {{#each infoLinks}}
             <tr>
             <td>
-              <span class='badge badge-notification clicks' title='{{i18n topic_map.clicks count=clicks}}'>{{clicks}}</span>
+              <span class='badge badge-notification clicks' title='{{i18n 'topic_map.clicks' count=clicks}}'>{{clicks}}</span>
             </td>
             <td>
               <a href="{{unbound url}}" target="_blank" class='topic-link track-link' data-user-id="{{unbound user_id}}" data-ignore-post-id="true" title="{{unbound url}}">
@@ -82,7 +82,7 @@
 
         {{#if showAllLinksControls}}
           <div class='link-summary'>
-            <a href='#' {{action "showAllLinks"}}>{{i18n topic_map.links_shown totalLinks="details.links.length"}}</a>
+            <a href='#' {{action "showAllLinks"}}>{{i18n 'topic_map.links_shown' totalLinks="details.links.length"}}</a>
           </div>
         {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs
index d605773741..9d068ec8d8 100644
--- a/app/assets/javascripts/discourse/templates/composer.hbs
+++ b/app/assets/javascripts/discourse/templates/composer.hbs
@@ -1,3 +1,4 @@
+{{#if visible}}
 <div class='composer-loading'>
   {{loading-spinner}}
 </div>
@@ -7,7 +8,7 @@
   {{render "composer-messages"}}
 
   <div class='control'>
-    <a href='#' class='toggler' {{action "toggle" bubbles=false}} title='{{i18n composer.toggler}}'></a>
+    <a href='#' class='toggler' {{action "toggle" bubbles=false}} title='{{i18n 'composer.toggler'}}'></a>
 
     {{#if model.viewOpen}}
       <div class='control-row reply-area'>
@@ -21,7 +22,7 @@
                 {{text-field value=editReason tabindex="7" id="edit-reason" maxlength="255" placeholderKey="composer.edit_reason_placeholder"}}
               </div>
             {{else}}
-              <a {{action "displayEditReason"}} class="display-edit-reason">{{i18n composer.show_edit_reason}}</a>
+              <a {{action "displayEditReason"}} class="display-edit-reason">{{i18n 'composer.show_edit_reason'}}</a>
             {{/if}}
           {{/if}}
         </div>
@@ -58,7 +59,7 @@
                 {{popupInputTip validation=view.categoryValidation shownAt=view.showCategoryTip}}
               </div>
               {{#if model.archetype.hasOptions}}
-                <button class='btn' {{action "showOptions"}}>{{i18n topic.options}}</button>
+                <button class='btn' {{action "showOptions"}}>{{i18n 'topic.options'}}</button>
               {{/if}}
               {{render "additional-composer-buttons" model}}
             {{/unless}}
@@ -79,10 +80,10 @@
           <div class="composer-bottom-right">
             <a href="#" {{action "togglePreview"}} class='toggle-preview'>{{{model.toggleText}}}</a>
             <div id="file-uploading" {{bind-attr class="view.isUploading::hidden"}}>
-              {{loading-spinner size="small"}} {{i18n upload_selector.uploading}} {{view.uploadProgress}}% <a id="cancel-file-upload">{{i18n cancel}}</a>
+              {{loading-spinner size="small"}} {{i18n 'upload_selector.uploading'}} {{view.uploadProgress}}% <a id="cancel-file-upload">{{i18n 'cancel'}}</a>
             </div>
             {{#if site.mobileView}}
-              <a {{bind-attr class=":mobile-file-upload view.isUploading:hidden"}}>{{i18n upload}}</a>
+              <a {{bind-attr class=":mobile-file-upload view.isUploading:hidden"}}>{{i18n 'upload'}}</a>
               <input type="file" id="mobile-uploader" />
             {{/if}}
             <div id='draft-status'>{{model.draftStatus}}</div>
@@ -91,8 +92,8 @@
 
         {{#if currentUser}}
           <div class='submit-panel'>
-            <button {{action "save"}} tabindex="5" {{bind-attr class=":btn :btn-primary :create disableSubmit:disabled"}} title="{{i18n composer.title}}">{{{model.saveIcon}}}{{model.saveText}}</button>
-            <a href='#' {{action "cancel"}} class='cancel' tabindex="6">{{i18n cancel}}</a>
+            <button {{action "save"}} tabindex="5" {{bind-attr class=":btn :btn-primary :create disableSubmit:disabled"}} title="{{i18n 'composer.title'}}">{{{model.saveIcon}}}{{model.saveText}}</button>
+            <a href='#' {{action "cancel"}} class='cancel' tabindex="6">{{i18n 'cancel'}}</a>
           </div>
         {{/if}}
 
@@ -102,13 +103,13 @@
         <div class='span24'>
           <div class='saving-text'>
             {{#if model.createdPost}}
-              {{i18n composer.saved}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n composer.view_new_post}}</a>
+              {{i18n 'composer.saved'}} <a class='permalink' href="{{unbound createdPost.url}}" {{action "viewNewReply"}}>{{i18n 'composer.view_new_post'}}</a>
             {{else}}
-              {{i18n composer.saving}}
+              {{i18n 'composer.saving'}}
             {{/if}}
           </div>
           <div class='draft-text'>
-            {{i18n composer.saved_draft}}
+            {{i18n 'composer.saved_draft'}}
           </div>
         </div>
       </div>
@@ -116,3 +117,4 @@
 
   </div>
 </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
index 9f8776c21f..06806e2754 100644
--- a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
+++ b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs
@@ -1,8 +1,8 @@
 <a href='#' {{action "closeMessage" this}} class='close'><i class='fa fa-times-circle'></i></a>
-<h3>{{i18n composer.similar_topics}}</h3>
+<h3>{{i18n 'composer.similar_topics'}}</h3>
 
 <ul class='topics'>
   {{#each similarTopics}}
-    <li>{{topic-link this}} <span class='posts-count'>({{{i18n topic.filters.n_posts count="posts_count"}}})</span></li>
+    <li>{{topic-link this}} <span class='posts-count'>({{{i18n 'topic.filters.n_posts' count="posts_count"}}})</span></li>
   {{/each}}
 </ul>
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 04c3e4e5e5..b370b38ee4 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -6,7 +6,7 @@
 
 <div class='list-controls'>
   <div class="container">
-    {{outlet navigation-bar}}
+    {{outlet "navigation-bar"}}
   </div>
 </div>
 
@@ -16,14 +16,14 @@
   <div class="row">
     <div class="full-width">
       <div id='header-list-area'>
-        {{outlet header-list-container}}
+        {{outlet "header-list-container"}}
       </div>
     </div>
   </div>
   <div class="row">
     <div class="full-width">
       <div id='list-area'>
-        {{outlet list-container}}
+        {{outlet "list-container"}}
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
index acf40a5011..788d1d72bc 100644
--- a/app/assets/javascripts/discourse/templates/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/categories.hbs
@@ -3,9 +3,9 @@
     <table class='topic-list categories'>
       <thead>
         <tr>
-          <th class='category'>{{i18n categories.category}}</th>
-          <th class='latest'>{{i18n categories.latest}}</th>
-          <th class='stats topics'>{{i18n categories.topics}}</th>
+          <th class='category'>{{i18n 'categories.category'}}</th>
+          <th class='latest'>{{i18n 'categories.latest'}}</th>
+          <th class='stats topics'>{{i18n 'categories.topics'}}</th>
         </tr>
       </thead>
       <tbody>
@@ -16,10 +16,10 @@
               <div class="pull-left">
                 {{category-title-link category=this}}
                 {{#if unreadTopics}}
-                  <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{i18n filters.unread.lower_title_with_count count="unreadTopics"}}</a>
+                  <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n 'topic.unread_topics' count="unreadTopics"}}'>{{i18n 'filters.unread.lower_title_with_count' count="unreadTopics"}}</a>
                 {{/if}}
                 {{#if newTopics}}
-                  <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{i18n filters.new.lower_title_with_count count="newTopics"}}</a>
+                  <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n 'topic.new_topics' count="newTopics"}}'>{{i18n 'filters.new.lower_title_with_count' count="newTopics"}}</a>
                 {{/if}}
               </div>
               <div class="clearfix"></div>
@@ -34,10 +34,10 @@
                 {{#each subcategories}}
                   {{category-link this showParent=true onlyStripe=true}}
                   {{#if unreadTopics}}
-                    <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n topic.unread_topics count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
+                    <a href={{unbound unreadUrl}} class='badge new-posts badge-notification' title='{{i18n 'topic.unread_topics' count="unreadTopics"}}'>{{unbound unreadTopics}}</a>
                   {{/if}}
                   {{#if newTopics}}
-                    <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n topic.new_topics count="newTopics"}}'>{{unbound newTopics}}</a>
+                    <a href={{unbound newUrl}} class='badge new-posts badge-notification' title='{{i18n 'topic.new_topics' count="newTopics"}}'>{{unbound newTopics}}</a>
                   {{/if}}
                 {{/each}}
               </div>
@@ -52,7 +52,7 @@
 
                 {{#if controller.latestTopicOnly}}
                   <div class='last-user-info'>
-                    {{i18n categories.latest_by}} <a href="{{{unbound lastPosterUrl}}}">{{unbound last_poster.username}}</a>
+                    {{i18n 'categories.latest_by'}} <a href="{{{unbound lastPosterUrl}}}">{{unbound last_poster.username}}</a>
                     <a href="{{unbound lastPostUrl}}">{{format-age last_posted_at}}</a>
                   </div>
                 {{else}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index a122bc2a58..82ad64c58f 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -5,11 +5,11 @@
 {{#if showDismissAtTop}}
   <div class="row">
     {{#if showDismissRead}}
-      <button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics-top' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
-      <button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts-top' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_topics_tooltip'}}" id='dismiss-topics-top' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n 'topics.bulk.dismiss_topics'}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_posts_tooltip'}}" id='dismiss-posts-top' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n 'topics.bulk.dismiss_posts'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}>{{i18n topics.bulk.dismiss_new}}</button>
+      <button id='dismiss-new-top' class='btn dismiss-read' {{action "resetNew"}}>{{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
   </div>
 {{/if}}
@@ -30,7 +30,7 @@
     <div class="show-more">
       <div class='alert alert-info clickable' {{action "showInserted"}}>
         {{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
-        {{i18n click_to_show}}
+        {{i18n 'click_to_show'}}
       </div>
     </div>
   {{/if}}
@@ -41,25 +41,25 @@
           {{#if currentUser}}
           <th class='star'>
             {{#if canBulkSelect}}
-            <button class='btn bulk-select' {{action "toggleBulkSelect"}} title="{{i18n topics.bulk.toggle}}"><i class='fa fa-list'></i></button>
+            <button class='btn bulk-select' {{action "toggleBulkSelect"}} title="{{i18n 'topics.bulk.toggle'}}"><i class='fa fa-list'></i></button>
             {{/if}}
           </th>
           {{/if}}
-          {{#sortable-heading class="default"}} {{i18n topic.title}} {{/sortable-heading}}
+          {{#sortable-heading class="default"}} {{i18n 'topic.title'}} {{/sortable-heading}}
           {{#unless controller.hideCategory}}
             {{#sortable-heading sortBy="category" action="changeSort" order=order ascending=ascending}}
-              {{i18n category_title}}
+              {{i18n 'category_title'}}
             {{/sortable-heading}}
           {{/unless}}
-          {{#sortable-heading class="posters"}} {{i18n users}} {{/sortable-heading}}
+          {{#sortable-heading class="posters"}} {{i18n 'users'}} {{/sortable-heading}}
           {{#sortable-heading sortBy="posts" number=true action="changeSort" order=order ascending=ascending}}
-            {{i18n posts}}
+            {{i18n 'posts'}}
           {{/sortable-heading}}
           {{#sortable-heading sortBy="views" number=true action="changeSort" order=order ascending=ascending}}
-            {{i18n views}}
+            {{i18n 'views'}}
           {{/sortable-heading}}
           {{#sortable-heading sortBy="activity" number=true action="changeSort" order=order ascending=ascending}}
-            {{i18n activity}}
+            {{i18n 'activity'}}
           {{/sortable-heading}}
         </tr>
       </thead>
@@ -74,11 +74,11 @@
   {{loading-spinner condition=loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
-      <button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
-      <button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_topics_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n 'topics.bulk.dismiss_topics'}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_posts_tooltip'}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n 'topics.bulk.dismiss_posts'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n topics.bulk.dismiss_new}}</button>
+      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
 
     {{#if latest}}
@@ -87,12 +87,12 @@
       </div>
       <h3>
         {{footerMessage}}
-        {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n topic.suggest_create_topic}}</a>{{/if}}
+        {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
       </h3>
     {{else}}
       {{#if top}}
         <h3>
-          {{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}} {{i18n or}} {{i18n filters.top.other_periods}}
+          {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
         {{top-period-buttons period=period}}
         </h3>
       {{else}}
@@ -100,7 +100,7 @@
             {{{footerEducation}}}
         </div>
         <h3>
-          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}
+          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
         </h3>
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/embedded_post.hbs b/app/assets/javascripts/discourse/templates/embedded_post.hbs
index 6deb81d0c7..1cb4e3c7c1 100644
--- a/app/assets/javascripts/discourse/templates/embedded_post.hbs
+++ b/app/assets/javascripts/discourse/templates/embedded_post.hbs
@@ -2,17 +2,17 @@
   <div class='topic-avatar'>
     <div class='contents'>
       <div>
-        {{poster-avatar post=this classNames="main-avatar"}}
+        {{raw "post/poster-avatar" post=this classNames="main-avatar"}}
       </div>
     </div>
   </div>
   <div class='topic-body'>
     <div class="topic-meta-data">
       {{poster-name post=this}}
-      {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n topic.jump_reply_up}}"><i class='fa fa-arrow-up'></i></a>{{/if}}
+      {{#if view.parentView.previousPost}}<a href='{{unbound url}}' class="post-info arrow" title="{{i18n 'topic.jump_reply_up'}}"><i class='fa fa-arrow-up'></i></a>{{/if}}
       <div class='post-info post-date'>{{age-with-tooltip created_at}}</div>
     </div>
     {{{unbound cooked}}}
-    {{#unless view.parentView.previousPost}}<a href='{{unbound url}}' class="arrow" title="{{i18n topic.jump_reply_down}}"><i class='fa fa-arrow-down'></i></a>{{/unless}}
+    {{#unless view.parentView.previousPost}}<a href='{{unbound url}}' class="arrow" title="{{i18n 'topic.jump_reply_down'}}"><i class='fa fa-arrow-down'></i></a>{{/unless}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs
index ba19a38b81..e52073f2f2 100644
--- a/app/assets/javascripts/discourse/templates/exception.hbs
+++ b/app/assets/javascripts/discourse/templates/exception.hbs
@@ -3,7 +3,7 @@
     <div class="face">:(</div>
     <div class="reason">{{reason}}</div>
     <div class="url">
-      {{i18n errors.prev_page}} <a {{bind-attr href=requestUrl}} data-auto-route="true">{{requestUrl}}</a>
+      {{i18n 'errors.prev_page'}} <a {{bind-attr href=requestUrl}} data-auto-route="true">{{requestUrl}}</a>
     </div>
     <div class="desc">
       {{#if networkFixed}}
diff --git a/app/assets/javascripts/discourse/templates/group.hbs b/app/assets/javascripts/discourse/templates/group.hbs
index d88ae8f126..f1af1a0ff9 100644
--- a/app/assets/javascripts/discourse/templates/group.hbs
+++ b/app/assets/javascripts/discourse/templates/group.hbs
@@ -2,12 +2,12 @@
     <section class='user-navigation'>
       <ul class='action-list nav-stacked'>
         <li {{bind-attr class="showingIndex:active"}}>
-          {{#link-to 'group.index' model}}{{i18n groups.posts}}
+          {{#link-to 'group.index' model}}{{i18n 'groups.posts'}}
           <span class='count'>({{counts.posts}})</span>
           {{/link-to}}
         </li>
       <li {{bind-attr class="showingMembers:active"}}>
-        {{#link-to 'group.members' model}}{{i18n groups.members}}
+        {{#link-to 'group.members' model}}{{i18n 'groups.members'}}
         <span class='count'>({{counts.members}})</span>
         {{/link-to}}
       </li>
diff --git a/app/assets/javascripts/discourse/templates/group/members.hbs b/app/assets/javascripts/discourse/templates/group/members.hbs
index 2bafdd7efc..5a2fd360e6 100644
--- a/app/assets/javascripts/discourse/templates/group/members.hbs
+++ b/app/assets/javascripts/discourse/templates/group/members.hbs
@@ -1,7 +1,7 @@
 {{#if model}}
   <table class='group-members'>
     <tr>
-      <th colspan="3" class="seen">{{i18n last_seen}}</th>
+      <th colspan="3" class="seen">{{i18n 'last_seen'}}</th>
     </tr>
   {{#each model}}
   <tr>
diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs
index 4b8d59635d..4b6e24034c 100644
--- a/app/assets/javascripts/discourse/templates/header.hbs
+++ b/app/assets/javascripts/discourse/templates/header.hbs
@@ -7,17 +7,17 @@
       {{#unless currentUser}}
         {{#if showSignUpButton}}
         <button {{action "showCreateAccount"}} class='btn btn-primary btn-small sign-up-button'>
-          {{i18n sign_up}}
+          {{i18n 'sign_up'}}
         </button>
         {{/if}}
         <button {{action "showLogin"}} class='btn btn-primary btn-small login-button'>
-          {{fa-icon user}} {{i18n log_in}}
+          {{fa-icon user}} {{i18n 'log_in'}}
         </button>
       {{/unless}}
       <ul class='icons clearfix' role='navigation'>
         {{#if currentUser}}
           <li class='notifications'>
-            <a class='icon' href="#" {{action "showNotifications" target="view"}} data-notifications="notifications-dropdown" id='user-notifications' title='{{i18n notifications.title}}'>
+            <a class='icon' href="#" {{action "showNotifications" target="view"}} data-notifications="notifications-dropdown" id='user-notifications' title='{{i18n 'notifications.title'}}'>
               {{fa-icon comment label="notifications.title"}}
             </a>
             {{#if currentUser.unread_notifications}}
@@ -38,7 +38,7 @@
                class='icon expand'
                href='#'
                data-dropdown="search-dropdown"
-               title='{{i18n search.title}}'>
+               title='{{i18n 'search.title'}}'>
                {{fa-icon search label="search.title"}}
             </a>
           {{/if}}
@@ -57,13 +57,13 @@
                data-dropdown="site-map-dropdown"
                data-render="renderSiteMap"
                href="#"
-               title='{{i18n site_map}}'
+               title='{{i18n 'site_map'}}'
                id="site-map">
                {{fa-icon bars label="site_map"}}
             </a>
           {{/if}}
           {{#if currentUser.site_flagged_posts_count}}
-            <a href='/admin/flags/active' title='{{i18n notifications.total_flagged}}' class='badge-notification flagged-posts'>{{currentUser.site_flagged_posts_count}}</a>
+            <a href='/admin/flags/active' title='{{i18n 'notifications.total_flagged'}}' class='badge-notification flagged-posts'>{{currentUser.site_flagged_posts_count}}</a>
           {{/if}}
         </li>
         {{#if currentUser}}
@@ -72,7 +72,7 @@
                data-dropdown="user-dropdown"
                data-render="renderUserDropdown"
                href="#"
-               title='{{i18n user.avatar.title}}'
+               title='{{i18n 'user.avatar.title'}}'
                id="current-user">
                  {{bound-avatar currentUser "medium"}}
             </a>
@@ -115,7 +115,7 @@
                 {{#if topic.errorLoading}}
                   <span class="error">{{topic.errorTitle}}</span>
                 {{else}}
-                  <span class="loading">{{i18n topic.loading}}</span>
+                  <span class="loading">{{i18n 'topic.loading'}}</span>
                 {{/if}}
               {{/if}}
             </h1>
diff --git a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
index 94a3e629ff..76be2c412f 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-excerpt.raw.hbs
@@ -2,7 +2,7 @@
   <div class="topic-excerpt">
     {{{topic.excerpt}}}
     {{#if topic.excerptTruncated}}
-      <a href="{{topic.url}}">{{i18n read_more}}</a>
+      <a href="{{topic.url}}">{{i18n 'read_more'}}</a>
     {{/if}}
   </div>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/user_topics_list.hbs b/app/assets/javascripts/discourse/templates/list/user_topics_list.hbs
index ac54a240bf..a63fc87f94 100644
--- a/app/assets/javascripts/discourse/templates/list/user_topics_list.hbs
+++ b/app/assets/javascripts/discourse/templates/list/user_topics_list.hbs
@@ -1,3 +1,9 @@
+{{#if showNewPM}}
+  <div class="clearfix">
+    <a class='btn btn-primary pull-right new-private-message' {{action "composePrivateMessage"}}>{{fa-icon "envelope"}}{{i18n 'user.new_private_message'}}</a>
+  </div>
+{{/if}}
+
 {{basic-topic-list topicList=model
                    hideCategory=hideCategory
                    showParticipants=showParticipants
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 8c0a851e18..74b5bc0694 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -17,10 +17,10 @@
                 <div class="topic-excerpt">
                   {{excerpt}}
                   {{#if excerptTruncated}}
-                    {{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}}
+                    {{#unless canClearPin}}<a href="{{url}}">{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
                   {{#if canClearPin}}
-                    <a href="#" {{action "clearPin" this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+                    <a href="#" {{action "clearPin" this}} title="{{i18n 'topic.clear_pin.help'}}">{{i18n 'topic.clear_pin.title'}}</a>
                   {{/if}}
                 </div>
             {{/if}}
@@ -47,10 +47,11 @@
           </td>
         </tr>
         {{/each}}
+        </tbody>
       </table>
     {{else}}
       <div class='alert alert-info'>
-        {{i18n choose_topic.none_found}}
+        {{i18n 'choose_topic.none_found'}}
     </div>
   {{/if}}
 {{/loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
index cbe47e1690..789368925e 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/categories.hbs
@@ -27,10 +27,10 @@
                 <div class="topic-excerpt">
                   {{{excerpt}}}
                   {{#if excerptTruncated}}
-                  {{#unless canClearPin}}<a href="{{unbound url}}">{{i18n read_more}}</a>{{/unless}}
+                  {{#unless canClearPin}}<a href="{{unbound url}}">{{i18n 'read_more'}}</a>{{/unless}}
                   {{/if}}
                   {{#if canClearPin}}
-                    <a href="#" {{action "clearPin" this}} title="{{unbound i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+                    <a href="#" {{action "clearPin" this}} title="{{unbound i18n topic.clear_pin.help}}">{{i18n 'topic.clear_pin.title'}}</a>
                   {{/if}}
                 </div>
               {{/if}}
@@ -55,12 +55,12 @@
 
     </table>
     <footer class="clearfix">
-      <figure title="{{i18n year_desc}}">{{number topics_year}} <figcaption>{{i18n category.this_year}}</figcaption></figure>
-      <figure title="{{i18n month_desc}}">{{number topics_month}} <figcaption>{{i18n month}}</figcaption></figure>
-      <figure title="{{i18n week_desc}}">{{number topics_week}} <figcaption>{{i18n week}}</figcaption></figure>
+      <figure title="{{i18n 'year_desc'}}">{{number topics_year}} <figcaption>{{i18n 'category.this_year'}}</figcaption></figure>
+      <figure title="{{i18n 'month_desc'}}">{{number topics_month}} <figcaption>{{i18n 'month'}}</figcaption></figure>
+      <figure title="{{i18n 'week_desc'}}">{{number topics_week}} <figcaption>{{i18n 'week'}}</figcaption></figure>
 
       {{#if controller.canEdit}}
-        <a href='#' {{action "editCategory" this}} class='btn btn-small'>{{i18n category.edit}}</a>
+        <a href='#' {{action "editCategory" this}} class='btn btn-small'>{{i18n 'category.edit'}}</a>
       {{/if}}
 
     </footer>
diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
index 10f7529a15..59940fdaaa 100644
--- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs
@@ -12,7 +12,7 @@
             <td>
               <div class='alert alert-info' {{action "showInserted"}}>
                 {{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
-                {{i18n click_to_show}}
+                {{i18n 'click_to_show'}}
               </div>
             </td>
           </tr>
@@ -27,11 +27,11 @@
   {{loading-spinner condition=loadingMore}}
   {{#if allLoaded}}
     {{#if showDismissRead}}
-      <button title="{{i18n topics.bulk.dismiss_topics_tooltip}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n topics.bulk.dismiss_topics}}</button>
-      <button title="{{i18n topics.bulk.dismiss_posts_tooltip}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n topics.bulk.dismiss_posts}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_topics_tooltip'}}" id='dismiss-topics' class='btn dismiss-read' {{action "dismissRead" "topics"}}>{{i18n 'topics.bulk.dismiss_topics'}}</button>
+      <button title="{{i18n 'topics.bulk.dismiss_posts_tooltip'}}" id='dismiss-posts' class='btn dismiss-read' {{action "dismissRead" "posts"}}>{{i18n 'topics.bulk.dismiss_posts'}}</button>
     {{/if}}
     {{#if showResetNew}}
-      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n topics.bulk.dismiss_new}}</button>
+      <button id='dismiss-new' class='btn dismiss-read' {{action "resetNew"}}>{{i18n 'topics.bulk.dismiss_new'}}</button>
     {{/if}}
 
     {{#if latest}}
@@ -40,12 +40,12 @@
       </div>
       <h3>
         {{footerMessage}}
-        {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n topic.suggest_create_topic}}</a>{{/if}}
+        {{#if can_create_topic}}<a href='#' {{action "createTopic"}}>{{i18n 'topic.suggest_create_topic'}}</a>{{/if}}
       </h3>
     {{else}}
       {{#if top}}
         <h3>
-          {{#link-to "discovery.categories"}}{{i18n topic.browse_all_categories}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}} {{i18n or}} {{i18n filters.top.other_periods}}
+          {{#link-to "discovery.categories"}}{{i18n 'topic.browse_all_categories'}}{{/link-to}}, {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}} {{i18n 'or'}} {{i18n 'filters.top.other_periods'}}
           <br/>
           {{top-period-buttons period=period}}
         </h3>
@@ -54,7 +54,7 @@
             {{{footerEducation}}}
         </div>
         <h3>
-          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'discovery.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}
+          {{footerMessage}}{{#link-to "discovery.categories"}} {{i18n 'topic.browse_all_categories'}}{{/link-to}} {{i18n 'or'}} {{#link-to 'discovery.latest'}}{{i18n 'topic.view_latest_topics'}}{{/link-to}}
         </h3>
       {{/if}}
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
index cbcbec9694..5db0015b9c 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.hbs
@@ -11,10 +11,10 @@
     <div class="topic-excerpt">
       {{{excerpt}}}
       {{#if excerptTruncated}}
-        {{#unless canClearPin}}<a href="{{url}}">{{i18n read_more}}</a>{{/unless}}
+        {{#unless canClearPin}}<a href="{{url}}">{{i18n 'read_more'}}</a>{{/unless}}
       {{/if}}
       {{#if canClearPin}}
-        <a href="#" {{action "clearPin" this}} title="{{i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+        <a href="#" {{action "clearPin" this}} title="{{i18n 'topic.clear_pin.help'}}">{{i18n 'topic.clear_pin.title'}}</a>
       {{/if}}
     </div>
   {{/if}}
@@ -30,7 +30,7 @@
   <div class="pull-right">
     {{posts-count-column topic=this tagName="div" class="num posts" action="showTopicEntrance"}}
     <div class='num activity last'>
-      <a href="{{lastPostUrl}}" title='{{i18n last_post}}: {{{raw-date bumped_at}}}'>{{last_poster_username}}</a>
+      <a href="{{lastPostUrl}}" title='{{i18n 'last_post'}}: {{{raw-date bumped_at}}}'>{{last_poster_username}}</a>
       {{raw "list/activity-column" topic=this tagName="span" class="age"}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
index 806ffd6548..c3db1acafc 100644
--- a/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/modal/login.hbs
@@ -6,7 +6,7 @@
         <table>
           <tr>
             <td>
-              <label for='login-account-name'>{{i18n login.username}}&nbsp;</label>
+              <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
             </td>
             <td>
               {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off"}}
@@ -14,7 +14,7 @@
           </tr>
           <tr>
             <td>
-                <label for='login-account-password'>{{i18n login.password}}&nbsp;</label>
+                <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
             </td>
             <td>
                 {{text-field value=loginPassword type="password" id="login-account-password" maxlength="200"}} &nbsp;
@@ -23,7 +23,7 @@
           <tr>
             <td></td>
             <td>
-              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n forgot_password.action}}</a>
+              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
             </td>
           </tr>
         </table>
@@ -35,7 +35,7 @@
 </div>
 <div class="modal-footer">
   {{#if authenticate}}
-    {{i18n login.authenticating}}
+    {{i18n 'login.authenticating'}}
   {{/if}}
   {{#if canLoginLocal}}
     <button class='btn btn-large btn-primary'
@@ -46,7 +46,7 @@
 
     {{#if showSignupLink}}
       <button class="btn btn-large" id="new-account-link" {{action "showCreateAccount"}}>
-        {{i18n create_account.title}}
+        {{i18n 'create_account.title'}}
       </button>
     {{/if}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
index 2d46cf5394..d8c949d9b0 100644
--- a/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/archetype_options.hbs
@@ -4,5 +4,5 @@
   </form>
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n post.archetypes.save}}</button>
+  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'post.archetypes.save'}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/auto_close.hbs b/app/assets/javascripts/discourse/templates/modal/auto_close.hbs
index 0c037bfb83..8c0cd9e64e 100644
--- a/app/assets/javascripts/discourse/templates/modal/auto_close.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/auto_close.hbs
@@ -6,8 +6,8 @@
                       limited=details.auto_close_based_on_last_post }}
   </div>
   <div class="modal-footer">
-    <button class='btn btn-primary' type='submit' {{bind-attr disabled="auto_close_invalid"}}>{{i18n topic.auto_close_save}}</button>
-    <a {{action "closeModal"}}>{{i18n cancel}}</a>
-    <button class='btn pull-right' {{action "removeAutoClose"}}>{{i18n topic.auto_close_remove}}</button>
+    <button class='btn btn-primary' type='submit' {{bind-attr disabled="auto_close_invalid"}}>{{i18n 'topic.auto_close_save'}}</button>
+    <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
+    <button class='btn pull-right' {{action "removeAutoClose"}}>{{i18n 'topic.auto_close_remove'}}</button>
   </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
index cb459c9278..de3ca91c56 100644
--- a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs
@@ -2,12 +2,12 @@
   <div>
     <div>
       <input type="radio" id="system-avatar" name="avatar" value="system" {{action "useSystem"}}>
-      <label class="radio" for="system-avatar">{{bound-avatar controller "large" system_avatar_upload_id}} {{{i18n user.change_avatar.letter_based}}}</label>
+      <label class="radio" for="system-avatar">{{bound-avatar controller "large" system_avatar_upload_id}} {{{i18n 'user.change_avatar.letter_based'}}}</label>
     </div>
     <div>
       <input type="radio" id="gravatar" name="avatar" value="gravatar" {{action "useGravatar"}}>
-      <label class="radio" for="gravatar">{{bound-avatar controller "large" gravatar_avatar_upload_id}} {{{i18n user.change_avatar.gravatar}}} {{email}}</label>
-      <button href {{action "refreshGravatar"}} title="{{i18n user.change_avatar.refresh_gravatar_title}}" {{bind-attr enabled="view.gravatarRefreshEnabled"}} class="btn no-text"><i class="fa fa-refresh"></i></button>
+      <label class="radio" for="gravatar">{{bound-avatar controller "large" gravatar_avatar_upload_id}} {{{i18n 'user.change_avatar.gravatar'}}} {{email}}</label>
+      <button href {{action "refreshGravatar"}} title="{{i18n 'user.change_avatar.refresh_gravatar_title'}}" {{bind-attr enabled="view.gravatarRefreshEnabled"}} class="btn no-text"><i class="fa fa-refresh"></i></button>
     </div>
     <div>
       <input type="radio" id="uploaded_avatar" name="avatar" value="uploaded" {{action "useUploadedAvatar"}}>
@@ -16,10 +16,10 @@
           {{#if view.uploadedAvatarTemplate}}
             {{bound-avatar-template view.uploadedAvatarTemplate "large"}}
           {{else}}
-            {{bound-avatar controller "large" custom_avatar_upload_id}} {{i18n user.change_avatar.uploaded_avatar}}
+            {{bound-avatar controller "large" custom_avatar_upload_id}} {{i18n 'user.change_avatar.uploaded_avatar'}}
           {{/if}}
         {{else}}
-          {{i18n user.change_avatar.uploaded_avatar_empty}}
+          {{i18n 'user.change_avatar.uploaded_avatar_empty'}}
         {{/if}}
       </label>
       {{avatar-uploader username=username
@@ -30,6 +30,6 @@
 </div>
 
 <div class="modal-footer">
-  <button class="btn btn-primary" {{action "saveAvatarSelection"}} {{bind-attr disabled="view.saveDisabled"}}>{{i18n save}}</button>
-  <a {{action "closeModal"}}>{{i18n cancel}}</a>
+  <button class="btn btn-primary" {{action "saveAvatarSelection"}} {{bind-attr disabled="view.saveDisabled"}}>{{i18n 'save'}}</button>
+  <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs
index 3301aa6af0..40ace4bc37 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk_actions_buttons.hbs
@@ -1,10 +1,10 @@
 <p>
-  <button class='btn' {{action "showChangeCategory"}}>{{i18n topics.bulk.change_category}}</button>
-  <button class='btn' {{action "deleteTopics"}}>{{i18n topics.bulk.delete}}</button>
-  <button class='btn' {{action "closeTopics"}}>{{i18n topics.bulk.close_topics}}</button>
-  <button class='btn' {{action "archiveTopics"}}>{{i18n topics.bulk.archive_topics}}</button>
+  <button class='btn' {{action "showChangeCategory"}}>{{i18n 'topics.bulk.change_category'}}</button>
+  <button class='btn' {{action "deleteTopics"}}>{{i18n 'topics.bulk.delete'}}</button>
+  <button class='btn' {{action "closeTopics"}}>{{i18n 'topics.bulk.close_topics'}}</button>
+  <button class='btn' {{action "archiveTopics"}}>{{i18n 'topics.bulk.archive_topics'}}</button>
 </p>
 <p>
-  <button class='btn' {{action "showNotificationLevel"}}>{{i18n topics.bulk.notification_level}}</button>
-  <button class='btn' {{action "resetRead"}}>{{i18n topics.bulk.reset_read}}</button>
+  <button class='btn' {{action "showNotificationLevel"}}>{{i18n 'topics.bulk.notification_level'}}</button>
+  <button class='btn' {{action "resetRead"}}>{{i18n 'topics.bulk.reset_read'}}</button>
 </p>
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
index 4861aa42b9..e67173ff70 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk_change_category.hbs
@@ -3,7 +3,7 @@
 <p>{{category-chooser value=newCategoryId}}</p>
 
 {{#if loading}}
-  <div class='loading'>{{i18n loading}}</div>
+  <div class='loading'>{{i18n 'loading'}}</div>
 {{else}}
   <button class='btn' {{action "changeCategory"}}>Change Category</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs b/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
index 4e37543dba..cb40e1802c 100644
--- a/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/bulk_notification_level.hbs
@@ -7,4 +7,4 @@
   </div>
 {{/each}}
 
-<button class='btn' {{bind-attr disabled="disabled"}} {{action "changeNotificationLevel"}}>{{i18n topics.bulk.notification_level}}</button>
+<button class='btn' {{bind-attr disabled="disabled"}} {{action "changeNotificationLevel"}}>{{i18n 'topics.bulk.notification_level'}}</button>
diff --git a/app/assets/javascripts/discourse/templates/modal/change_owner.hbs b/app/assets/javascripts/discourse/templates/modal/change_owner.hbs
index e8cc1c2ee0..7b7f2406a4 100644
--- a/app/assets/javascripts/discourse/templates/modal/change_owner.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/change_owner.hbs
@@ -1,11 +1,11 @@
 <div class="modal-body">
-  {{{i18n topic.change_owner.instructions count="selectedPostsCount" old_user="selectedPostsUsername"}}}
+  {{{i18n 'topic.change_owner.instructions' count="selectedPostsCount" old_user="selectedPostsUsername"}}}
   <p>
-      {{{i18n topic.change_owner.instructions_warn}}}
+      {{{i18n 'topic.change_owner.instructions_warn'}}}
   </p>
 
   <form>
-      <label>{{i18n topic.change_owner.label}}</label>
+      <label>{{i18n 'topic.change_owner.label'}}</label>
     {{user-selector single=true usernames=new_user include_groups="false" placeholderKey="topic.change_owner.placeholder"}}
   </form>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
index 2faa73d77b..d51d8ea6a2 100644
--- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs
@@ -10,7 +10,7 @@
         <table>
 
         <tr class="input">
-              <td class="label"><label for='new-account-email'>{{i18n user.email.title}}</label></td>
+              <td class="label"><label for='new-account-email'>{{i18n 'user.email.title'}}</label></td>
               <td>
               {{input type="email" value=accountEmail id="new-account-email" disabled=emailValidated name="email" autofocus="autofocus"}}
               &nbsp;{{input-tip validation=emailValidation}}
@@ -18,11 +18,11 @@
         </tr>
         <tr class="instructions">
           <td></td>
-          <td><label>{{i18n user.email.instructions}}</label></td>
+          <td><label>{{i18n 'user.email.instructions'}}</label></td>
         </tr>
 
         <tr class="input">
-              <td class="label"><label for='new-account-username'>{{i18n user.username.title}}</label></td>
+              <td class="label"><label for='new-account-username'>{{i18n 'user.username.title'}}</label></td>
               <td>
               {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength}}
               &nbsp;{{input-tip validation=usernameValidation id="username-validation"}}
@@ -30,11 +30,11 @@
         </tr>
         <tr class="instructions">
           <td></td>
-          <td><label>{{i18n user.username.instructions}}</label></td>
+          <td><label>{{i18n 'user.username.instructions'}}</label></td>
         </tr>
 
         <tr class="input">
-            <td style="width:80px" class="label"><label for='new-account-name'>{{i18n user.name.title}}</label></td>
+            <td style="width:80px" class="label"><label for='new-account-name'>{{i18n 'user.name.title'}}</label></td>
             <td style="width:496px">
                 {{text-field value=accountName id="new-account-name"}}
                 &nbsp;{{input-tip validation=nameValidation}}
@@ -42,12 +42,12 @@
         </tr>
         <tr class="instructions">
             <td></td>
-            <td><label>{{i18n user.name.instructions}}</label></td>
+            <td><label>{{i18n 'user.name.instructions'}}</label></td>
         </tr>
 
         {{#if passwordRequired}}
         <tr class="input">
-            <td class="label"><label for='new-account-password'>{{i18n user.password.title}}</label></td>
+            <td class="label"><label for='new-account-password'>{{i18n 'user.password.title'}}</label></td>
             <td>
             {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}}
             &nbsp;{{input-tip validation=passwordValidation}}
@@ -57,13 +57,13 @@
           <td></td>
           <td>
             <label>{{passwordInstructions}}</label>
-            <div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n login.caps_lock_warning}}</div>
+            <div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div>
           </td>
         </tr>
         {{/if}}
 
         <tr class="password-confirmation">
-          <td><label for='new-account-password-confirmation'>{{i18n user.password_confirmation.title}}</label></td>
+          <td><label for='new-account-password-confirmation'>{{i18n 'user.password_confirmation.title'}}</label></td>
           <td>
             {{input type="password" value=accountPasswordConfirm id="new-account-confirmation"}}
             {{input value=accountChallenge id="new-account-challenge"}}
@@ -87,10 +87,10 @@
 
   {{#if showCreateForm}}
     <div class="modal-footer">
-      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "createAccount"}}>{{i18n create_account.title}}</button>
+      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "createAccount"}}>{{i18n 'create_account.title'}}</button>
       {{#loading-spinner condition=formSubmitted size="small"}}
         <button class="btn btn-large" id="login-link" {{action "showLogin"}}>
-          {{i18n log_in}}
+          {{i18n 'log_in'}}
         </button>
       {{/loading-spinner}}
     </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
index 69232f908d..f1a5ebd60a 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-general.hbs
@@ -1,18 +1,18 @@
 <form>
   <section class='field'>
-    <label>{{i18n category.name}}</label>
+    <label>{{i18n 'category.name'}}</label>
     {{text-field value=name placeholderKey="category.name_placeholder" maxlength="50"}}
   </section>
 
   {{#if canSelectParentCategory}}
     <section class='field'>
       {{#if subCategories}}
-        <label>{{i18n categories.subcategories}}</label>
+        <label>{{i18n 'categories.subcategories'}}</label>
         {{#each subCategories}}
           {{category-badge this}}
         {{/each}}
       {{else}}
-        <label>{{i18n category.parent}}</label>
+        <label>{{i18n 'category.parent'}}</label>
         {{category-chooser valueAttribute="id" value=parent_category_id categories=parentCategories rootNone=true}}
       {{/if}}
     </section>
@@ -20,33 +20,33 @@
 
   {{#if showDescription}}
     <section class='field'>
-      <label>{{i18n category.description}}</label>
+      <label>{{i18n 'category.description'}}</label>
 
       {{#if description}}
         {{description}}
       {{else}}
-        {{i18n category.no_description}}
+        {{i18n 'category.no_description'}}
       {{/if}}
       {{#if topic_url}}
         <br/>
-        <button class="btn btn-small" {{action "showCategoryTopic"}}><i class="fa fa-pencil"></i>{{i18n category.change_in_category_topic}}</button>
+        <button class="btn btn-small" {{action "showCategoryTopic"}}><i class="fa fa-pencil"></i>{{i18n 'category.change_in_category_topic'}}</button>
       {{/if}}
     </section>
   {{/if}}
 
   <section class='field'>
-    <label>{{i18n category.badge_colors}}</label>
+    <label>{{i18n 'category.badge_colors'}}</label>
     <div class="category-color-editor">
       {{{categoryBadgePreview}}}
 
       <div class='input-prepend input-append' style="margin-top: 10px;">
-        <span class='color-title'>{{i18n category.background_color}}:</span>
+        <span class='color-title'>{{i18n 'category.background_color'}}:</span>
         <span class='add-on'>#</span>{{text-field value=color placeholderKey="category.color_placeholder" maxlength="6"}}
         {{color-picker colors=backgroundColors usedColors=usedBackgroundColors value=color}}
       </div>
 
       <div class='input-prepend input-append'>
-        <span class='color-title'>{{i18n category.foreground_color}}:</span>
+        <span class='color-title'>{{i18n 'category.foreground_color'}}:</span>
         <span class='add-on'>#</span>{{text-field value=text_color placeholderKey="category.color_placeholder" maxlength="6"}}
         {{color-picker colors=foregroundColors value=text_color}}
       </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs
index 73fd9cf8f3..e1bacab397 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-images.hbs
@@ -1,9 +1,9 @@
 <section class='field'>
-  <label>{{i18n category.logo}}</label>
+  <label>{{i18n 'category.logo'}}</label>
   {{image-uploader uploadUrl=categoryUploadUrl imageUrl=logo_url type="logo"}}
 </section>
 
 <section class='field'>
-  <label>{{i18n category.background_image}}</label>
+  <label>{{i18n 'category.background_image'}}</label>
   {{image-uploader uploadUrl=categoryUploadUrl imageUrl=background_url type="background"}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
index 8291af7492..0b45f20559 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-security.hbs
@@ -14,8 +14,8 @@
   {{#if controller.editingPermissions}}
     {{view Ember.Select content=availableGroups value=selectedGroup}}
     {{view Ember.Select class="permission-selector" optionValuePath="content.id" optionLabelPath="content.description" content=availablePermissions value=selectedPermission}}
-    <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small">{{i18n category.add_permission}}</button>
+    <button {{action "addPermission" selectedGroup selectedPermission}} class="btn btn-small">{{i18n 'category.add_permission'}}</button>
   {{else}}
-    <button {{action "editPermissions"}} class="btn btn-small">{{i18n category.edit_permissions}}</button>
+    <button {{action "editPermissions"}} class="btn btn-small">{{i18n 'category.edit_permissions'}}</button>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs b/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs
index f31d4699f9..618742f62b 100644
--- a/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/edit-category-settings.hbs
@@ -8,7 +8,7 @@
   <div class="allow-badges">
     <div>
       {{input type="checkbox" checked=allow_badges}}
-      {{i18n category.allow_badges_label}}
+      {{i18n 'category.allow_badges_label'}}
     </div>
   </div>
 </section>
@@ -18,28 +18,28 @@
     {{#if emailInEnabled}}
       <div>
         <i class="fa fa-envelope-o"></i>
-        {{i18n category.email_in}}
+        {{i18n 'category.email_in'}}
         {{text-field value=email_in}}
       </div>
       <div>
         <label class="checkbox-label">
           {{input type="checkbox" checked=email_in_allow_strangers}}
-          {{i18n category.email_in_allow_strangers}}
+          {{i18n 'category.email_in_allow_strangers'}}
         </label>
       </div>
     {{else}}
-      {{i18n category.email_in_disabled}}
-      <a href="/admin/site_settings/category/email">{{i18n category.email_in_disabled_click}}</a>
+      {{i18n 'category.email_in_disabled'}}
+      <a href="/admin/site_settings/category/email">{{i18n 'category.email_in_disabled_click'}}</a>
     {{/if}}
   </div>
 </section>
 
 <section class='field'>
   {{#if showPositionInput}}
-    <label>{{i18n category.position}}</label>
+    <label>{{i18n 'category.position'}}</label>
     {{text-field value=position class="position-input"}}
   {{else}}
-    {{i18n category.position_disabled}}
-    <a href="/admin/site_settings/category/basic">{{i18n category.position_disabled_click}}</a>
+    {{i18n 'category.position_disabled'}}
+    <a href="/admin/site_settings/category/basic">{{i18n 'category.position_disabled_click'}}</a>
   {{/if}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/modal/flag.hbs b/app/assets/javascripts/discourse/templates/modal/flag.hbs
index 33adba35ab..cb2c08aba2 100644
--- a/app/assets/javascripts/discourse/templates/modal/flag.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/flag.hbs
@@ -15,20 +15,20 @@
         {{/if}}
       </div>
     {{else}}
-      {{i18n flagging.cant}}
+      {{i18n 'flagging.cant'}}
     {{/each}}
   </form>
 
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "createFlag"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.submit_tooltip}}">{{{submitText}}}</button>
+  <button class='btn btn-primary' {{action "createFlag"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n 'flagging.submit_tooltip'}}">{{{submitText}}}</button>
 
   {{#if canTakeAction}}
-    <button class='btn btn-danger' {{action "takeAction"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.take_action_tooltip}}"><i class="fa fa-gavel"></i>{{i18n flagging.take_action}}</button>
+    <button class='btn btn-danger' {{action "takeAction"}} {{bind-attr disabled="submitDisabled"}} title="{{i18n 'flagging.take_action_tooltip'}}"><i class="fa fa-gavel"></i>{{i18n 'flagging.take_action'}}</button>
   {{/if}}
 
   {{#if canDeleteSpammer}}
-    <button class="btn btn-danger" {{action "deleteSpammer" userDetails}} {{bind-attr disabled="submitDisabled"}} title="{{i18n flagging.delete_spammer}}"><i class="fa fa-exclamation-triangle"></i> {{i18n flagging.delete_spammer}}</button>
+    <button class="btn btn-danger" {{action "deleteSpammer" userDetails}} {{bind-attr disabled="submitDisabled"}} title="{{i18n 'flagging.delete_spammer'}}"><i class="fa fa-exclamation-triangle"></i> {{i18n 'flagging.delete_spammer'}}</button>
   {{/if}}
-  <span class="hint">{{{i18n flagging.private_reminder}}}</span>
+  <span class="hint">{{{i18n 'flagging.private_reminder'}}}</span>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs b/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs
index 13c4ae09a1..2d5e39f8c4 100644
--- a/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/forgot_password.hbs
@@ -1,9 +1,9 @@
 <form>
     <div class="modal-body">
-      <label for='username-or-email'>{{i18n forgot_password.invite}}</label>
+      <label for='username-or-email'>{{i18n 'forgot_password.invite'}}</label>
       {{text-field value=accountEmailOrUsername placeholderKey="login.email_placeholder" id="username-or-email" autocorrect="off" autocapitalize="off"}}
     </div>
     <div class="modal-footer">
-      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "submit"}}>{{i18n forgot_password.reset}}</button>
+      <button class='btn btn-large btn-primary' {{bind-attr disabled="submitDisabled"}} {{action "submit"}}>{{i18n 'forgot_password.reset'}}</button>
     </div>
 </form>
diff --git a/app/assets/javascripts/discourse/templates/modal/history.hbs b/app/assets/javascripts/discourse/templates/modal/history.hbs
index 9b9b52da5d..97f648034d 100644
--- a/app/assets/javascripts/discourse/templates/modal/history.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/history.hbs
@@ -1,32 +1,32 @@
 <div class="modal-body">
   <div>
     <div id="revision-controls">
-      <button title="{{i18n post.revisions.controls.first}}" {{bind-attr class=":btn :standard :no-text displayGoToFirst::invisible" disabled=loading}} {{action "loadFirstVersion"}}><i class="fa fa-fast-backward"></i></button>
-      <button title="{{i18n post.revisions.controls.previous}}" {{bind-attr class=":btn :standard :no-text displayGoToPrevious::invisible" disabled=loading}} {{action "loadPreviousVersion"}}><i class="fa fa-backward"></i></button>
+      <button title="{{i18n 'post.revisions.controls.first'}}" {{bind-attr class=":btn :standard :no-text displayGoToFirst::invisible" disabled=loading}} {{action "loadFirstVersion"}}><i class="fa fa-fast-backward"></i></button>
+      <button title="{{i18n 'post.revisions.controls.previous'}}" {{bind-attr class=":btn :standard :no-text displayGoToPrevious::invisible" disabled=loading}} {{action "loadPreviousVersion"}}><i class="fa fa-backward"></i></button>
       <div id="revision-numbers" {{bind-attr class="displayRevisions::invisible"}}>
         {{#loading-spinner condition=loading size="small"}}
           {{boundI18n revisionsTextKey previousBinding="previousVersion" currentBinding="current_version" totalBinding="version_count"}}
         {{/loading-spinner}}
       </div>
-      <button title="{{i18n post.revisions.controls.next}}" {{bind-attr class=":btn :standard :no-text displayGoToNext::invisible" disabled=loading}} {{action "loadNextVersion"}}><i class="fa fa-forward"></i></button>
-      <button title="{{i18n post.revisions.controls.last}}" {{bind-attr class=":btn :standard :no-text displayGoToLast::invisible" disabled=loading}} {{action "loadLastVersion"}}><i class="fa fa-fast-forward"></i></button>
+      <button title="{{i18n 'post.revisions.controls.next'}}" {{bind-attr class=":btn :standard :no-text displayGoToNext::invisible" disabled=loading}} {{action "loadNextVersion"}}><i class="fa fa-forward"></i></button>
+      <button title="{{i18n 'post.revisions.controls.last'}}" {{bind-attr class=":btn :standard :no-text displayGoToLast::invisible" disabled=loading}} {{action "loadLastVersion"}}><i class="fa fa-fast-forward"></i></button>
       {{#if displayHide}}
-        <button title="{{i18n post.revisions.controls.hide}}" {{bind-attr class=":btn :standard :no-text :btn-danger" disabled=loading}} {{action "hideVersion"}}><i class="fa fa-trash-o"></i></button>
+        <button title="{{i18n 'post.revisions.controls.hide'}}" {{bind-attr class=":btn :standard :no-text :btn-danger" disabled=loading}} {{action "hideVersion"}}><i class="fa fa-trash-o"></i></button>
       {{/if}}
       {{#if displayShow}}
-        <button title="{{i18n post.revisions.controls.show}}" {{bind-attr class=":btn :standard :no-text" disabled=loading}} {{action "showVersion"}}><i class="fa fa-undo"></i></button>
+        <button title="{{i18n 'post.revisions.controls.show'}}" {{bind-attr class=":btn :standard :no-text" disabled=loading}} {{action "showVersion"}}><i class="fa fa-undo"></i></button>
       {{/if}}
     </div>
     <div id="display-modes">
-      <button {{bind-attr class=":btn displayingInline:btn-primary:standard"}} title="{{i18n post.revisions.displays.inline.title}}" {{action "displayInline"}}>{{{i18n post.revisions.displays.inline.button}}}</button>
+      <button {{bind-attr class=":btn displayingInline:btn-primary:standard"}} title="{{i18n 'post.revisions.displays.inline.title'}}" {{action "displayInline"}}>{{{i18n 'post.revisions.displays.inline.button'}}}</button>
       {{#unless site.mobileView}}
-        <button {{bind-attr class=":btn displayingSideBySide:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side.title}}" {{action "displaySideBySide"}}>{{{i18n post.revisions.displays.side_by_side.button}}}</button>
-        <button {{bind-attr class=":btn displayingSideBySideMarkdown:btn-primary:standard"}} title="{{i18n post.revisions.displays.side_by_side_markdown.title}}" {{action "displaySideBySideMarkdown"}}>{{{i18n post.revisions.displays.side_by_side_markdown.button}}}</button>
+        <button {{bind-attr class=":btn displayingSideBySide:btn-primary:standard"}} title="{{i18n 'post.revisions.displays.side_by_side.title'}}" {{action "displaySideBySide"}}>{{{i18n 'post.revisions.displays.side_by_side.button'}}}</button>
+        <button {{bind-attr class=":btn displayingSideBySideMarkdown:btn-primary:standard"}} title="{{i18n 'post.revisions.displays.side_by_side_markdown.title'}}" {{action "displaySideBySideMarkdown"}}>{{{i18n 'post.revisions.displays.side_by_side_markdown.button'}}}</button>
       {{/unless}}
     </div>
   </div>
   <div id="revision-details">
-    {{i18n post.revisions.details.edited_by}}
+    {{i18n 'post.revisions.details.edited_by'}}
     {{#link-to 'user' username}}
       {{bound-avatar-template content.avatar_template "small"}} {{username}}
     {{/link-to}}
diff --git a/app/assets/javascripts/discourse/templates/modal/invite.hbs b/app/assets/javascripts/discourse/templates/modal/invite.hbs
index d2a129f560..dd7689add9 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite.hbs
@@ -2,7 +2,7 @@
   {{#if error}}
     <div class="alert alert-error">
       <button class="close" data-dismiss="alert">×</button>
-      {{i18n topic.invite_reply.error}}
+      {{i18n 'topic.invite_reply.error'}}
     </div>
   {{/if}}
 
@@ -21,7 +21,7 @@
 </div>
 <div class="modal-footer">
   {{#if finished}}
-    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
   {{else}}
     <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action "createInvite"}}><i class="fa fa-envelope"></i>{{buttonTitle}}</button>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/invite_private.hbs b/app/assets/javascripts/discourse/templates/modal/invite_private.hbs
index d4635dead9..47e8cd2671 100644
--- a/app/assets/javascripts/discourse/templates/modal/invite_private.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/invite_private.hbs
@@ -2,20 +2,20 @@
   {{#if error}}
     <div class="alert alert-error">
       <button class="close" data-dismiss="alert">×</button>
-      {{i18n topic.invite_private.error}}
+      {{i18n 'topic.invite_private.error'}}
     </div>
   {{/if}}
 
   {{#if finished}}
-    {{i18n topic.invite_private.success}}
+    {{i18n 'topic.invite_private.success'}}
   {{else}}
-    <label>{{i18n topic.invite_private.email_or_username}}</label>
+    <label>{{i18n 'topic.invite_private.email_or_username'}}</label>
     {{user-selector single=true allowAny=true usernames=emailOrUsername include_groups="true" placeholderKey="topic.invite_private.email_or_username_placeholder"}}
   {{/if}}
 </div>
 <div class="modal-footer">
   {{#if finished}}
-    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+    <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
   {{else}}
     <button class='btn btn-primary' {{bind-attr disabled="disabled"}} {{action "invite"}}>{{buttonTitle}}</button>
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs b/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs
index 1c2d3adee3..64de5b2613 100644
--- a/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/keyboard_shortcuts_help.hbs
@@ -1,59 +1,59 @@
 <div id="keyboard-shortcuts-help" class="modal-body">
   <div class="row">
     <div class="span6">
-      <h4>{{i18n keyboard_shortcuts_help.jump_to.title}}</h4>
+      <h4>{{i18n 'keyboard_shortcuts_help.jump_to.title'}}</h4>
       <ul>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.home}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.latest}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.new}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.unread}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.starred}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.categories}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.jump_to.top}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.home'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.latest'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.new'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.unread'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.starred'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.categories'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.jump_to.top'}}}</li>
       </ul>
-      <h4>{{i18n keyboard_shortcuts_help.navigation.title}}</h4>
+      <h4>{{i18n 'keyboard_shortcuts_help.navigation.title'}}</h4>
       <ul>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.back}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.jump}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.up_down}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.open}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.navigation.next_prev}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.back'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.jump'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.up_down'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.open'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.navigation.next_prev'}}}</li>
       </ul>
     </div>
     <div class="span6">
-      <h4>{{i18n keyboard_shortcuts_help.application.title}}</h4>
+      <h4>{{i18n 'keyboard_shortcuts_help.application.title'}}</h4>
       <ul>
-        <li>{{{i18n keyboard_shortcuts_help.application.create}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.notifications}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.site_map_menu}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.user_profile_menu}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.show_incoming_updated_topics}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.search}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.help}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.dismiss_new_posts}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.application.dismiss_topics}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.create'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.notifications'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.site_map_menu'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.user_profile_menu'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.show_incoming_updated_topics'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.search'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.help'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.dismiss_new_posts'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.application.dismiss_topics'}}}</li>
       </ul>
     </div>
     <div class="span6">
-      <h4>{{i18n keyboard_shortcuts_help.actions.title}}</h4>
+      <h4>{{i18n 'keyboard_shortcuts_help.actions.title'}}</h4>
       <ul>
-        <li>{{{i18n keyboard_shortcuts_help.actions.star}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.pin_unpin_topic}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.share_topic}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.share_post}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.reply_as_new_topic}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.reply_topic}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.reply_post}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.quote_post}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.like}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.flag}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.bookmark}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.edit}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.delete}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.mark_muted}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.mark_regular}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.mark_tracking}}}</li>
-        <li>{{{i18n keyboard_shortcuts_help.actions.mark_watching}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.star'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.pin_unpin_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.share_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.share_post'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_as_new_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_topic'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.reply_post'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.quote_post'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.like'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.flag'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.bookmark'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.edit'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.delete'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.mark_muted'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.mark_regular'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.mark_tracking'}}}</li>
+        <li>{{{i18n 'keyboard_shortcuts_help.actions.mark_watching'}}}</li>
       </ul>
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/login.hbs b/app/assets/javascripts/discourse/templates/modal/login.hbs
index 4c0fae6487..41568d1c8e 100644
--- a/app/assets/javascripts/discourse/templates/modal/login.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/login.hbs
@@ -6,7 +6,7 @@
         <table>
           <tr>
             <td>
-              <label for='login-account-name'>{{i18n login.username}}&nbsp;</label>
+              <label for='login-account-name'>{{i18n 'login.username'}}&nbsp;</label>
             </td>
             <td>
               {{text-field value=loginName placeholderKey="login.email_placeholder" id="login-account-name" autocorrect="off" autocapitalize="off" autofocus="autofocus"}}
@@ -15,18 +15,18 @@
           </tr>
           <tr>
             <td>
-                <label for='login-account-password'>{{i18n login.password}}&nbsp;</label>
+                <label for='login-account-password'>{{i18n 'login.password'}}&nbsp;</label>
             </td>
             <td>
                 {{password-field value=loginPassword type="password" id="login-account-password" maxlength="200" capsLockOn=capsLockOn}} &nbsp;
             </td>
             <td>
-              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n forgot_password.action}}</a>
+              <a id="forgot-password-link" {{action "showForgotPassword"}}>{{i18n 'forgot_password.action'}}</a>
             </td>
           </tr>
           <tr>
             <td></td>
-            <td><div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n login.caps_lock_warning}}</div></td>
+            <td><div {{bind-attr class=":caps-lock-warning capsLockOn::invisible"}}><i class="fa fa-exclamation-triangle"></i> {{i18n 'login.caps_lock_warning'}}</div></td>
             <td></td>
           </tr>
         </table>
@@ -47,13 +47,13 @@
     {{#if showSignupLink}}
       &nbsp;
       <button class="btn btn-large" id="new-account-link" {{action "createAccount"}}>
-        {{i18n create_account.title}}
+        {{i18n 'create_account.title'}}
       </button>
     {{/if}}
   {{/if}}
 
   {{#if authenticate}}
-    &nbsp; {{i18n login.authenticating}}
+    &nbsp; {{i18n 'login.authenticating'}}
   {{/if}}
 
   {{loading-spinner condition=showSpinner size="small"}}
diff --git a/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs
index b6a7b52699..cd13edbf9d 100644
--- a/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/merge_topic.hbs
@@ -5,7 +5,7 @@
     </div>
   {{/if}}
 
-  <p>{{{i18n topic.merge_topic.instructions count="selectedPostsCount"}}}</p>
+  <p>{{{i18n 'topic.merge_topic.instructions' count="selectedPostsCount"}}}</p>
 
   <form>
     {{choose-topic selectedTopicId=selectedTopicId}}
diff --git a/app/assets/javascripts/discourse/templates/modal/modal.hbs b/app/assets/javascripts/discourse/templates/modal/modal.hbs
index 8116605100..e52ad63b13 100644
--- a/app/assets/javascripts/discourse/templates/modal/modal.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/modal.hbs
@@ -9,7 +9,7 @@
       </div>
       <div id='modal-alert'></div>
 
-      {{outlet modalBody}}
+      {{outlet "modalBody"}}
 
       {{#each errors}}
         <div class="alert alert-error">
diff --git a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
index cee8245db0..f4d0f2e14f 100644
--- a/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/not_activated.hbs
@@ -1,11 +1,11 @@
 <div class="modal-body">
   {{#if emailSent}}
-    {{{i18n login.sent_activation_email_again currentEmail="currentEmail"}}}
+    {{{i18n 'login.sent_activation_email_again' currentEmail="currentEmail"}}}
   {{else}}
-    {{{i18n login.not_activated sentTo="sentTo"}}}
-    <a href="#" {{action "sendActivationEmail"}}>{{i18n login.resend_activation_email}}</a>
+    {{{i18n 'login.not_activated' sentTo="sentTo"}}}
+    <a href="#" {{action "sendActivationEmail"}}>{{i18n 'login.resend_activation_email'}}</a>
   {{/if}}
 </div>
 <div class="modal-footer">
-  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n close}}</button>
+  <button class='btn btn-primary' {{action "closeModal"}}>{{i18n 'close'}}</button>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/raw_email.hbs b/app/assets/javascripts/discourse/templates/modal/raw_email.hbs
index beaf5cb723..ad9f7ec508 100644
--- a/app/assets/javascripts/discourse/templates/modal/raw_email.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/raw_email.hbs
@@ -2,6 +2,6 @@
   {{#if rawEmail}}
     {{textarea value=rawEmail class="raw-email-textarea"}}
   {{else}}
-    {{i18n raw_email.not_available}}
+    {{i18n 'raw_email.not_available'}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/search_help.hbs b/app/assets/javascripts/discourse/templates/modal/search_help.hbs
index 5a9bf72d98..044ded4330 100644
--- a/app/assets/javascripts/discourse/templates/modal/search_help.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/search_help.hbs
@@ -1,6 +1,6 @@
 <div id="search-help" class="modal-body">
   {{{model}}}
   {{#if showGoogleSearch}}
-    {{{i18n google_search}}}
+    {{{i18n 'google_search'}}}
   {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs b/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
index ce83a0f191..820b7f0d1a 100644
--- a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
@@ -5,13 +5,13 @@
     </div>
   {{/if}}
 
-  {{{i18n topic.split_topic.instructions count="selectedPostsCount"}}}
+  {{{i18n 'topic.split_topic.instructions' count="selectedPostsCount"}}}
 
   <form>
-    <label>{{i18n topic.split_topic.topic_name}}</label>
+    <label>{{i18n 'topic.split_topic.topic_name'}}</label>
     {{text-field value=topicName placeholderKey="composer.title_placeholder" elementId='split-topic-name'}}
 
-    <label>{{i18n categories.category}}</label>
+    <label>{{i18n 'categories.category'}}</label>
     {{category-chooser value=categoryId}}
   </form>
 
diff --git a/app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs b/app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs
index 92d3a03e6a..330de1ad81 100644
--- a/app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/topic_bulk_actions.hbs
@@ -1,7 +1,7 @@
 <div class='modal-body'>
 
-  <p>{{{i18n topics.bulk.selected count=length}}}</p>
+  <p>{{{i18n 'topics.bulk.selected' count=length}}}</p>
 
-  {{outlet bulkOutlet}}
+  {{outlet "bulkOutlet"}}
 
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
index cba1067239..9957e2ffc0 100644
--- a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs
@@ -2,7 +2,7 @@
   {{#if allowLocal}}
     <div class="radios">
       <input type="radio" id="local" value="local" name="upload" {{action "useLocal"}}>
-      <label class="radio" for="local">{{i18n upload_selector.from_my_computer}}</label>
+      <label class="radio" for="local">{{i18n 'upload_selector.from_my_computer'}}</label>
       {{#if local}}
         <div class="inputs">
           <input type="file" id="filename-input"><br>
@@ -13,7 +13,7 @@
   {{/if}}
   <div class="radios">
     <input type="radio" id="remote" value="remote" name="upload" {{action "useRemote"}}>
-    <label class="radio" for="remote">{{i18n upload_selector.from_the_web}}</label>
+    <label class="radio" for="remote">{{i18n 'upload_selector.from_the_web'}}</label>
     {{#if remote}}
       <div class="inputs">
         <input type="text" id="fileurl-input" placeholder="http://example.com/image.png"><br>
@@ -25,7 +25,7 @@
     <div class="radios">
       <div class="inputs">
         <input type="text" id="link-input" placeholder="http://example.com"><br>
-        <span class="description">{{i18n upload_selector.image_link}}</span>
+        <span class="description">{{i18n 'upload_selector.image_link'}}</span>
       </div>
     </div>
   {{/if}}
@@ -39,8 +39,8 @@
 <div class="modal-footer">
   <button class="btn btn-primary" {{action "upload" target="view"}}>
     <span class='add-upload'><i {{bind-attr class=":fa view.uploadIcon"}}></i><i class='fa fa-plus'></i></span>
-    {{i18n upload}}
+    {{i18n 'upload'}}
   </button>
-  <a {{action "closeModal"}}>{{i18n cancel}}</a>
-  {{#if remote}}<a {{action "toggleShowMore"}} class="pull-right">{{i18n show_more}}</a>{{/if}}
+  <a {{action "closeModal"}}>{{i18n 'cancel'}}</a>
+  {{#if remote}}<a {{action "toggleShowMore"}} class="pull-right">{{i18n 'show_more'}}</a>{{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
index 7644841f58..1db91ae46e 100644
--- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs
@@ -8,8 +8,8 @@
 </ul>
 
 {{#if canCreateCategory}}
-  <button class='btn btn-default' {{action "createCategory"}}><i class='fa fa-plus'></i>{{i18n category.create}}</button>
+  <button class='btn btn-default' {{action "createCategory"}}><i class='fa fa-plus'></i>{{i18n 'category.create'}}</button>
 {{/if}}
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs
index ef35bd249f..4eb82f2fe4 100644
--- a/app/assets/javascripts/discourse/templates/navigation/category.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs
@@ -15,11 +15,11 @@
 {{/if}}
 
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
 {{/if}}
 
 {{#if canEditCategory}}
-  <button class='btn btn-default' {{action "editCategory" category}}><i class="fa fa-wrench"></i> {{i18n category.edit_long}}</button>
+  <button class='btn btn-default' {{action "editCategory" category}}><i class="fa fa-wrench"></i> {{i18n 'category.edit_long'}}</button>
 {{/if}}
 
 <section class='category-heading'>
diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs
index 88b276198f..bd3015d44a 100644
--- a/app/assets/javascripts/discourse/templates/navigation/default.hbs
+++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs
@@ -8,5 +8,5 @@
 </ul>
 
 {{#if canCreateTopic}}
-  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n topic.create}}</button>
+  <button id="create-topic" class='btn btn-default' {{action "createTopic"}}><i class='fa fa-plus'></i>{{i18n 'topic.create'}}</button>
 {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/notifications.hbs b/app/assets/javascripts/discourse/templates/notifications.hbs
index 491ece6270..5462af920f 100644
--- a/app/assets/javascripts/discourse/templates/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/notifications.hbs
@@ -6,11 +6,11 @@
           {{notification-item notification=this scope=scope}}
         {{/each}}
         <li class="read last">
-          <a href="/my/notifications">{{i18n notifications.more}}&hellip;</a>
+          <a href="/my/notifications">{{i18n 'notifications.more'}}&hellip;</a>
         </li>
       </ul>
     {{else}}
-      <div class="none">{{i18n notifications.none}}</div>
+      <div class="none">{{i18n 'notifications.none'}}</div>
     {{/if}}
   {{/loading-spinner}}
 </section>
diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs
index 6ff402a4cc..0dd6221b03 100644
--- a/app/assets/javascripts/discourse/templates/post.hbs
+++ b/app/assets/javascripts/discourse/templates/post.hbs
@@ -9,11 +9,11 @@
 
     <div class='topic-avatar'>
       <div class="contents">
-        {{#unless userDeleted}}
-          {{poster-avatar post=this classNames="main-avatar"}}
-        {{else}}
+        {{#unboundIf userDeleted}}
           <i class="fa fa-trash-o deleted-user-avatar"></i>
-        {{/unless}}
+        {{else}}
+          {{raw "post/poster-avatar" post=this classNames="main-avatar"}}
+        {{/unboundIf}}
         {{plugin-outlet "poster-avatar-bottom"}}
       </div>
     </div>
@@ -27,12 +27,12 @@
         {{#if hasHistory}}
           <div class='post-info edits'>
             {{#if can_view_edit_history}}
-              <a href class="{{unbound view.historyHeat}}" {{action "showHistory" this}} title="{{i18n post.last_edited_on}} {{raw-date updated_at}}">
+              <a href class="{{unbound view.historyHeat}}" {{action "showHistory" this}} title="{{i18n 'post.last_edited_on'}} {{raw-date updated_at}}">
                 {{editCount}}
                 <i class='fa fa-pencil'></i>
               </a>
             {{else}}
-              <span class="{{unbound view.historyHeat}}" title="{{i18n post.last_edited_on}} {{raw-date updated_at}}">
+              <span class="{{unbound view.historyHeat}}" title="{{i18n 'post.last_edited_on'}} {{raw-date updated_at}}">
                 {{editCount}}
                 <i class='fa fa-pencil'></i>
               </span>
@@ -40,31 +40,31 @@
           </div>
         {{/if}}
         {{#if wiki}}
-          <div class="post-info wiki" title="{{i18n post.wiki.about}}" {{action "editPost" this}}>{{fa-icon "pencil-square-o"}}</div>
+          <div class="post-info wiki" title="{{i18n 'post.wiki.about'}}" {{action "editPost" this}}>{{fa-icon "pencil-square-o"}}</div>
         {{/if}}
-        {{#if via_email}}
+        {{#unboundIf via_email}}
           {{#if canViewRawEmail}}
-            <div class="post-info via-email raw-email" title="{{i18n post.via_email}}" {{action "showRawEmail" this}}>{{fa-icon "envelope-o"}}</div>
+            <div class="post-info via-email raw-email" title="{{i18n 'post.via_email'}}" {{action "showRawEmail" this}}>{{fa-icon "envelope-o"}}</div>
           {{else}}
-            <div class="post-info via-email" title="{{i18n post.via_email}}">{{fa-icon "envelope-o"}}</div>
+            <div class="post-info via-email" title="{{i18n 'post.via_email'}}">{{fa-icon "envelope-o"}}</div>
           {{/if}}
-        {{/if}}
-        {{#if showUserReplyTab}}
+        {{/unboundIf}}
+        {{#unboundIf showUserReplyTab}}
         <a href {{action "toggleReplyHistory" this target="view"}} class='reply-to-tab'>
           {{#if loadingReplyHistory}}
-          {{i18n loading}}
+          {{i18n 'loading'}}
           {{else}}
           <i class="fa fa-mail-forward"></i>
           {{avatar reply_to_user imageSize="tiny"}}
           <span>{{reply_to_user.username}}</span>
           {{/if}}
         </a>
-        {{/if}}
-        <div {{bind-attr class=":read-state read"}} title="{{i18n post.unread}}">{{fa-icon "circle"}}</div>
+        {{/unboundIf}}
+        <div {{bind-attr class=":read-state read"}} title="{{i18n 'post.unread'}}">{{fa-icon "circle"}}</div>
       </div>
 
       <div {{bind-attr class=":select-posts controller.multiSelect::hidden"}}>
-        <button {{action "toggledSelectedPostReplies" this}} {{bind-attr class="view.canSelectReplies::hidden"}}>{{i18n topic.multi_select.select_replies}}</button>
+        <button {{action "toggledSelectedPostReplies" this}} {{bind-attr class="view.canSelectReplies::hidden"}}>{{i18n 'topic.multi_select.select_replies'}}</button>
         <button {{action "toggledSelectedPost" this}} class="select-post">{{view.selectPostText}}</button>
       </div>
 
@@ -74,13 +74,13 @@
           {{{cooked}}}
         </div>
         {{#if cooked_hidden}}
-          <a href {{action "expandHidden" this}}>{{i18n post.show_hidden}}</a>
+          <a href {{action "expandHidden" this}}>{{i18n 'post.show_hidden'}}</a>
         {{/if}}
         {{#if view.showExpandButton}}
           {{#if controller.loadingExpanded}}
-            <button class="btn expand-post" disabled>{{i18n loading}}</button>
+            <button class="btn expand-post" disabled>{{i18n 'loading'}}</button>
           {{else}}
-            <button {{action "expandFirstPost" this}} class='btn expand-post'>{{i18n post.show_full}}&hellip;</button>
+            <button {{action "expandFirstPost" this}} class='btn expand-post'>{{i18n 'post.show_full'}}&hellip;</button>
           {{/if}}
         {{/if}}
         {{view 'post-menu' post=this adminMenu=view.adminMenu}}
diff --git a/app/assets/javascripts/discourse/templates/post/poster-avatar.raw.hbs b/app/assets/javascripts/discourse/templates/post/poster-avatar.raw.hbs
new file mode 100644
index 0000000000..bc07a2ea44
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/post/poster-avatar.raw.hbs
@@ -0,0 +1 @@
+<a href="{{post.usernameUrl}}" classNames="trigger-user-card {{classNames}}" data-user-card="{{post.username}}">{{avatar post imageSize="large"}}</a>
diff --git a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
index 8a36a795d4..e62caac308 100644
--- a/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
+++ b/app/assets/javascripts/discourse/templates/preferences/card-badge.hbs
@@ -3,7 +3,7 @@
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n user.card_badge.title}}</h3>
+        <h3>{{i18n 'user.card_badge.title'}}</h3>
       </div>
     </div>
 
@@ -17,7 +17,7 @@
     <div class="control-group">
       <div class="controls">
         <button class="btn btn-primary" {{bind-attr disabled=disableSave}} {{action "save"}}>{{savingStatus}}</button>
-        {{#if saved}}{{i18n saved}}{{/if}}
+        {{#if saved}}{{i18n 'saved'}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/search.hbs b/app/assets/javascripts/discourse/templates/search.hbs
index 85a04bf4c0..dbf7f7c8fa 100644
--- a/app/assets/javascripts/discourse/templates/search.hbs
+++ b/app/assets/javascripts/discourse/templates/search.hbs
@@ -5,7 +5,7 @@
     {{input type="checkbox" name="searchContext" checked=searchContextEnabled}} {{searchContextDescription}}
     </label>
   {{/if}}
-  <a href="#" class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n show_help}}</a>
+  <a href="#" class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n 'show_help'}}</a>
 </div>
 {{#if loading}}
   <div class='searching'>{{loading-spinner}}</div>
@@ -21,14 +21,14 @@
       </ul>
         <div class='no-results'>
             {{#if resultType.more}}
-                <a href='#' class='filter' {{action "moreOfType" resultType.type bubbles=false}}>{{i18n show_more}} <i class="fa fa-chevron-down"></i></a>
+                <a href='#' class='filter' {{action "moreOfType" resultType.type bubbles=false}}>{{i18n 'show_more'}} <i class="fa fa-chevron-down"></i></a>
             {{else}}
             {{/if}}
         </div>
     {{/each}}
   {{else}}
     <div class='no-results'>
-      {{i18n search.no_results}}
+      {{i18n 'search.no_results'}}
     </div>
   {{/unless}}
   </div>
diff --git a/app/assets/javascripts/discourse/templates/search/post_result.hbs b/app/assets/javascripts/discourse/templates/search/post_result.hbs
index ca9caad16e..197ba51641 100644
--- a/app/assets/javascripts/discourse/templates/search/post_result.hbs
+++ b/app/assets/javascripts/discourse/templates/search/post_result.hbs
@@ -1,6 +1,6 @@
 <a class='search-link' href='{{unbound url}}'>
   <span class='topic'>
-    {{i18n search.post_format post_number=post_number username=username}}
+    {{i18n 'search.post_format' post_number=post_number username=username}}
   </span>
   {{#unless controller.site.mobileView}}
     <span class='blurb'>
diff --git a/app/assets/javascripts/discourse/templates/selected_posts.hbs b/app/assets/javascripts/discourse/templates/selected_posts.hbs
index a64a0aa3f7..9444999c61 100644
--- a/app/assets/javascripts/discourse/templates/selected_posts.hbs
+++ b/app/assets/javascripts/discourse/templates/selected_posts.hbs
@@ -1,25 +1,25 @@
 <p>{{countI18n topic.multi_select.description countBinding="selectedPostsCount"}}</p>
 
 {{#if canSelectAll}}
-  <p><a href='#' {{action "selectAll"}}>{{i18n topic.multi_select.select_all}}</a></p>
+  <p><a href='#' {{action "selectAll"}}>{{i18n 'topic.multi_select.select_all'}}</a></p>
 {{/if}}
 
 {{#if canDeselectAll}}
-  <p><a href='#' {{action "deselectAll"}}>{{i18n topic.multi_select.deselect_all}}</a></p>
+  <p><a href='#' {{action "deselectAll"}}>{{i18n 'topic.multi_select.deselect_all'}}</a></p>
 {{/if}}
 
 {{#if canDeleteSelected}}
-  <button class='btn' {{action "deleteSelected"}}><i class='fa fa-trash-o'></i> {{i18n topic.multi_select.delete}}</button>
+  <button class='btn' {{action "deleteSelected"}}><i class='fa fa-trash-o'></i> {{i18n 'topic.multi_select.delete'}}</button>
 {{/if}}
 
 {{#if canSplitTopic}}
-  <button class='btn' {{action "splitTopic"}}><i class='fa fa-sign-out'></i> {{i18n topic.split_topic.action}}</button>
+  <button class='btn' {{action "splitTopic"}}><i class='fa fa-sign-out'></i> {{i18n 'topic.split_topic.action'}}</button>
 {{/if}}
 {{#if canMergeTopic}}
-  <button class='btn' {{action "mergeTopic"}}><i class='fa fa-sign-out'></i> {{i18n topic.merge_topic.action}}</button>
+  <button class='btn' {{action "mergeTopic"}}><i class='fa fa-sign-out'></i> {{i18n 'topic.merge_topic.action'}}</button>
 {{/if}}
 {{#if canChangeOwner}}
-  <button class='btn' {{action "changeOwner"}}><i class='fa fa-user'></i> {{i18n topic.change_owner.action}}</button>
+  <button class='btn' {{action "changeOwner"}}><i class='fa fa-user'></i> {{i18n 'topic.change_owner.action'}}</button>
 {{/if}}
 
-<p class='cancel'><a href='#' {{action "toggleMultiSelect"}}>{{i18n topic.multi_select.cancel}}</a></p>
+<p class='cancel'><a href='#' {{action "toggleMultiSelect"}}>{{i18n 'topic.multi_select.cancel'}}</a></p>
diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs
index d81da9289b..a7c850f442 100644
--- a/app/assets/javascripts/discourse/templates/share.hbs
+++ b/app/assets/javascripts/discourse/templates/share.hbs
@@ -1,13 +1,18 @@
+{{#if controller.link}}
 <h3>{{view.title}}</h3>
 
 {{#if date}}
   <span class="date">{{displayDate}}</span>
 {{/if}}
 
-<div><input type='text' /></div>
+<div>
+  <input type='text' />
+  <div class="share-for-touch"><div class="overflow-ellipsis"><a></a></div></div>
+</div>
 
 {{each shareLinks itemView='share-link'}}
 
 <div class='link'>
-  <a href='#' {{action "close"}} title='{{i18n share.close}}'><i class="fa fa-times-circle"></i></a>
+  <a href='#' {{action "close"}} title='{{i18n 'share.close'}}'><i class="fa fa-times-circle"></i></a>
 </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/site_map.hbs b/app/assets/javascripts/discourse/templates/site_map.hbs
index 2270759076..794c300747 100644
--- a/app/assets/javascripts/discourse/templates/site_map.hbs
+++ b/app/assets/javascripts/discourse/templates/site_map.hbs
@@ -2,33 +2,33 @@
   <ul class="location-links">
     {{#if showAdminLinks}}
       <li>
-        <a href="/admin" class="admin-link"><i class='fa fa-wrench'></i> {{i18n admin_title}}</a>
+        <a href="/admin" class="admin-link"><i class='fa fa-wrench'></i> {{i18n 'admin_title'}}</a>
       </li>
       <li>
         <a href="/admin/flags/active" class="flagged-posts-link">
-          <i class='fa fa-flag'></i> {{i18n flags_title}}
+          <i class='fa fa-flag'></i> {{i18n 'flags_title'}}
           {{#if flaggedPostsCount}}
-            <span title='{{i18n notifications.total_flagged}}' class='badge-notification flagged-posts'>{{flaggedPostsCount}}</span>
+            <span title='{{i18n 'notifications.total_flagged'}}' class='badge-notification flagged-posts'>{{flaggedPostsCount}}</span>
           {{/if}}
         </a>
       </li>
     {{/if}}
     <li>
-      <a href="/latest" title="{{i18n filters.latest.help}}" class="latest-topics-link">{{i18n filters.latest.title}}</a>
+      <a href="/latest" title="{{i18n 'filters.latest.help'}}" class="latest-topics-link">{{i18n 'filters.latest.title'}}</a>
     </li>
     {{#if showBadgesLink}}
       <li>
-        <a href="{{unbound badgesUrl}}" class="badge-link">{{i18n badges.title}}</a>
+        <a href="{{unbound badgesUrl}}" class="badge-link">{{i18n 'badges.title'}}</a>
       </li>
     {{/if}}
     {{#if showKeyboardShortcuts}}
-      <li><a href="#" {{action "keyboardShortcuts"}} class="keyboard-shortcuts-link">{{i18n keyboard_shortcuts_help.title}}</a>
+      <li><a href="#" {{action "keyboardShortcuts"}} class="keyboard-shortcuts-link">{{i18n 'keyboard_shortcuts_help.title'}}</a></li>
     {{/if}}
     <li>
-      <a href="{{unbound faqUrl}}" class="faq-link">{{i18n faq}}</a>
+      <a href="{{unbound faqUrl}}" class="faq-link">{{i18n 'faq'}}</a>
     </li>
     <li>
-      {{#link-to 'about'}}{{i18n about.simple_title}}{{/link-to}}
+      {{#link-to 'about'}}{{i18n 'about.simple_title'}}{{/link-to}}
     </li>
     {{#if showMobileToggle}}
       <li><a href="#" class="mobile-toggle-link" {{action "toggleMobileView"}}>{{boundI18n mobileViewLinkTextKey}}</a></li>
@@ -37,8 +37,8 @@
 
   {{#if categories}}
     <ul class="category-links">
-      <li class="heading" title="{{i18n filters.categories.help}}">
-        {{#link-to "discovery.categories"}}{{i18n filters.categories.title}}{{/link-to}}
+      <li class="heading" title="{{i18n 'filters.categories.help'}}">
+        {{#link-to "discovery.categories"}}{{i18n 'filters.categories.title'}}{{/link-to}}
       </li>
 
       {{#each categories itemController='site-map-category'}}
diff --git a/app/assets/javascripts/discourse/templates/static.hbs b/app/assets/javascripts/discourse/templates/static.hbs
index e6aa2f99a7..ff09643a72 100644
--- a/app/assets/javascripts/discourse/templates/static.hbs
+++ b/app/assets/javascripts/discourse/templates/static.hbs
@@ -3,7 +3,7 @@
     {{{html}}}
 
     {{#if showLoginButton}}
-      <button class="btn btn-primary" {{action "showLogin"}}><i class="fa fa-user"></i>{{i18n log_in}}</button>
+      <button class="btn btn-primary" {{action "showLogin"}}><i class="fa fa-user"></i>{{i18n 'log_in'}}</button>
     {{/if}}
   </div>
 </div>
diff --git a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
index b2ec69b1e3..0b724ec247 100644
--- a/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-admin-menu.hbs
@@ -1,49 +1,49 @@
-<h3>{{i18n admin_title}}</h3>
+<h3>{{i18n 'admin_title'}}</h3>
 
 <ul>
     <li>
-      <button {{action "toggleMultiSelect"}} class='btn btn-admin'>{{fa-icon tasks}} {{i18n topic.actions.multi_select}}</button>
+      <button {{action "toggleMultiSelect"}} class='btn btn-admin'>{{fa-icon tasks}} {{i18n 'topic.actions.multi_select'}}</button>
     </li>
 
   {{#if details.can_delete}}
     <li>
-      <button {{action "deleteTopic"}} class='btn btn-admin btn-danger'>{{fa-icon trash-o}} {{i18n topic.actions.delete}}</button>
+      <button {{action "deleteTopic"}} class='btn btn-admin btn-danger'>{{fa-icon trash-o}} {{i18n 'topic.actions.delete'}}</button>
     </li>
   {{/if}}
 
   {{#if showRecover}}
     <li>
-      <button {{action "recoverTopic"}} class='btn btn-admin'>{{fa-icon undo}} {{i18n topic.actions.recover}}</button>
+      <button {{action "recoverTopic"}} class='btn btn-admin'>{{fa-icon undo}} {{i18n 'topic.actions.recover'}}</button>
     </li>
   {{/if}}
 
   <li>
     {{#if closed}}
-      <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon unlock}} {{i18n topic.actions.open}}</button>
+      <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon unlock}} {{i18n 'topic.actions.open'}}</button>
     {{else}}
-      <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon lock}} {{i18n topic.actions.close}}</button>
-      <button {{action "showAutoClose"}} class='btn btn-admin'>{{fa-icon clock-o}} {{i18n topic.actions.auto_close}}</button>
+      <button {{action "toggleClosed"}} class='btn btn-admin'>{{fa-icon lock}} {{i18n 'topic.actions.close'}}</button>
+      <button {{action "showAutoClose"}} class='btn btn-admin'>{{fa-icon clock-o}} {{i18n 'topic.actions.auto_close'}}</button>
     {{/if}}
   </li>
 
   {{#unless isPrivateMessage}}
     <li>
       {{#if isBanner}}
-        <button {{action "removeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n topic.actions.remove_banner}}</button>
+        <button {{action "removeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n 'topic.actions.remove_banner'}}</button>
       {{else}}
         {{#if visible}}
-          <button {{action "makeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n topic.actions.make_banner}}</button>
+          <button {{action "makeBanner"}} class='btn btn-admin'>{{fa-icon bullhorn}} {{i18n 'topic.actions.make_banner'}}</button>
         {{/if}}
       {{/if}}
     </li>
 
     <li>
       {{#if pinned_at}}
-        <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n topic.actions.unpin}}</button>
+        <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n 'topic.actions.unpin'}}</button>
       {{else}}
         {{#if visible}}
-          <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n topic.actions.pin}}</button>
-          <button {{action "togglePinnedGlobally"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n topic.actions.pin_globally}}</button>
+          <button {{action "togglePinned"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n 'topic.actions.pin'}}</button>
+          <button {{action "togglePinnedGlobally"}} class='btn btn-admin'>{{fa-icon thumb-tack}} {{i18n 'topic.actions.pin_globally'}}</button>
         {{/if}}
       {{/if}}
     </li>
@@ -51,17 +51,17 @@
 
   <li>
     {{#if archived}}
-      <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n topic.actions.unarchive}}</button>
+      <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n 'topic.actions.unarchive'}}</button>
     {{else}}
-      <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n topic.actions.archive}}</button>
+      <button {{action "toggleArchived"}} class='btn btn-admin'>{{fa-icon folder}} {{i18n 'topic.actions.archive'}}</button>
     {{/if}}
   </li>
 
   <li>
     {{#if visible}}
-      <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye-slash}} {{i18n topic.actions.invisible}}</button>
+      <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye-slash}} {{i18n 'topic.actions.invisible'}}</button>
     {{else}}
-      <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye}} {{i18n topic.actions.visible}}</button>
+      <button {{action "toggleVisibility"}} class='btn btn-admin'>{{fa-icon eye}} {{i18n 'topic.actions.visible'}}</button>
     {{/if}}
   </li>
 
diff --git a/app/assets/javascripts/discourse/templates/topic-progress.hbs b/app/assets/javascripts/discourse/templates/topic-progress.hbs
index a04f5bec48..ab575a6412 100644
--- a/app/assets/javascripts/discourse/templates/topic-progress.hbs
+++ b/app/assets/javascripts/discourse/templates/topic-progress.hbs
@@ -2,18 +2,18 @@
   <nav id='topic-progress-expanded'>
     <button {{action "jumpTop"}} {{bind-attr disabled=jumpTopDisabled}} class='btn full no-text'>
       <i class="fa fa-caret-up"></i>
-      {{i18n topic.progress.go_top}}
+      {{i18n 'topic.progress.go_top'}}
     </button>
     <div class='jump-form'>
-      {{input value=toPostIndex}} <button {{action "jumpPost"}} class='btn'>{{i18n topic.progress.go}}</button>
+      {{input value=toPostIndex}} <button {{action "jumpPost"}} class='btn'>{{i18n 'topic.progress.go'}}</button>
     </div>
     <button {{action "jumpBottom"}} {{bind-attr disabled=jumpBottomDisabled}} class='btn full no-text jump-bottom'>
-      {{i18n topic.progress.go_bottom}}
+      {{i18n 'topic.progress.go_bottom'}}
       <i class="fa fa-caret-down"></i>
     </button>
   </nav>
 {{/if}}
-<nav id='topic-progress' title="{{i18n topic.progress.title}}" {{bind-attr class="hideProgress:hidden"}}>
+<nav id='topic-progress' title="{{i18n 'topic.progress.title'}}" {{bind-attr class="hideProgress:hidden"}}>
   <div class='nums'>
     <h4>{{progressPosition}}</h4><span {{bind-attr class="hugeNumberOfPosts:hidden"}}> <span>/</span> <h4>{{postStream.filteredPostsCount}}</h4></span>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 37feb1da48..0a63267ead 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -43,7 +43,7 @@
               {{/if}}
 
               {{#if details.can_edit}}
-                <a href='#' {{action "editTopic"}} class='edit-topic' title='{{i18n edit}}'>{{fa-icon pencil}}</a>
+                <a href='#' {{action "editTopic"}} class='edit-topic' title='{{i18n 'edit'}}'>{{fa-icon pencil}}</a>
               {{/if}}
             </h1>
 
@@ -73,12 +73,12 @@
           {{loading-spinner condition=postStream.loadingAbove}}
 
           {{#unless postStream.loadingFilter}}
-            {{cloaked-collection cloakView="post"
+            {{cloaked-collection itemViewClass="post"
                                  idProperty="post_number"
                                  defaultHeight="200"
                                  content=postStream.posts
                                  slackRatio="15"
-                                 loadingHTML=controller.loadingHTML
+                                 loadingHTML=""
                                  preservesContext="true"
                                  uncloakDefault="true"
                                  offsetFixedTop="header"
@@ -97,7 +97,7 @@
 
             {{#if details.suggested_topics.length}}
               <div id='suggested-topics'>
-                <h3>{{i18n suggested_topics.title}}</h3>
+                <h3>{{i18n 'suggested_topics.title'}}</h3>
                 <div class='topics'>
                   {{basic-topic-list topics=details.suggested_topics postsAction="showTopicEntrance"}}
                 </div>
@@ -122,10 +122,10 @@
           <div>{{message}}</div>
           {{#if noRetry}}
             {{#unless currentUser}}
-              <button {{action "showLogin"}} class='btn btn-primary topic-retry'>{{fa-icon user}} {{i18n log_in}}</button>
+              <button {{action "showLogin"}} class='btn btn-primary topic-retry'>{{fa-icon user}} {{i18n 'log_in'}}</button>
             {{/unless}}
           {{else}}
-            <button class="btn btn-primary topic-retry" {{action "retryLoading"}}>{{fa-icon "refresh"}} {{i18n errors.buttons.again}}</button>
+            <button class="btn btn-primary topic-retry" {{action "retryLoading"}}>{{fa-icon "refresh"}} {{i18n 'errors.buttons.again'}}</button>
           {{/if}}
         </div>
         {{loading-spinner condition=retrying}}
diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs
index b5dc6f39c5..de62551daa 100644
--- a/app/assets/javascripts/discourse/templates/user-card.hbs
+++ b/app/assets/javascripts/discourse/templates/user-card.hbs
@@ -1,3 +1,4 @@
+{{#if controller.visible}}
 <div class="card-content">
   {{#link-to 'user' user}}{{bound-avatar avatar "huge"}}{{/link-to}}
 
@@ -23,23 +24,27 @@
 
   <ul class="usercard-controls">
     {{#if user.can_send_private_message_to_user}}
-      <li><a class='btn btn-primary' {{action "composePrivateMessage" user}}>{{fa-icon "envelope"}}{{i18n user.private_message}}</a></li>
+      <li><a class='btn btn-primary' {{action "composePrivateMessage" user}}>{{fa-icon "envelope"}}{{i18n 'user.private_message'}}</a></li>
     {{/if}}
 
     {{#if showFilter}}
-    <li><a class='btn' {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n topic.filter_to username="username" post_count="participant.post_count"}}</a></li>
+      <li><a class='btn' {{action "togglePosts" user}}>{{fa-icon "filter"}}{{i18n 'topic.filter_to' username="username" post_count="participant.post_count"}}</a></li>
     {{/if}}
 
     {{#if hasUserFilters}}
-    <li><a class='btn' {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n topic.filters.cancel}}</a></li>
+      <li><a class='btn' {{action "cancelFilter"}}>{{fa-icon "times"}}{{i18n 'topic.filters.cancel'}}</a></li>
+    {{/if}}
+
+    {{#if showDelete}}
+      <li><a class='btn btn-danger' {{action "deleteUser" user}}>{{fa-icon "exclamation-triangle"}}{{i18n 'admin.user.delete'}}</a></li>
     {{/if}}
   </ul>
 
   {{#if isSuspended}}
     <div class='suspended'>
       {{fa-icon "ban"}}
-      <b>{{i18n user.suspended_notice date="user.suspendedTillDate"}}</b><br/>
-      <b>{{i18n user.suspended_reason}}</b> {{user.suspend_reason}}
+      <b>{{i18n 'user.suspended_notice' date="user.suspendedTillDate"}}</b><br/>
+      <b>{{i18n 'user.suspended_reason'}}</b> {{user.suspend_reason}}
     </div>
   {{else}}
     {{#if user.bio_cooked}}<div class='bio'>{{text-overflow class="overflow" text=user.bio_cooked}}</div>{{/if}}
@@ -52,10 +57,10 @@
   {{/if}}
 
   {{#if user}}
-  <div class="metadata">
-    <h3><span class='desc'>{{i18n last_post}}</span> {{format-date path="user.last_posted_at" leaveAgo="true"}} </h3>
-    <h3><span class='desc'>{{i18n joined}}</span> {{format-date path="user.created_at" leaveAgo="true"}}</h3>
-  </div>
+    <div class="metadata">
+      <h3><span class='desc'>{{i18n 'last_post'}}</span> {{format-date path="user.last_posted_at" leaveAgo="true"}}</h3>
+      <h3><span class='desc'>{{i18n 'joined'}}</span> {{format-date path="user.created_at" leaveAgo="true"}}</h3>
+    </div>
   {{/if}}
 
   {{#if showBadges}}
@@ -65,9 +70,10 @@
       {{/each}}
       {{#if showMoreBadges}}
         {{#link-to 'user.badges' user class="btn more-user-badges"}}
-          {{i18n badges.more_badges count=moreBadgesCount}}
+          {{i18n 'badges.more_badges' count=moreBadgesCount}}
         {{/link-to}}
       {{/if}}
     </div>
   {{/if}}
 </div>
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user-dropdown.hbs b/app/assets/javascripts/discourse/templates/user-dropdown.hbs
index 2327c4e0d5..9b3323d409 100644
--- a/app/assets/javascripts/discourse/templates/user-dropdown.hbs
+++ b/app/assets/javascripts/discourse/templates/user-dropdown.hbs
@@ -1,13 +1,13 @@
 <section class='d-dropdown' id='user-dropdown'>
   <ul class='user-dropdown-links'>
-    <li>{{#link-to 'user' currentUser class="user-activity-link" }}{{i18n user.profile}}{{/link-to}}</li>
+    <li>{{#link-to 'user' currentUser class="user-activity-link" }}{{i18n 'user.profile'}}{{/link-to}}</li>
     <li>
     {{#link-to 'userPrivateMessages.index' currentUser class='user-messages-link'}}
-      {{i18n user.unread_message_count}}{{#if currentUser.unread_private_messages}} <span class="badge-notification unread-private-messages">{{currentUser.unread_private_messages}}</span>{{/if}}
+      {{i18n 'user.unread_message_count'}}{{#if currentUser.unread_private_messages}} <span class="badge-notification unread-private-messages">{{currentUser.unread_private_messages}}</span>{{/if}}
     {{/link-to}}
     </li>
-    <li>{{#link-to 'userActivity.bookmarks' currentUser}}{{i18n user.bookmarks}}{{/link-to}}</li>
-    <li>{{#link-to 'preferences' currentUser}}{{i18n user.preferences}}{{/link-to}}</li>
-    <li><button {{action "logout"}} class='btn btn-danger right logout'><i class='fa fa-sign-out'></i>{{i18n user.log_out}}</button></li>
+    <li>{{#link-to 'userActivity.bookmarks' currentUser}}{{i18n 'user.bookmarks'}}{{/link-to}}</li>
+    <li>{{#link-to 'preferences' currentUser}}{{i18n 'user.preferences'}}{{/link-to}}</li>
+    <li><button {{action "logout"}} class='btn btn-danger right logout'><i class='fa fa-sign-out'></i>{{i18n 'user.log_out'}}</button></li>
   </ul>
 </section>
diff --git a/app/assets/javascripts/discourse/templates/user/about.hbs b/app/assets/javascripts/discourse/templates/user/about.hbs
index c535b10cf0..5d24cf4d3a 100644
--- a/app/assets/javascripts/discourse/templates/user/about.hbs
+++ b/app/assets/javascripts/discourse/templates/user/about.hbs
@@ -2,20 +2,20 @@
 
   <div class="control-group">
     <div class="controls">
-      <h3>{{i18n user.change_about.title}}</h3>
+      <h3>{{i18n 'user.change_about.title'}}</h3>
     </div>
   </div>
 
   {{#if error}}
     <div class="control-group">
       <div class="instructions">
-        <div class='alert alert-error'>{{i18n user.change_about.error}}</div>
+        <div class='alert alert-error'>{{i18n 'user.change_about.error'}}</div>
       </div>
     </div>
   {{/if}}
 
   <div class="control-group">
-    <label class="control-label">{{i18n user.bio}}</label>
+    <label class="control-label">{{i18n 'user.bio'}}</label>
     <div class="controls">
       {{pagedown-editor value=bio_raw}}
     </div>
@@ -24,7 +24,7 @@
   <div class="control-group">
     <div class="controls">
         <button {{action "changeAbout"}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
-        {{#if saved}}{{i18n saved}}{{/if}}
+        {{#if saved}}{{i18n 'saved'}}{{/if}}
     </div>
   </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/badge-title.hbs b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
index 0072c3fb6c..d95f4ff77f 100644
--- a/app/assets/javascripts/discourse/templates/user/badge-title.hbs
+++ b/app/assets/javascripts/discourse/templates/user/badge-title.hbs
@@ -3,7 +3,7 @@
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n badges.select_badge_for_title}}</h3>
+        <h3>{{i18n 'badges.select_badge_for_title'}}</h3>
       </div>
     </div>
 
@@ -17,7 +17,7 @@
     <div class="control-group">
       <div class="controls">
         <button class="btn btn-primary" {{bind-attr disabled=disableSave}} {{action "save"}}>{{savingStatus}}</button>
-        {{#if saved}}{{i18n saved}}{{/if}}
+        {{#if saved}}{{i18n 'saved'}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/templates/user/email.hbs b/app/assets/javascripts/discourse/templates/user/email.hbs
index 5f35accede..2a1a1bc76f 100644
--- a/app/assets/javascripts/discourse/templates/user/email.hbs
+++ b/app/assets/javascripts/discourse/templates/user/email.hbs
@@ -3,14 +3,14 @@
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n user.change_email.title}}</h3>
+        <h3>{{i18n 'user.change_email.title'}}</h3>
       </div>
     </div>
 
     {{#if success}}
         <div class="control-group">
           <div class="instructions">
-            <p>{{i18n user.change_email.success}}</p>
+            <p>{{i18n 'user.change_email.success'}}</p>
           </div>
         </div>
     {{else}}
@@ -23,15 +23,15 @@
       {{/if}}
 
       <div class="control-group">
-        <label class="control-label">{{i18n user.email.title}}</label>
+        <label class="control-label">{{i18n 'user.email.title'}}</label>
         <div class="controls">
           {{text-field value=newEmail id="change_email" classNames="input-xxlarge"}}
         </div>
         <div class='instructions'>
           {{#if taken}}
-            {{i18n user.change_email.taken}}
+            {{i18n 'user.change_email.taken'}}
           {{else}}
-            {{i18n user.email.instructions}}
+            {{i18n 'user.email.instructions'}}
           {{/if}}
 
         </div>
diff --git a/app/assets/javascripts/discourse/templates/user/invited.hbs b/app/assets/javascripts/discourse/templates/user/invited.hbs
index f7679148c2..cdc8b7836f 100644
--- a/app/assets/javascripts/discourse/templates/user/invited.hbs
+++ b/app/assets/javascripts/discourse/templates/user/invited.hbs
@@ -1,10 +1,10 @@
 {{#if canInviteToForum}}
   <section class='user-content'>
 
-    <h2>{{i18n user.invited.title}}</h2>
+    <h2>{{i18n 'user.invited.title'}}</h2>
 
     <div class="pull-right">
-      <button {{action "showInvite"}} class='btn'>{{i18n user.invited.create}}</button>
+      <button {{action "showInvite"}} class='btn'>{{i18n 'user.invited.create'}}</button>
       {{#if canBulkInvite}}
         {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}}
       {{/if}}
@@ -19,14 +19,14 @@
     {{#if model.invites}}
       <table class='table invite-list'>
         <tr>
-          <th>{{i18n user.invited.user}}</th>
-          <th>{{i18n user.invited.redeemed_at}}</th>
+          <th>{{i18n 'user.invited.user'}}</th>
+          <th>{{i18n 'user.invited.redeemed_at'}}</th>
           {{#if can_see_invite_details}}
-            <th>{{i18n user.last_seen}}</th>
-            <th>{{i18n user.invited.topics_entered}}</th>
-            <th>{{i18n user.invited.posts_read_count}}</th>
-            <th>{{i18n user.invited.time_read}}</th>
-            <th>{{i18n user.invited.days_visited}}</th>
+            <th>{{i18n 'user.last_seen'}}</th>
+            <th>{{i18n 'user.invited.topics_entered'}}</th>
+            <th>{{i18n 'user.invited.posts_read_count'}}</th>
+            <th>{{i18n 'user.invited.time_read'}}</th>
+            <th>{{i18n 'user.invited.days_visited'}}</th>
           {{/if}}
         </tr>
         {{#each invite in model.invites}}
@@ -42,27 +42,27 @@
                 <td>{{number invite.user.topics_entered}}</td>
                 <td>{{number invite.user.posts_read_count}}</td>
                 <td>{{{unbound invite.user.time_read}}}</td>
-                <td><span title="{{i18n user.invited.days_visited}}">{{{unbound invite.user.days_visited}}}</span>
+                <td><span title="{{i18n 'user.invited.days_visited'}}">{{{unbound invite.user.days_visited}}}</span>
                     /
-                  <span title="{{i18n user.invited.account_age_days}}">{{{unbound invite.user.days_since_created}}}</span></td>
+                  <span title="{{i18n 'user.invited.account_age_days'}}">{{{unbound invite.user.days_since_created}}}</span></td>
               {{/if}}
             {{else}}
               <td>{{unbound invite.email}}</td>
               <td colspan='6'>
                 {{#if invite.expired}}
-                  {{i18n user.invited.expired}}
+                  {{i18n 'user.invited.expired'}}
                   &nbsp;&nbsp;&nbsp;&nbsp;
                 {{/if}}
                 {{#if invite.rescinded}}
-                  {{i18n user.invited.rescinded}}
+                  {{i18n 'user.invited.rescinded'}}
                 {{else}}
-                  <button class='btn' {{action "rescind" invite}}><i class="fa fa-times"></i>{{i18n user.invited.rescind}}</button>
+                  <button class='btn' {{action "rescind" invite}}><i class="fa fa-times"></i>{{i18n 'user.invited.rescind'}}</button>
                 {{/if}}
                 &nbsp;&nbsp;&nbsp;&nbsp;
                 {{#if invite.reinvited}}
-                  {{i18n user.invited.reinvited}}
+                  {{i18n 'user.invited.reinvited'}}
                 {{else}}
-                  <button class='btn' {{action "reinvite" invite}}><i class="fa fa-envelope"></i>{{i18n user.invited.reinvite}}</button>
+                  <button class='btn' {{action "reinvite" invite}}><i class="fa fa-envelope"></i>{{i18n 'user.invited.reinvite'}}</button>
                 {{/if}}
               </td>
             {{/if}}
@@ -73,9 +73,9 @@
 
     {{else}}
       {{#if canBulkInvite}}
-        {{{i18n user.invited.bulk_invite.none}}}
+        {{{i18n 'user.invited.bulk_invite.none'}}}
       {{else}}
-        {{i18n user.invited.none}}
+        {{i18n 'user.invited.none'}}
       {{/if}}
     {{/if}}
 
diff --git a/app/assets/javascripts/discourse/templates/user/notifications.hbs b/app/assets/javascripts/discourse/templates/user/notifications.hbs
index 2a8816a57b..1fe55c95f6 100644
--- a/app/assets/javascripts/discourse/templates/user/notifications.hbs
+++ b/app/assets/javascripts/discourse/templates/user/notifications.hbs
@@ -1,16 +1,16 @@
 {{#if model.error}}
   <div class="item error">
     {{#if model.forbidden}}
-      {{i18n errors.reasons.forbidden}}
+      {{i18n 'errors.reasons.forbidden'}}
     {{else}}
-      {{i18n errors.desc.unknown}}
+      {{i18n 'errors.desc.unknown'}}
     {{/if}}
   </div>
 {{/if}}
 
 {{#if showDismissButton}}
   <div class='notification-buttons'>
-    <button title="{{i18n user.dismiss_notifications_tooltip}}" id='dismiss-notifications-top' class='btn notifications-read' {{action "resetNew"}}>{{i18n user.dismiss_notifications}}</button>
+    <button title="{{i18n 'user.dismiss_notifications_tooltip'}}" id='dismiss-notifications-top' class='btn notifications-read' {{action "resetNew"}}>{{i18n 'user.dismiss_notifications'}}</button>
   </div>
 {{/if}}
 
@@ -27,7 +27,7 @@
   {{#unless canLoadMore}}
     {{#if showDismissButton}}
       <div class='notification-buttons'>
-        <button title="{{i18n user.dismiss_notifications_tooltip}}" id='dismiss-notifications' class='btn notifications-read' {{action "resetNew"}}>{{i18n user.dismiss_notifications}}</button>
+        <button title="{{i18n 'user.dismiss_notifications_tooltip'}}" id='dismiss-notifications' class='btn notifications-read' {{action "resetNew"}}>{{i18n 'user.dismiss_notifications'}}</button>
       </div>
     {{/if}}
   {{/unless}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index f5719294ba..2e6dd5cbce 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -9,7 +9,7 @@
     </div>
 
     <div class="control-group pref-username">
-      <label class="control-label">{{i18n user.username.title}}</label>
+      <label class="control-label">{{i18n 'user.username.title'}}</label>
       <div class="controls">
         <span class='static'>{{username}}</span>
         {{#if can_edit_username}}
@@ -17,13 +17,13 @@
         {{/if}}
       </div>
       <div class='instructions'>
-        {{{i18n user.username.short_instructions username="username"}}}
+        {{{i18n 'user.username.short_instructions' username="username"}}}
       </div>
     </div>
 
     {{#if canEditName}}
       <div class="control-group pref-name">
-        <label class="control-label">{{i18n user.name.title}}</label>
+        <label class="control-label">{{i18n 'user.name.title'}}</label>
         <div class="controls">
           {{#if can_edit_name}}
             {{text-field value=newNameInput classNames="input-xxlarge"}}
@@ -32,14 +32,14 @@
           {{/if}}
         </div>
         <div class='instructions'>
-          {{i18n user.name.instructions}}
+          {{i18n 'user.name.instructions'}}
         </div>
       </div>
     {{/if}}
 
     {{#if canSelectTitle}}
       <div class="control-group pref-title">
-        <label class="control-label">{{i18n user.title.title}}</label>
+        <label class="control-label">{{i18n 'user.title.title'}}</label>
         <div class="controls">
           <span class="static">{{title}}</span>
           {{#link-to "preferences.badgeTitle" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
@@ -49,7 +49,7 @@
 
     {{#if canCheckEmails}}
       <div class="control-group pref-email">
-        <label class="control-label">{{i18n user.email.title}}</label>
+        <label class="control-label">{{i18n 'user.email.title'}}</label>
         {{#if email}}
           <div class="controls">
             <span class='static'>{{email}}</span>
@@ -58,11 +58,11 @@
             {{/if}}
           </div>
           <div class='instructions'>
-            {{i18n user.email.instructions}}
+            {{i18n 'user.email.instructions'}}
           </div>
         {{else}}
           <div class="controls">
-            <button class="btn" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+            <button class="btn" title="{{i18n 'admin.users.check_email.title'}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n 'admin.users.check_email.text'}}</button>
           </div>
         {{/if}}
       </div>
@@ -70,13 +70,13 @@
 
     {{#if canChangePassword}}
     <div class="control-group pref-password">
-      <label class="control-label">{{i18n user.password.title}}</label>
+      <label class="control-label">{{i18n 'user.password.title'}}</label>
       <div class="controls">
         <a href="#" {{action "changePassword"}} class='btn'><i class="fa fa-envelope"></i>
           {{#if no_password}}
-            {{i18n user.change_password.set_password}}
+            {{i18n 'user.change_password.set_password'}}
           {{else}}
-            {{i18n user.change_password.action}}
+            {{i18n 'user.change_password.action'}}
           {{/if}}
         </a>
         {{passwordProgress}}
@@ -85,20 +85,20 @@
     {{/if}}
 
     <div class="control-group pref-avatar">
-      <label class="control-label">{{i18n user.avatar.title}}</label>
+      <label class="control-label">{{i18n 'user.avatar.title'}}</label>
       <div class="controls">
         {{bound-avatar model "large"}}
         {{#if allowAvatarUpload}}
           <button {{action "showAvatarSelector"}} class="btn pad-left no-text"><i class="fa fa-pencil"></i></button>
         {{else}} {{#unless ssoOverridesAvatar}}
-          <a href="//gravatar.com/emails" target="_blank" title="{{i18n user.change_avatar.gravatar_title}}" class="btn no-text"><i class="fa fa-pencil"></i></a>
+          <a href="//gravatar.com/emails" target="_blank" title="{{i18n 'user.change_avatar.gravatar_title'}}" class="btn no-text"><i class="fa fa-pencil"></i></a>
         {{/unless}} {{/if}}
       </div>
     </div>
 
     {{#if allowBackgrounds}}
       <div class="control-group pref-profile-bg">
-        <label class="control-label">{{i18n user.change_profile_background.title}}</label>
+        <label class="control-label">{{i18n 'user.change_profile_background.title'}}</label>
         <div class="controls">
           {{image-uploader uploadUrl=imageUploadUrl
                            imageUrl=profile_background
@@ -106,12 +106,12 @@
                            type="profile_background"}}
         </div>
         <div class='instructions'>
-          {{i18n user.change_profile_background.instructions}}
+          {{i18n 'user.change_profile_background.instructions'}}
         </div>
       </div>
 
       <div class="control-group pref-profile-bg">
-        <label class="control-label">{{i18n user.change_card_background.title}}</label>
+        <label class="control-label">{{i18n 'user.change_card_background.title'}}</label>
         <div class="controls">
           {{image-uploader uploadUrl=imageUploadUrl
                            imageUrl=card_background
@@ -119,46 +119,46 @@
                            type="card_background"}}
         </div>
         <div class='instructions'>
-          {{i18n user.change_card_background.instructions}}
+          {{i18n 'user.change_card_background.instructions'}}
         </div>
       </div>
     {{/if}}
 
     {{#if allowUserLocale}}
       <div class="control-group pref-locale">
-        <label class="control-label">{{i18n user.locale.title}}</label>
+        <label class="control-label">{{i18n 'user.locale.title'}}</label>
         <div class="controls">
           {{combo-box valueAttribute="value" content=availableLocales value=locale none="user.locale.default"}}
         </div>
         <div class='instructions'>
-          {{i18n user.locale.instructions}}
+          {{i18n 'user.locale.instructions'}}
         </div>
       </div>
     {{/if}}
 
     <div class="control-group pref-bio">
-      <label class="control-label">{{i18n user.bio}}</label>
+      <label class="control-label">{{i18n 'user.bio'}}</label>
       <div class="controls bio-composer">
         {{pagedown-editor value=bio_raw}}
       </div>
     </div>
 
     <div class="control-group pref-location">
-      <label class="control-label">{{i18n user.location}}</label>
+      <label class="control-label">{{i18n 'user.location'}}</label>
       <div class="controls">
         {{input type="text" value=location class="input-xxlarge"}}
       </div>
     </div>
 
     <div class="control-group pref-website">
-      <label class="control-label">{{i18n user.website}}</label>
+      <label class="control-label">{{i18n 'user.website'}}</label>
       <div class="controls">
         {{input type="text" value=website class="input-xxlarge"}}
       </div>
     </div>
 
     <div class="control-group pref-card-badge">
-      <label class="control-label">{{i18n user.card_badge.title}}</label>
+      <label class="control-label">{{i18n 'user.card_badge.title'}}</label>
       <div class="controls">
         {{#if card_image_badge}}
           {{icon-or-image card_image_badge}}
@@ -168,7 +168,7 @@
     </div>
 
     <div class="control-group pref-email-settings">
-      <label class="control-label">{{i18n user.email_settings}}</label>
+      <label class="control-label">{{i18n 'user.email_settings'}}</label>
       {{preference-checkbox labelKey="user.email_digests.title" checked=email_digests}}
       {{#if email_digests}}
         <div class='controls controls-dropdown'>
@@ -181,19 +181,19 @@
       {{preference-checkbox labelKey="user.email_always" checked=email_always}}
 
       <div class='instructions'>
-        {{i18n user.email.frequency}}
+        {{i18n 'user.email.frequency' count=siteSettings.email_time_window_mins}}
       </div>
     </div>
 
     <div class="control-group other">
-      <label class="control-label">{{i18n user.other_settings}}</label>
+      <label class="control-label">{{i18n 'user.other_settings'}}</label>
       <div class="controls controls-dropdown">
-        <label>{{i18n user.auto_track_topics}}</label>
+        <label>{{i18n 'user.auto_track_topics'}}</label>
         {{combo-box valueAttribute="value" content=autoTrackDurations value=auto_track_topics_after_msecs}}
       </div>
 
       <div class="controls controls-dropdown">
-        <label>{{i18n user.new_topic_duration.label}}</label>
+        <label>{{i18n 'user.new_topic_duration.label'}}</label>
         {{combo-box valueAttribute="value" content=considerNewTopicOptions value=new_topic_duration_minutes}}
       </div>
 
@@ -213,22 +213,22 @@
     {{/each}}
 
     <div class="control-group category">
-      <label class="control-label">{{i18n user.categories_settings}}</label>
+      <label class="control-label">{{i18n 'user.categories_settings'}}</label>
       <div class="controls category-controls">
-        <label>{{i18n user.watched_categories}}</label>
+        <label>{{i18n 'user.watched_categories'}}</label>
         {{category-group categories=watchedCategories blacklist=selectedCategories}}
       </div>
-      <div class="instructions">{{i18n user.watched_categories_instructions}}</div>
+      <div class="instructions">{{i18n 'user.watched_categories_instructions'}}</div>
       <div class="controls category-controls">
-        <label>{{i18n user.tracked_categories}}</label>
+        <label>{{i18n 'user.tracked_categories'}}</label>
         {{category-group categories=trackedCategories blacklist=selectedCategories}}
       </div>
-      <div class="instructions">{{i18n user.tracked_categories_instructions}}</div>
+      <div class="instructions">{{i18n 'user.tracked_categories_instructions'}}</div>
       <div class="controls category-controls">
-        <label>{{i18n user.muted_categories}}</label>
+        <label>{{i18n 'user.muted_categories'}}</label>
         {{category-group categories=mutedCategories blacklist=selectedCategories}}
       </div>
-      <div class="instructions">{{i18n user.muted_categories_instructions}}</div>
+      <div class="instructions">{{i18n 'user.muted_categories_instructions'}}</div>
     </div>
 
     <div class="control-group">
@@ -241,7 +241,7 @@
       <div class="control-group delete-account">
         <hr/>
         <div class="controls">
-            <button {{action "delete"}} {{bind-attr disabled="deleteDisabled"}} class="btn btn-danger"><i class="fa fa-trash-o"></i> {{i18n user.delete_account}}</button>
+            <button {{action "delete"}} {{bind-attr disabled="deleteDisabled"}} class="btn btn-danger"><i class="fa fa-trash-o"></i> {{i18n 'user.delete_account'}}</button>
         </div>
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs b/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs
index 5437e4d358..cc18c3efb2 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences/_save_button.hbs
@@ -1,2 +1,2 @@
 <button {{action "save"}} {{bind-attr disabled="saving"}} class="btn btn-primary">{{saveButtonText}}</button>
-{{#if saved}}{{i18n saved}}{{/if}}
+{{#if saved}}{{i18n 'saved'}}{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index 3f8323efe4..3f60aa3124 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -8,27 +8,27 @@
     <section {{bind-attr class="collapsedInfo :about profileBackground:has-background:no-background"}}  {{bind-attr style="profileBackground"}}>
     <div class='staff-counters'>
       {{#if number_of_flags_given}}
-        <div><span class="helpful-flags">{{number_of_flags_given}}</span>&nbsp;{{i18n user.staff_counters.flags_given}}</div>
+        <div><span class="helpful-flags">{{number_of_flags_given}}</span>&nbsp;{{i18n 'user.staff_counters.flags_given'}}</div>
       {{/if}}
       {{#if number_of_flagged_posts}}
         <div>
           {{#link-to 'user.flaggedPosts' this}}
-            <span class="flagged-posts">{{number_of_flagged_posts}}</span>&nbsp;{{i18n user.staff_counters.flagged_posts}}
+            <span class="flagged-posts">{{number_of_flagged_posts}}</span>&nbsp;{{i18n 'user.staff_counters.flagged_posts'}}
           {{/link-to}}
         </div>
       {{/if}}
       {{#if number_of_deleted_posts}}
         <div>
           {{#link-to 'user.deletedPosts' this}}
-            <span class="deleted-posts">{{number_of_deleted_posts}}</span>&nbsp;{{i18n user.staff_counters.deleted_posts}}
+            <span class="deleted-posts">{{number_of_deleted_posts}}</span>&nbsp;{{i18n 'user.staff_counters.deleted_posts'}}
           {{/link-to}}
         </div>
       {{/if}}
       {{#if number_of_suspensions}}
-        <div><span class="suspensions">{{number_of_suspensions}}</span>&nbsp;{{i18n user.staff_counters.suspensions}}</div>
+        <div><span class="suspensions">{{number_of_suspensions}}</span>&nbsp;{{i18n 'user.staff_counters.suspensions'}}</div>
       {{/if}}
       {{#if number_of_warnings}}
-        <div><span class="warnings-received">{{number_of_warnings}}</span>&nbsp;{{i18n user.staff_counters.warnings_received}}</div>
+        <div><span class="warnings-received">{{number_of_warnings}}</span>&nbsp;{{i18n 'user.staff_counters.warnings_received'}}</div>
       {{/if}}
     </div>
       <div class='profile-image'></div>
@@ -39,23 +39,23 @@
             <ul>
               {{#if can_send_private_message_to_user}}
               <li>
-                <a class='btn btn-primary right' {{action "composePrivateMessage"}}>
+                <a class='btn btn-primary right' {{action "composePrivateMessage" model}}>
                   {{fa-icon "envelope"}}
-                  {{i18n user.private_message}}
+                  {{i18n 'user.private_message'}}
                 </a>
               </li>
               {{/if}}
               {{#if viewingSelf}}
-                <li><a {{action "logout"}} class='btn btn-danger right'>{{fa-icon "sign-out"}}{{i18n user.log_out}}</a></li>
+                <li><a {{action "logout"}} class='btn btn-danger right'>{{fa-icon "sign-out"}}{{i18n 'user.log_out'}}</a></li>
               {{/if}}
               {{#if currentUser.staff}}
-                <li><a {{bind-attr href="adminPath"}} class='btn right'>{{fa-icon "wrench"}}{{i18n admin.user.show_admin_profile}}</a></li>
+                <li><a {{bind-attr href="adminPath"}} class='btn right'>{{fa-icon "wrench"}}{{i18n 'admin.user.show_admin_profile'}}</a></li>
               {{/if}}
               {{#if can_edit}}
-                <li>{{#link-to 'preferences' class="btn right"}}{{fa-icon "cog"}}{{i18n user.preferences}}{{/link-to}}</li>
+                <li>{{#link-to 'preferences' class="btn right"}}{{fa-icon "cog"}}{{i18n 'user.preferences'}}{{/link-to}}</li>
               {{/if}}
               {{#if canInviteToForum}}
-                <li>{{#link-to 'user.invited' class="btn right"}}{{fa-icon "envelope-o"}}{{i18n user.invited.title}}{{/link-to}}</li>
+                <li>{{#link-to 'user.invited' class="btn right"}}{{fa-icon "envelope-o"}}{{i18n 'user.invited.title'}}{{/link-to}}</li>
               {{/if}}
             </ul>
           </section>
@@ -79,8 +79,8 @@
               {{#if isSuspended}}
                 <div class='suspended'>
                   {{fa-icon "ban"}}
-                  <b>{{i18n user.suspended_notice date="suspendedTillDate"}}</b><br/>
-                  <b>{{i18n user.suspended_reason}}</b> {{suspend_reason}}
+                  <b>{{i18n 'user.suspended_notice' date="suspendedTillDate"}}</b><br/>
+                  <b>{{i18n 'user.suspended_reason'}}</b> {{suspend_reason}}
                 </div>
               {{/if}}
               {{{bio_cooked}}}
@@ -96,30 +96,30 @@
       <div class='secondary'>
         <dl>
           {{#if created_at}}
-            <dt>{{i18n user.created}}</dt><dd>{{bound-date created_at}}</dd>
+            <dt>{{i18n 'user.created'}}</dt><dd>{{bound-date created_at}}</dd>
           {{/if}}
           {{#if last_posted_at}}
-            <dt>{{i18n user.last_posted}}</dt><dd>{{bound-date last_posted_at}}</dd>
+            <dt>{{i18n 'user.last_posted'}}</dt><dd>{{bound-date last_posted_at}}</dd>
           {{/if}}
           {{#if last_seen_at}}
-            <dt>{{i18n user.last_seen}}</dt><dd>{{bound-date last_seen_at}}</dd>
+            <dt>{{i18n 'user.last_seen'}}</dt><dd>{{bound-date last_seen_at}}</dd>
           {{/if}}
           {{#if invited_by}}
-            <dt>{{i18n user.invited_by}}</dt><dd>{{#link-to 'user' invited_by}}{{invited_by.username}}{{/link-to}}</dd>
+            <dt>{{i18n 'user.invited_by'}}</dt><dd>{{#link-to 'user' invited_by}}{{invited_by.username}}{{/link-to}}</dd>
           {{/if}}
-          <dt>{{i18n user.trust_level}}</dt><dd>{{trustLevel.name}}</dd>
+          <dt>{{i18n 'user.trust_level'}}</dt><dd>{{trustLevel.name}}</dd>
           {{#if canCheckEmails}}
-            <dt>{{i18n user.email.title}}</dt>
+            <dt>{{i18n 'user.email.title'}}</dt>
             <dd {{bind-attr title="email"}}>
               {{#if email}}
                 {{email}}
               {{else}}
-                <button class="btn btn-primary" title="{{i18n admin.users.check_email.title}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n admin.users.check_email.text}}</button>
+                <button class="btn btn-primary" title="{{i18n 'admin.users.check_email.title'}}" {{action "checkEmail" this}}>{{fa-icon "envelope-o"}} {{i18n 'admin.users.check_email.text'}}</button>
               {{/if}}
             </dd>
           {{/if}}
           {{#if custom_groups}}
-            <dt>{{i18n groups.title count=custom_groups.length}}</dt>
+            <dt>{{i18n 'groups.title' count=custom_groups.length}}</dt>
             <dd class='groups'>
               {{#each custom_groups}}
                 <span>{{#link-to 'group' this class="group-link"}}{{name}}{{/link-to}}</span>
@@ -129,7 +129,7 @@
           {{#if canDeleteUser}}
             <button class="btn btn-danger" {{action "adminDelete"}}>
               <i class="fa fa-exclamation-triangle"></i>
-              {{i18n user.admin_delete}}
+              {{i18n 'user.admin_delete'}}
             </button>
           {{/if}}
         </dl>
@@ -147,7 +147,7 @@
           {{#link-to 'user.badges' tagName="li"}}
             {{#link-to 'user.badges'}}
               <i class='glyph fa fa-certificate'></i>
-              {{i18n badges.title}}
+              {{i18n 'badges.title'}}
               <span class='count'>({{badge_count}})</span>
             {{/link-to}}
           {{/link-to}}
@@ -156,7 +156,7 @@
           {{#link-to 'user.notifications' tagName="li"}}
             {{#link-to 'user.notifications'}}
               <i class='glyph fa fa-comment'></i>
-              {{i18n user.notifications}}
+              {{i18n 'user.notifications'}}
               <span class='count'>({{notification_count}})</span>
             {{/link-to}}
           {{/link-to}}
@@ -164,23 +164,23 @@
       </ul>
 
       {{#if canSeePrivateMessages}}
-        <h3>{{fa-icon "envelope"}} {{i18n user.private_messages}}</h3>
+        <h3>{{fa-icon "envelope"}} {{i18n 'user.private_messages'}}</h3>
         <ul class='action-list nav-stacked'>
           <li {{bind-attr class=":noGlyph privateMessagesActive:active"}}>
             {{#link-to 'userPrivateMessages.index' model}}
-              {{i18n user.messages.all}}
+              {{i18n 'user.messages.all'}}
               {{#if hasPMs}}<span class='count'>({{private_messages_stats.all}})</span>{{/if}}
             {{/link-to}}
           </li>
           <li {{bind-attr class=":noGlyph privateMessagesMineActive:active"}}>
             {{#link-to 'userPrivateMessages.mine' model}}
-              {{i18n user.messages.mine}}
+              {{i18n 'user.messages.mine'}}
               {{#if hasStartedPMs}}<span class='count'>({{private_messages_stats.mine}})</span>{{/if}}
             {{/link-to}}
           </li>
           <li {{bind-attr class=":noGlyph privateMessagesUnreadActive:active"}}>
             {{#link-to 'userPrivateMessages.unread' model}}
-              {{i18n user.messages.unread}}
+              {{i18n 'user.messages.unread'}}
               {{#if hasUnreadPMs}}<span class='badge-notification unread-private-messages'>{{private_messages_stats.unread}}</span>{{/if}}
             {{/link-to}}
           </li>
diff --git a/app/assets/javascripts/discourse/templates/user/username.hbs b/app/assets/javascripts/discourse/templates/user/username.hbs
index bf392c4b12..cc2f97c590 100644
--- a/app/assets/javascripts/discourse/templates/user/username.hbs
+++ b/app/assets/javascripts/discourse/templates/user/username.hbs
@@ -3,26 +3,26 @@
 
     <div class="control-group">
       <div class="controls">
-        <h3>{{i18n user.change_username.title}}</h3>
+        <h3>{{i18n 'user.change_username.title'}}</h3>
       </div>
     </div>
 
     {{#if error}}
       <div class="control-group">
         <div class="instructions">
-          <div class='alert alert-error'>{{i18n user.change_username.error}}</div>
+          <div class='alert alert-error'>{{i18n 'user.change_username.error'}}</div>
         </div>
       </div>
     {{/if}}
 
     <div class="control-group">
-      <label class="control-label">{{i18n user.username.title}}</label>
+      <label class="control-label">{{i18n 'user.username.title'}}</label>
       <div class="controls">
         {{text-field value=newUsername id="change_username" classNames="input-xxlarge" maxlength=maxLength}}
       </div>
       <div class='instructions'>
         {{#if taken}}
-          {{i18n user.change_username.taken}}
+          {{i18n 'user.change_username.taken'}}
         {{/if}}
         <span>{{ errorMessage }}</span>
       </div>
@@ -31,7 +31,7 @@
     <div class="control-group">
       <div class="controls">
           <button {{action "changeUsername"}} {{bind-attr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
-          {{#if saved}}{{i18n saved}}{{/if}}
+          {{#if saved}}{{i18n 'saved'}}{{/if}}
       </div>
     </div>
 
diff --git a/app/assets/javascripts/discourse/views/activity-filter.js.es6 b/app/assets/javascripts/discourse/views/activity-filter.js.es6
index b29821fd53..24445239d0 100644
--- a/app/assets/javascripts/discourse/views/activity-filter.js.es6
+++ b/app/assets/javascripts/discourse/views/activity-filter.js.es6
@@ -1,8 +1,10 @@
-export default Ember.Component.extend({
+import StringBuffer from 'discourse/mixins/string-buffer';
+
+export default Ember.Component.extend(StringBuffer, {
   tagName: 'li',
   classNameBindings: ['active', 'noGlyph'],
 
-  shouldRerender: Discourse.View.renderIfChanged('content.count', 'count'),
+  rerenderTriggers: ['content.count', 'count'],
   noGlyph: Em.computed.empty('icon'),
 
   active: function() {
@@ -37,7 +39,7 @@ export default Ember.Component.extend({
     return this.get('content.description') || I18n.t("user.filters.all");
   }.property('content.description'),
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     buffer.push("<a href='" + this.get('url') + "'>");
     var icon = this.get('icon');
     if (icon) {
diff --git a/app/assets/javascripts/discourse/views/button.js.es6 b/app/assets/javascripts/discourse/views/button.js.es6
index b06713cb01..0f62c72046 100644
--- a/app/assets/javascripts/discourse/views/button.js.es6
+++ b/app/assets/javascripts/discourse/views/button.js.es6
@@ -1,4 +1,6 @@
-export default Discourse.View.extend({
+import StringBuffer from 'discourse/mixins/string-buffer';
+
+export default Discourse.View.extend(StringBuffer, {
   tagName: 'button',
   classNameBindings: [':btn', ':standard', 'dropDownToggle'],
   attributeBindings: ['title', 'data-toggle', 'data-share-url'],
@@ -12,7 +14,7 @@ export default Discourse.View.extend({
     return I18n.t(this.get('textKey'));
   }.property('textKey'),
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     if (this.renderIcon) {
       this.renderIcon(buffer);
     }
diff --git a/app/assets/javascripts/discourse/views/combo-box.js.es6 b/app/assets/javascripts/discourse/views/combo-box.js.es6
index 993bec9514..24d4b2d28c 100644
--- a/app/assets/javascripts/discourse/views/combo-box.js.es6
+++ b/app/assets/javascripts/discourse/views/combo-box.js.es6
@@ -67,6 +67,12 @@ export default Discourse.View.extend({
     var $elem = this.$(),
         self = this;
 
+    // Workaround for https://github.com/emberjs/ember.js/issues/9813
+    // Can be removed when fixed. Without it, the wrong option is selected
+    this.$('option').each(function(i, o) {
+      o.selected = !!$(o).attr('selected');
+    });
+
     $elem.select2({formatResult: this.template, minimumResultsForSearch: 5, width: 'resolve'});
 
     $elem.on("change", function (e) {
diff --git a/app/assets/javascripts/discourse/views/dropdown-button.js.es6 b/app/assets/javascripts/discourse/views/dropdown-button.js.es6
index 307183ea78..b10d8ad7a4 100644
--- a/app/assets/javascripts/discourse/views/dropdown-button.js.es6
+++ b/app/assets/javascripts/discourse/views/dropdown-button.js.es6
@@ -1,41 +1,45 @@
-export default Discourse.View.extend({
-  classNameBindings: [':btn-group', 'hidden'],
-  shouldRerender: Discourse.View.renderIfChanged('text', 'longDescription'),
+import StringBuffer from 'discourse/mixins/string-buffer';
 
-  didInsertElement: function() {
-    var self = this;
+export default Discourse.View.extend(StringBuffer, {
+  classNameBindings: [':btn-group', 'hidden'],
+  rerenderTriggers: ['text', 'longDescription'],
+
+  _bindClick: function() {
     // If there's a click handler, call it
-    if (self.clicked) {
-      self.$('ul li').on('click.dropdown-button', function(e) {
+    if (this.clicked) {
+      var self = this;
+      this.$().on('click.dropdown-button', 'ul li', function(e) {
         e.preventDefault();
-        if ($(e.currentTarget).data('id') !== self.get('activeItem'))
+        if ($(e.currentTarget).data('id') !== self.get('activeItem')) {
           self.clicked($(e.currentTarget).data('id'));
+        }
+        self.$('.dropdown-toggle').dropdown('toggle');
         return false;
       });
     }
-  },
+  }.on('didInsertElement'),
 
-  willDestroyElement: function() {
-    this.$('ul li').off('click.dropdown-button');
-  },
+  _unbindClick: function() {
+    this.$().off('click.dropdown-button', 'ul li');
+  }.on('willDestroyElement'),
 
-  render: function(buffer) {
-    var self = this;
+  renderString: function(buffer) {
 
-    buffer.push("<h4 class='title'>" + self.get('title') + "</h4>");
+    buffer.push("<h4 class='title'>" + this.get('title') + "</h4>");
     buffer.push("<button class='btn standard dropdown-toggle' data-toggle='dropdown'>");
-    buffer.push(self.get('text'));
+    buffer.push(this.get('text'));
     buffer.push("</button>");
     buffer.push("<ul class='dropdown-menu'>");
 
-    _.each(self.get('dropDownContent'), function(row) {
+    var self = this;
+    this.get('dropDownContent').forEach(function(row) {
       var id = row.id,
           title = row.title,
           iconClass = row.styleClasses,
           description = row.description,
-          className = (self.get('activeItem') === id? 'disabled': '');
+          className = (self.get('activeItem') === id ? 'disabled': '');
 
-      buffer.push("<li data-id=\"" + id + "\" class=\"" + className + "\"><a href='#'>");
+      buffer.push("<li data-id=\"" + id + "\" class=\"" + className + "\"><a href>");
       buffer.push("<span class='icon " + iconClass + "'></span>");
       buffer.push("<div><span class='title'>" + title + "</span>");
       buffer.push("<span>" + description + "</span></div>");
@@ -44,7 +48,7 @@ export default Discourse.View.extend({
 
     buffer.push("</ul>");
 
-    var desc = self.get('longDescription');
+    var desc = this.get('longDescription');
     if (desc) {
       buffer.push("<p>");
       buffer.push(desc);
diff --git a/app/assets/javascripts/discourse/views/input-tip.js.es6 b/app/assets/javascripts/discourse/views/input-tip.js.es6
index b2d0709c91..6caf2dad67 100644
--- a/app/assets/javascripts/discourse/views/input-tip.js.es6
+++ b/app/assets/javascripts/discourse/views/input-tip.js.es6
@@ -1,19 +1,13 @@
-/**
-  This view handles rendering a tip when a field on a form is invalid
+import StringBuffer from 'discourse/mixins/string-buffer';
 
-  @class InputTipView
-  @extends Discourse.View
-  @namespace Discourse
-  @module Discourse
-**/
-export default Discourse.View.extend({
+export default Discourse.View.extend(StringBuffer, {
   classNameBindings: [':tip', 'good', 'bad'],
+  rerenderTriggers: ['validation'],
 
-  shouldRerender: Discourse.View.renderIfChanged('validation'),
   bad: Em.computed.alias('validation.failed'),
   good: Em.computed.not('bad'),
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     var reason = this.get('validation.reason');
     if (reason) {
       var icon = this.get('good') ? 'fa-check' : 'fa-times';
diff --git a/app/assets/javascripts/discourse/views/post-menu.js.es6 b/app/assets/javascripts/discourse/views/post-menu.js.es6
index 4925a38c09..1c44a6ffb7 100644
--- a/app/assets/javascripts/discourse/views/post-menu.js.es6
+++ b/app/assets/javascripts/discourse/views/post-menu.js.es6
@@ -1,3 +1,5 @@
+import StringBuffer from 'discourse/mixins/string-buffer';
+
 // Helper class for rendering a button
 export var Button = function(action, label, icon, opts) {
   this.action = action;
@@ -28,11 +30,11 @@ Button.prototype.render = function(buffer) {
 
 var hiddenButtons;
 
-export default Discourse.View.extend({
+export default Discourse.View.extend(StringBuffer, {
   tagName: 'section',
   classNames: ['post-menu-area', 'clearfix'],
 
-  shouldRerender: Discourse.View.renderIfChanged(
+  rerenderTriggers: [
     'post.deleted_at',
     'post.flagsAvailable.@each',
     'post.reply_count',
@@ -43,13 +45,13 @@ export default Discourse.View.extend({
     'post.topic.deleted_at',
     'post.replies.length',
     'post.wiki',
-    'collapsed'),
+    'collapsed'],
 
   _collapsedByDefault: function() {
     this.set('collapsed', true);
   }.on('init'),
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     var post = this.get('post');
 
     buffer.push("<nav class='post-controls'>");
diff --git a/app/assets/javascripts/discourse/views/reply-history.js.es6 b/app/assets/javascripts/discourse/views/reply-history.js.es6
index c5f81fa477..e1f2cb45bc 100644
--- a/app/assets/javascripts/discourse/views/reply-history.js.es6
+++ b/app/assets/javascripts/discourse/views/reply-history.js.es6
@@ -1,10 +1,3 @@
-/**
-  Lists previous posts in the history of a post.
-
-  @class ReplyHistory
-  @namespace Discourse
-  @module Discourse
-**/
 export default Em.CollectionView.extend({
   tagName: 'section',
   classNameBindings: [':embedded-posts', ':top', ':topic-body', ':offset2', 'hidden'],
@@ -12,5 +5,3 @@ export default Em.CollectionView.extend({
   hidden: Em.computed.equal('content.length', 0),
   previousPost: true
 });
-
-
diff --git a/app/assets/javascripts/discourse/views/share.js.es6 b/app/assets/javascripts/discourse/views/share.js.es6
index 1c354e46d0..566d5332e8 100644
--- a/app/assets/javascripts/discourse/views/share.js.es6
+++ b/app/assets/javascripts/discourse/views/share.js.es6
@@ -27,14 +27,23 @@ export default Discourse.View.extend({
   }.property('controller.link'),
 
   linkChanged: function() {
+    var self=this;
     if (this.present('controller.link')) {
-      var $linkInput = $('#share-link input');
-      $linkInput.val(this.get('controller.link'));
+      Em.run.next(function(){
+        if (!self.capabilities.touch) {
+          var $linkInput = $('#share-link input');
+          $linkInput.val(self.get('controller.link'));
 
-      // Wait for the fade-in transition to finish before selecting the link:
-      window.setTimeout(function() {
-        $linkInput.select().focus();
-      }, 160);
+          // Wait for the fade-in transition to finish before selecting the link:
+          window.setTimeout(function() {
+            $linkInput.select().focus();
+          }, 160);
+        } else {
+          var $linkForTouch = $('#share-link .share-for-touch a');
+          $linkForTouch.attr('href',self.get('controller.link'));
+          $linkForTouch.html(self.get('controller.link'));
+        }
+      });
     }
   }.observes('controller.link'),
 
@@ -84,10 +93,11 @@ export default Discourse.View.extend({
         y = $currentTargetOffset.top + 10;
       }
 
-      $shareLink.css({
-        left: "" + x + "px",
-        top: "" + y + "px"
-      });
+      $shareLink.css({top: "" + y + "px"});
+
+      if (!Discourse.Mobile.mobileView) {
+        $shareLink.css({left: "" + x + "px"});
+      }
 
       shareView.set('controller.link', url);
       shareView.set('controller.postNumber', postNumber);
diff --git a/app/assets/javascripts/discourse/views/star-button.js.es6 b/app/assets/javascripts/discourse/views/star-button.js.es6
index e08bd14bc5..c87aea9f24 100644
--- a/app/assets/javascripts/discourse/views/star-button.js.es6
+++ b/app/assets/javascripts/discourse/views/star-button.js.es6
@@ -6,7 +6,7 @@ export default ButtonView.extend({
   helpKeyBinding: 'controller.starTooltipKey',
   attributeBindings: ['disabled'],
 
-  shouldRerender: Discourse.View.renderIfChanged('controller.starred'),
+  rerenderTriggers: ['controller.starred'],
 
   click: function() {
     this.get('controller').send('toggleStar');
diff --git a/app/assets/javascripts/discourse/views/topic-closing.js.es6 b/app/assets/javascripts/discourse/views/topic-closing.js.es6
index bfbd211a6e..c5f22d503a 100644
--- a/app/assets/javascripts/discourse/views/topic-closing.js.es6
+++ b/app/assets/javascripts/discourse/views/topic-closing.js.es6
@@ -1,19 +1,15 @@
-/**
-  This view is used for rendering the notification that a topic will
-  automatically close.
+import StringBuffer from 'discourse/mixins/string-buffer';
 
-  @class TopicClosingView
-  @extends Discourse.View
-  @namespace Discourse
-  @module Discourse
-**/
-export default Discourse.View.extend({
+export default Discourse.View.extend(StringBuffer, {
   elementId: 'topic-closing-info',
   delayedRerender: null,
 
-  shouldRerender: Discourse.View.renderIfChanged('topic.closed', 'topic.details.{auto_close_at,auto_close_based_on_last_post,auto_close_hours}'),
+  rerenderTriggers: ['topic.closed',
+                     'topic.details.auto_close_at',
+                     'topic.details.auto_close_based_on_last_post',
+                     'topic.details.auto_close_hours'],
 
-  render: function(buffer) {
+  renderString: function(buffer) {
     if (!this.present('topic.details.auto_close_at')) return;
     if (this.get("topic.closed")) return;
 
@@ -36,8 +32,7 @@ export default Discourse.View.extend({
     }
 
     var basedOnLastPost = this.get("topic.details.auto_close_based_on_last_post");
-    var key = basedOnLastPost ? 'topic.auto_close_notice_based_on_last_post' : 'topic.auto_close_notice'
-
+    var key = basedOnLastPost ? 'topic.auto_close_notice_based_on_last_post' : 'topic.auto_close_notice';
     var autoCloseHours = this.get("topic.details.auto_close_hours") || 0;
 
     buffer.push('<h3><i class="fa fa-clock-o"></i> ');
diff --git a/app/assets/javascripts/discourse/views/topic-map-container.js.es6 b/app/assets/javascripts/discourse/views/topic-map-container.js.es6
index b6b85d3cc8..5dee27706c 100644
--- a/app/assets/javascripts/discourse/views/topic-map-container.js.es6
+++ b/app/assets/javascripts/discourse/views/topic-map-container.js.es6
@@ -6,7 +6,10 @@ import DiscourseContainerView from 'discourse/views/container';
 
 export default DiscourseContainerView.extend({
   classNameBindings: ['hidden', ':topic-map'],
-  shouldRerender: Discourse.View.renderIfChanged('topic.posts_count'),
+
+  _postsChanged: function() {
+    Ember.run.once(this, 'rerender');
+  }.observes('topic.posts_count'),
 
   hidden: function() {
     if (!this.get('post.firstPost')) return true;
diff --git a/app/assets/javascripts/discourse/views/view.js b/app/assets/javascripts/discourse/views/view.js
index e73dee4f27..c62af2582e 100644
--- a/app/assets/javascripts/discourse/views/view.js
+++ b/app/assets/javascripts/discourse/views/view.js
@@ -40,16 +40,8 @@ Discourse.View.reopenClass({
     });
   },
 
-  /**
-    Returns an observer that will re-render if properties change. This is useful for
-    views where rendering is done to a buffer manually and need to know when to trigger
-    a new render call.
-
-    @method renderIfChanged
-    @params {String} propertyNames*
-    @return {Function} observer
-  **/
   renderIfChanged: function() {
+    Em.warn("`rerenderIfChanged` is deprecated. Use the `StringBuffer` mixin with `rerenderTriggers` instead.");
     var args = Array.prototype.slice.call(arguments, 0);
     args.unshift(function () {
       Ember.run.once(this, 'rerender');
diff --git a/app/assets/javascripts/locales/ar.js.erb b/app/assets/javascripts/locales/ar.js.erb
new file mode 100644
index 0000000000..c39afcd204
--- /dev/null
+++ b/app/assets/javascripts/locales/ar.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.ar.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:ar) %>
diff --git a/app/assets/javascripts/locales/tr_TR.js.erb b/app/assets/javascripts/locales/tr_TR.js.erb
new file mode 100644
index 0000000000..1f7fa13c9b
--- /dev/null
+++ b/app/assets/javascripts/locales/tr_TR.js.erb
@@ -0,0 +1,3 @@
+//= depend_on 'client.tr_TR.yml'
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:tr_TR) %>
diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js
index d83be37c14..00050ed3d9 100644
--- a/app/assets/javascripts/main_include_admin.js
+++ b/app/assets/javascripts/main_include_admin.js
@@ -1,3 +1,5 @@
+//= require list-view
+//= require admin/lib/export-result
 //= require admin/models/user-field
 //= require admin/controllers/admin-email-skipped
 //= require admin/controllers/change-site-customization-details
diff --git a/app/assets/javascripts/pagedown_custom.js b/app/assets/javascripts/pagedown_custom.js
index 9c862739e9..e435ebf16f 100644
--- a/app/assets/javascripts/pagedown_custom.js
+++ b/app/assets/javascripts/pagedown_custom.js
@@ -10,6 +10,8 @@ window.PagedownCustom = {
     }
   ],
 
+  appendButtons: [],
+
   customActions: {
     "doBlockquote": function(chunk, postProcessing, oldDoBlockquote) {
 
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 8ccc201cce..11650c5f98 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -10,7 +10,7 @@
   th {border-top: 1px solid scale-color-diff();}
   td {border-bottom: 1px solid scale-color-diff(); border-top: 1px solid scale-color-diff();}
   tr:hover { background-color: darken($secondary, 2.5%); }
-  tr.selected { background-color: lighten($primary, 50%); }
+  tr.selected { background-color: lighten($primary, 80%); }
   .filters input { margin-bottom: 0; }
 }
 
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 29ee46e008..0248c7b793 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -1,6 +1,6 @@
 .show-more {
   position: absolute;
-  top: 5px;
+  top: 4px;
   width: 100%;
 }
 
@@ -181,7 +181,7 @@ clear: both;
 }
 
 #list-area {
-  margin-bottom: 300px;
+  margin-bottom: 100px;
   .empty-topic-list {
     padding: 10px;
   }
diff --git a/app/assets/stylesheets/common/base/combobox.scss b/app/assets/stylesheets/common/base/combobox.scss
index 93d0ae38a4..d6a478be7e 100644
--- a/app/assets/stylesheets/common/base/combobox.scss
+++ b/app/assets/stylesheets/common/base/combobox.scss
@@ -11,7 +11,8 @@
     color: $primary;
   }
   .category-desc {
-    color: scale-color($primary, $lightness: 45%);
+    /* leave this color as non-variable -- it is displayed on a white background in a dropdown */
+    color: #333;
     margin: 6px 0 0 3px;
     font-size: 12px;
     line-height: 16px;
diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss
index dcc2590fb0..7c8a30eb3a 100644
--- a/app/assets/stylesheets/common/base/discourse.scss
+++ b/app/assets/stylesheets/common/base/discourse.scss
@@ -201,7 +201,7 @@ body {
 }
 
 .spinner {
-  margin: 30px auto 0 auto;
+  margin: 20px auto 20px auto;
   position: relative;
   -webkit-animation: rotate-forever 1s infinite linear;
   animation: rotate-forever 1s infinite linear;
diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss
index 45b6311b3c..38b5ada1d4 100644
--- a/app/assets/stylesheets/common/base/header.scss
+++ b/app/assets/stylesheets/common/base/header.scss
@@ -266,6 +266,7 @@
 
   .search-context {
     padding: 0 5px;
+    label { margin-bottom: 0; }
   }
 
   .searching {
diff --git a/app/assets/stylesheets/common/base/share_link.scss b/app/assets/stylesheets/common/base/share_link.scss
index c7535fcb2e..9cf2a61b43 100644
--- a/app/assets/stylesheets/common/base/share_link.scss
+++ b/app/assets/stylesheets/common/base/share_link.scss
@@ -3,7 +3,7 @@
 #share-link {
   position: absolute;
   left: 20px;
-  z-index: 990;
+  z-index: 1200;
   box-shadow: 0 1px 5px rgba(0,0,0, .4);
   background-color: $secondary;
   padding: 6px 10px 10px 10px;
@@ -12,9 +12,12 @@
   &.visible {
     display: block;
   }
-  input[type=text] {
+  input[type=text], .share-for-touch .overflow-ellipsis {
     width: 96%;
   }
+  .share-for-touch {
+    margin: 14px 0;
+  }
   h3 {
     font-size: 13px;
   }
@@ -49,3 +52,11 @@
     margin-bottom: 10px;
   }
 }
+
+.discourse-no-touch #share-link .share-for-touch {
+  display: none;
+}
+
+.discourse-touch #share-link input[type=text] {
+  display: none;
+}
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 0626826bf3..d524b5e045 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -118,7 +118,7 @@ aside.quote {
 }
 
 .wiki .topic-body {
-  background-color: scale-color($wiki, $lightness: 95%);
+  background-color: dark-light-diff($wiki, $secondary, 95%, -50%);
 }
 
 .post-info {
@@ -140,7 +140,6 @@ aside.quote {
   }
 }
 
-
 pre {
   code {
     white-space: pre-wrap;
diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss
index 8f8d35fded..1e77ac0b82 100644
--- a/app/assets/stylesheets/common/base/user.scss
+++ b/app/assets/stylesheets/common/base/user.scss
@@ -73,3 +73,6 @@
   }
 }
 
+.new-private-message {
+  margin-bottom: 15px;
+}
diff --git a/app/assets/stylesheets/common/components/banner.css.scss b/app/assets/stylesheets/common/components/banner.css.scss
index a18805bc53..da79d049a5 100644
--- a/app/assets/stylesheets/common/components/banner.css.scss
+++ b/app/assets/stylesheets/common/components/banner.css.scss
@@ -7,6 +7,7 @@
   border-radius: 5px;
   background: scale-color($tertiary, $lightness: 90%);
   box-shadow: 0 1px 2px scale-color($tertiary, $lightness: 70%);
+  color: darken($tertiary, 45%);
   z-index: 501;
   overflow: auto;
 
@@ -17,6 +18,7 @@
   .close {
     font-size: 25px !important;
     margin-top: -10px !important;
+    color: darken($tertiary, 45%);
   }
 
   .meta {
diff --git a/app/assets/stylesheets/common/foundation/base.scss b/app/assets/stylesheets/common/foundation/base.scss
index 656248df67..1eec1d65dc 100644
--- a/app/assets/stylesheets/common/foundation/base.scss
+++ b/app/assets/stylesheets/common/foundation/base.scss
@@ -92,3 +92,6 @@ pre code {
 .row:after {clear: both;}
 
 
+#offscreen-content {
+  display: none;
+}
diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss
index 6a4a21356d..90f320ca7d 100644
--- a/app/assets/stylesheets/desktop/compose.scss
+++ b/app/assets/stylesheets/desktop/compose.scss
@@ -277,6 +277,7 @@
       cursor: default;
       video {
         max-width: 100%;
+        max-height: 500px;
         height: auto;
       }
       audio {
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index e1a40bd2c9..484abfb70a 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -61,10 +61,10 @@
   }
 
   > tbody > tr {
-    &:nth-child(even) {
+    &:nth-child(odd) {
         background-color: darken($secondary, 3%);
     }
-    &:nth-child(odd) {
+    &:nth-child(even) {
         background-color: $secondary;
     }
     &.highlighted {
@@ -160,8 +160,6 @@
   }
 }
 
-#list-area .top-lists h2 { margin: 5px 0 10px; }
-
 .topic-list tbody tr.has-excerpt .star {
   vertical-align: top;
   margin-top: 3px;
@@ -273,6 +271,8 @@
 // Misc. stuff
 // --------------------------------------------------
 
+#list-area .top-lists h2 { margin: 5px 0 10px; }
+
 #list-area {
   h2 {
     margin: 20px 0 10px;
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index f0875d0f06..6b5345d99d 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -230,25 +230,22 @@ nav.post-controls {
 
 .embedded-posts {
   background: dark-light-diff($primary, $secondary, 90%, -65%) !important;
-
   h1, h2, h3 { margin: 10px 0; }
   a.mention { background: darken(scale-color-diff(), 10%); }
 
   .topic-body {
     background: dark-light-diff($primary, $secondary, 90%, -65%) !important;
-    width: 87%;
-    padding-left: 1%;
-    padding-right: 1%;
-    border-top: none;
+    box-sizing: border-box;
+    width: calc(100% - 60px); // [100% - .topic-avatar width]
     // WARNING: overflow hide is required for quoted / embedded images
     // which expect "normal" post width, but expansions are narrower
     overflow: hidden;
+    padding: 10px 15px 15px 15px;
   }
 
   .topic-avatar {
      width: 45px;
-     margin: 0 5px 0 15px;
-     border: none;
+     padding-left: 15px;
   }
 
   // bottom means "reply expansion" below a post
@@ -261,6 +258,9 @@ nav.post-controls {
   &.bottom .arrow { float: right; }
   &.bottom {
     margin-top: -11px;
+    .row {
+      padding-top: 7px;
+    }
   }
 
   // top means "in reply to expansion" above a post
@@ -277,7 +277,6 @@ nav.post-controls {
   .fa-arrow-up { margin-left: 5px; }
   .row {
     border-top: 1px solid darken(scale-color-diff(), 10%);
-    padding-top: 7px;
   }
   .reply:first-of-type .row { border-top: none; }
 
@@ -511,6 +510,10 @@ iframe {
   max-width: 100%;
 }
 
+video {
+  max-height: 500px;
+}
+
 @keyframes fadein {
     from {opacity: 0;}
     to {opacity: 1;}
@@ -757,7 +760,7 @@ $topic-avatar-width: 45px;
 }
 .topic-avatar {
   border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
-  padding-top: 16px;
+  padding-top: 15px;
   width: $topic-avatar-width;
   float: left;
   position: relative;
@@ -862,8 +865,6 @@ $topic-avatar-width: 45px;
   padding: 5px;
   margin-bottom: 5px;
 
-
-
   button {
     width: 180px;
     margin: 4px auto;
@@ -1018,33 +1019,11 @@ span.highlighted {
 .read-state.read {
   opacity: 0;
   @include transition(opacity ease-out 1s);
-
 }
 
 
 /* Tablet (portrait) ----------- */
 
-@media all
-and (max-width : 1140px) {
-  .post-cloak .reply-to-tab {
-    right: 320px;
-  }
-}
-
-
-@media all
-and (max-width : 975px) {
-  .post-cloak .reply-to-tab {
-    right: 300px;
-  }
-}
-
-@media all
-and (max-width : 940px) {
-  .post-cloak .reply-to-tab {
-    right: 250px;
-  }
-}
 
 @media all
 and (max-width : 870px) {
@@ -1054,7 +1033,7 @@ and (max-width : 870px) {
     }
 
   .topic-avatar {
-    width: 5%;
+    width: 45px;
   }
 
   .post-cloak .reply-to-tab {
@@ -1062,16 +1041,31 @@ and (max-width : 870px) {
     }
 
   .topic-body {
-      width: 91%;
+      box-sizing: border-box;
+      width: calc(100% - 47px); //100% - [width of .topic-avatar + 2px]
+
       padding-left: 2%;
     }
 
   .embedded-posts {
     // top means "in reply to expansion" above a post
     &.top {
-      margin-left: 6%;
-      width: 91%;
+      width: calc(100% - 56px); // [100% - margin-left]
     }
   }
 
 }
+
+/* below standard tablet portrait ----------- */
+
+@media all
+and (max-width : 767px) {
+
+  .reply-to-tab {
+    span {display: none;}
+  }
+  .names {
+    span {display: block;}
+  }
+
+}
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 16fa136bbb..dd86e87605 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -257,3 +257,24 @@ and (max-width : 870px) {
     }
 
 }
+
+
+@media all
+and (max-width : 724px) {
+
+  #topic-progress-wrapper {
+    right: 0;
+    #topic-progress, #topic-progress-expanded { left: auto; right: 145px;  }
+  }
+
+}
+
+@media all
+and (max-width : 485px) {
+
+  #topic-progress-wrapper.docked {
+    display: none;
+    }
+
+
+}
diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss
index af61f9c35e..7cf2887525 100644
--- a/app/assets/stylesheets/mobile/discourse.scss
+++ b/app/assets/stylesheets/mobile/discourse.scss
@@ -91,7 +91,7 @@ blockquote {
   .topic-status {
     i {
       font-size: 20px;
-      color: darken($secondary, 60%);
+      color: dark-light-diff($secondary, $primary, 40%, -20%);
     }
   }
 }
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index 726865574a..875426507c 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -30,10 +30,10 @@
 .topic-list {
 
   > tbody > tr {
-    &:nth-child(odd) {
+    &:nth-child(even) {
       background-color: darken($secondary, 3%);
       }
-    &:nth-child(even) {
+    &:nth-child(odd) {
       background-color: $secondary;
       }
     &.highlighted {
@@ -58,12 +58,14 @@
 
   .topic-item-stats {
     margin-top: 8px;
-  }
-
-  .topic-item-stats {
     .category, .num, .last-poster {
       float: left;
     }
+    .category a {
+      max-width: 160px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
     .num .fa {
       color: scale-color($primary, $lightness: 50%);
     }
@@ -261,9 +263,7 @@ tr.category-topic-link:nth-of-type(odd) {
 }
 
 ol.category-breadcrumb {
-
   margin: 5px 10px 0 0;
-
 }
 
 .category-dropdown-menu {
@@ -274,10 +274,6 @@ ol.category-breadcrumb {
     line-height: 26px !important;
     margin-bottom: 0 !important;
   }
-
-  div {
-    margin-bottom: 10px;
-  }
 }
 
 .top-lists {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 5fbdddf577..82d0c8c2f1 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -384,6 +384,8 @@ iframe {
 
 #share-link {
   width: 290px;
+  left: auto;
+  right: 4px;
 }
 
 #selected-posts {
@@ -450,17 +452,18 @@ span.highlighted {
 .topic-avatar {
   float: left;
   position: relative;
+  z-index:999; /* must render on top of topic-body + topic-meta-data, otherwise not tappable */
 }
 
 .topic-meta-data {
-  margin-left: 60px;
   white-space: nowrap;
   position: absolute;
-  width: 80%;
+  width: 100%;
   left: 0px;
   .names {
     margin: 5px 0 0 5px;
     line-height: 17px;
+    padding-left: 60px;
     span {
       display: block;
     }
diff --git a/app/controllers/admin/diagnostics_controller.rb b/app/controllers/admin/diagnostics_controller.rb
index b4eee99027..d3ea9cc968 100644
--- a/app/controllers/admin/diagnostics_controller.rb
+++ b/app/controllers/admin/diagnostics_controller.rb
@@ -18,4 +18,20 @@ class Admin::DiagnosticsController < Admin::AdminController
       content_type: Mime::TEXT
 
   end
+
+  def dump_heap
+    begin
+      # ruby 2.1
+      GC.start(full_mark: true)
+      require 'objspace'
+
+      io = File.open("discourse-heap-#{SecureRandom.hex(3)}.json",'w')
+      ObjectSpace.dump_all(:output => io)
+      io.close
+
+      render text: "HEAP DUMP:\n#{io.path}", content_type: Mime::TEXT
+    rescue
+      render text: "HEAP DUMP:\nnot supported", content_type: Mime::TEXT
+    end
+  end
 end
diff --git a/app/controllers/admin/export_csv_controller.rb b/app/controllers/admin/export_csv_controller.rb
index 2a5d53a00f..0ab4aefe06 100644
--- a/app/controllers/admin/export_csv_controller.rb
+++ b/app/controllers/admin/export_csv_controller.rb
@@ -2,15 +2,10 @@ class Admin::ExportCsvController < Admin::AdminController
 
   skip_before_filter :check_xhr, only: [:show]
 
-  def export_user_list
+  def export_entity
+    params.require(:entity)
     # export csv file in a background thread
-    Jobs.enqueue(:export_csv_file, entity: 'user', user_id: current_user.id)
-    render json: success_json
-  end
-
-  def export_screened_ips_list
-    # export csv file in a background thread
-    Jobs.enqueue(:export_csv_file, entity: 'screened_ips', user_id: current_user.id)
+    Jobs.enqueue(:export_csv_file, entity: params[:entity], user_id: current_user.id)
     render json: success_json
   end
 
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index efd9b3be43..8197b89a45 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -66,10 +66,14 @@ class Admin::UsersController < Admin::AdminController
   end
 
   def log_out
-    @user.auth_token = nil
-    @user.save!
-    MessageBus.publish "/logout", @user.id, user_ids: [@user.id]
-    render nothing: true
+    if @user
+      @user.auth_token = nil
+      @user.save!
+      MessageBus.publish "/logout", @user.id, user_ids: [@user.id]
+      render json: success_json
+    else
+      render json: {error: I18n.t('admin_js.admin.users.id_not_found')}, status: 404
+    end
   end
 
   def refresh_browsers
@@ -194,7 +198,7 @@ class Admin::UsersController < Admin::AdminController
   def activate
     guardian.ensure_can_activate!(@user)
     @user.activate
-    render nothing: true
+    render json: success_json
   end
 
   def deactivate
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index dd1feec96b..a687cded1f 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -18,8 +18,11 @@ class GroupsController < ApplicationController
 
   def members
     group = find_group(:group_id)
-    members = group.users.order('username_lower asc')
-    members = members.limit(200) if group.automatic
+
+    limit = (params[:limit] || 200).to_i
+    offset = (params[:offset] || 0).to_i
+    members = group.users.order('username_lower asc').limit(limit).offset(offset)
+
     render_serialized(members.to_a, GroupUserSerializer)
   end
 
diff --git a/app/controllers/permalinks_controller.rb b/app/controllers/permalinks_controller.rb
index b54e59fb7b..c32b88e96c 100644
--- a/app/controllers/permalinks_controller.rb
+++ b/app/controllers/permalinks_controller.rb
@@ -2,8 +2,7 @@ class PermalinksController < ApplicationController
   skip_before_filter :check_xhr, :preload_json
 
   def show
-    url = params[:url]
-    url = "#{url}?#{request.query_string}" if request.query_string.present?
+    url = request.fullpath[1..-1]
     permalink = Permalink.find_by_url(url)
     if permalink && permalink.target_url
       redirect_to permalink.target_url, status: :moved_permanently
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 9103e4ebf6..f78087a4f9 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -3,7 +3,7 @@ require_dependency 'search'
 class SearchController < ApplicationController
 
   def self.valid_context_types
-    %w{user topic category}
+    %w{user topic category private_messages}
   end
 
   def query
@@ -21,16 +21,19 @@ class SearchController < ApplicationController
       raise Discourse::InvalidParameters.new(:search_context) unless SearchController.valid_context_types.include?(search_context[:type])
       raise Discourse::InvalidParameters.new(:search_context) if search_context[:id].blank?
 
-      klass = search_context[:type].classify.constantize
-
       # A user is found by username
       context_obj = nil
-      if search_context[:type] == 'user'
-        context_obj = klass.find_by(username_lower: params[:search_context][:id].downcase)
+      if ['user','private_messages'].include? search_context[:type]
+        context_obj = User.find_by(username_lower: params[:search_context][:id].downcase)
       else
+        klass = search_context[:type].classify.constantize
         context_obj = klass.find_by(id: params[:search_context][:id])
       end
 
+      if search_context[:type] == 'private_messages'
+        search_args[:type_filter] = 'private_messages'
+      end
+
       guardian.ensure_can_see!(context_obj)
       search_args[:search_context] = context_obj
     end
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 8e8d226d37..55038625d0 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -47,6 +47,7 @@ class TopicsController < ApplicationController
     opts = params.slice(:username_filters, :filter, :page, :post_number, :show_deleted)
     username_filters = opts[:username_filters]
 
+    opts[:slow_platform] = true if request.user_agent =~ /Android/
     opts[:username_filters] = username_filters.split(',') if username_filters.is_a?(String)
 
     begin
@@ -58,7 +59,7 @@ class TopicsController < ApplicationController
     end
 
     page = params[:page].to_i
-    if (page < 0) || ((page - 1) * SiteSetting.posts_chunksize > @topic_view.topic.highest_post_number)
+    if (page < 0) || ((page - 1) * @topic_view.chunk_size > @topic_view.topic.highest_post_number)
       raise Discourse::NotFound
     end
 
@@ -123,8 +124,8 @@ class TopicsController < ApplicationController
     guardian.ensure_can_edit!(topic)
 
     changes = {}
-    changes[:title]       = params[:title]       if params[:title]
-    changes[:category_id] = params[:category_id] if params[:category_id]
+    changes[:title]       = params[:title]       if params[:title] && topic.title != params[:title]
+    changes[:category_id] = params[:category_id] if params[:category_id] && topic.category_id != params[:category_id].to_i
 
     success = true
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6295f0b21a..64b7fc8ac1 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -430,34 +430,6 @@ class UsersController < ApplicationController
     render json: to_render
   end
 
-  # [LEGACY] avatars in quotes/oneboxes might still be pointing to this route
-  # fixing it requires a rebake of all the posts
-  def avatar
-    user = User.find_by(username_lower: params[:username].downcase)
-    if user.present?
-      size = determine_avatar_size(params[:size])
-      url = user.avatar_template.gsub("{size}", size.to_s)
-      expires_in 1.day
-      redirect_to url
-    else
-      raise ActiveRecord::RecordNotFound
-    end
-  end
-
-  def determine_avatar_size(size)
-    size = size.to_i
-    size = 64 if size == 0
-    size = 10 if size < 10
-    size = 128 if size > 128
-    size
-  end
-
-  # LEGACY: used by the API
-  def upload_avatar
-    params[:image_type] = "avatar"
-    upload_user_image
-  end
-
   def upload_user_image
     params.require(:image_type)
     user = fetch_user_from_params
@@ -500,7 +472,7 @@ class UsersController < ApplicationController
     end
     user.save!
 
-    render nothing: true
+    render json: success_json
   end
 
   def destroy_user_image
diff --git a/app/helpers/user_notifications_helper.rb b/app/helpers/user_notifications_helper.rb
index 1b3dccf049..cb662043d5 100644
--- a/app/helpers/user_notifications_helper.rb
+++ b/app/helpers/user_notifications_helper.rb
@@ -69,14 +69,16 @@ module UserNotificationsHelper
 
     result = ""
 
+    category_url = "#{Discourse.base_url}#{category.url}"
+
     if opts[:only_stripe]
-      result << "<span style='background-color: ##{category.color}; font-size: 12px; padding: 4px 2px; font-weight: bold; margin: 0; width: 2px; white-space:nowrap;'>&nbsp;</span>"
-      result << "<span style='font-size: 12px; font-weight: bold; margin-left: 3px;'>#{category.name}</span>"
+      result << "<a href='#{category_url}' style='background-color: ##{category.color}; font-size: 12px; padding: 2px 1px; font-weight: bold; margin: 0; width: 2px; white-space:nowrap;'>&nbsp;</a>"
+      result << "<a href='#{category_url}' style='font-size: 12px; font-weight: bold; margin-left: 3px; color: #222;'>#{category.name}</a>"
     else
       if category.parent_category.present?
-        result << "<span style='background-color: ##{category.parent_category.color}; font-size: 12px; padding: 4px 2px; font-weight: bold; margin: 0; width: 2px; white-space:nowrap;'>&nbsp;</span>"
+        result << "<a href='#{category_url}' style='background-color: ##{category.parent_category.color}; font-size: 12px; padding: 4px 2px; font-weight: bold; margin: 0; width: 2px; white-space:nowrap;'>&nbsp;</a>"
       end
-      result << "<span style='background-color: ##{category.color}; color: ##{category.text_color}; font-size: 12px; padding: 4px 6px; font-weight: bold; margin: 0; white-space:nowrap;'>#{category.name}</span>"
+      result << "<a href='#{category_url}' style='background-color: ##{category.color}; color: ##{category.text_color}; font-size: 12px; padding: 4px 6px; font-weight: bold; margin: 0; white-space:nowrap;'>#{category.name}</a>"
     end
 
     result.html_safe
diff --git a/app/jobs/regular/export_csv_file.rb b/app/jobs/regular/export_csv_file.rb
index 926aee562d..f8c2a2f79f 100644
--- a/app/jobs/regular/export_csv_file.rb
+++ b/app/jobs/regular/export_csv_file.rb
@@ -4,10 +4,14 @@ require_dependency 'system_message'
 module Jobs
 
   class ExportCsvFile < Jobs::Base
-    CSV_USER_ATTRS = ['id','name','username','email','title','created_at','trust_level','active','admin','moderator','ip_address']
-    CSV_USER_STATS = ['topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received']
-    CSV_USER_SSO_ATTRS = ['external_id','external_email', 'external_username', 'external_name', 'external_avatar_url']
-    SCREENED_IP_ATTRS = ['ip_address','action_type','match_count','last_match_at','created_at']
+    HEADER_ATTRS_FOR = {}
+    HEADER_ATTRS_FOR['user'] = ['id','name','username','email','title','created_at','trust_level','active','admin','moderator','ip_address']
+    HEADER_ATTRS_FOR['user_stats'] = ['topics_entered','posts_read_count','time_read','topic_count','post_count','likes_given','likes_received']
+    HEADER_ATTRS_FOR['user_sso'] = ['external_id','external_email', 'external_username', 'external_name', 'external_avatar_url']
+    HEADER_ATTRS_FOR['staff_action'] = ['staff_user','action','subject','created_at','details', 'context']
+    HEADER_ATTRS_FOR['screened_email'] = ['email','action','match_count','last_match_at','created_at','ip_address']
+    HEADER_ATTRS_FOR['screened_ip'] = ['ip_address','action','match_count','last_match_at','created_at']
+    HEADER_ATTRS_FOR['screened_url'] = ['domain','action','match_count','last_match_at','created_at']
 
     sidekiq_options retry: false
     attr_accessor :current_user
@@ -20,14 +24,12 @@ module Jobs
       entity = args[:entity]
       @current_user = User.find_by(id: args[:user_id])
 
-
+      export_method = "#{entity}_export".to_sym
       data =
-        if entity == 'user'
-          user_export
-        elsif entity == 'screened_ips'
-          screened_ips_export
+        if respond_to?(export_method)
+          send(export_method)
         else
-          raise Discourse::InvalidParameters.new(:entity) if entity.blank?
+          raise Discourse::InvalidParameters.new(:entity)
         end
 
       if data && data.length > 0
@@ -50,21 +52,41 @@ module Jobs
       end
     end
 
+    def staff_action_export
+      staff_action_data = UserHistory.order('id DESC').to_a
+      staff_action_data.map do |staff_action|
+        get_staff_action_fields(staff_action)
+      end
+    end
 
-    def screened_ips_export
-      screened_ips_data = ScreenedIpAddress.order('id desc').to_a
-      screened_ips_data.map do |screened_ip|
+    def screened_email_export
+      screened_email_data = ScreenedEmail.order('last_match_at desc').to_a
+      screened_email_data.map do |screened_email|
+        get_screened_email_fields(screened_email)
+      end
+    end
+
+    def screened_ip_export
+      screened_ip_data = ScreenedIpAddress.order('id desc').to_a
+      screened_ip_data.map do |screened_ip|
         get_screened_ip_fields(screened_ip)
       end
     end
 
+    def screened_url_export
+      screened_url_data = ScreenedUrl.select("domain, sum(match_count) as match_count, max(last_match_at) as last_match_at, min(created_at) as created_at").group(:domain).order('last_match_at DESC').to_a
+      screened_url_data.map do |screened_url|
+        get_screened_url_fields(screened_url)
+      end
+    end
+
     def get_header(entity)
 
       case entity
         when 'user'
-          header_array = CSV_USER_ATTRS + CSV_USER_STATS
+          header_array = HEADER_ATTRS_FOR['user'] + HEADER_ATTRS_FOR['user_stats']
           if SiteSetting.enable_sso
-            header_array.concat(CSV_USER_SSO_ATTRS)
+            header_array.concat(HEADER_ATTRS_FOR['user_sso'])
           end
           user_custom_fields = UserField.all
           if user_custom_fields.present?
@@ -73,9 +95,9 @@ module Jobs
             end
           end
           header_array.push("group_names")
-        when 'screened_ips'
-          header_array = SCREENED_IP_ATTRS
-      end
+        else
+          header_array = HEADER_ATTRS_FOR[entity]
+        end
 
       header_array
     end
@@ -94,17 +116,17 @@ module Jobs
       def get_user_fields(user)
         user_array = []
 
-        CSV_USER_ATTRS.each do |attr|
+        HEADER_ATTRS_FOR['user'].each do |attr|
           user_array.push(user.attributes[attr])
         end
 
-        CSV_USER_STATS.each do |stat|
+        HEADER_ATTRS_FOR['user_stats'].each do |stat|
           user_array.push(user.user_stat.attributes[stat])
         end
 
         if SiteSetting.enable_sso
           sso = user.single_sign_on_record
-          CSV_USER_SSO_ATTRS.each do |stat|
+          HEADER_ATTRS_FOR['user_sso'].each do |stat|
             field = sso.attributes[stat] if sso
             user_array.push(field)
           end
@@ -119,16 +141,78 @@ module Jobs
         user_array
       end
 
+      def get_staff_action_fields(staff_action)
+        staff_action_array = []
+
+        HEADER_ATTRS_FOR['staff_action'].each do |attr|
+          data =
+            if attr == 'action'
+              UserHistory.actions.key(staff_action.attributes[attr]).to_s
+            elsif attr == 'staff_user'
+              user = User.find_by(id: staff_action.attributes['acting_user_id'])
+              user.username if !user.nil?
+            else
+              staff_action.attributes[attr]
+            end
+
+            staff_action_array.push(data)
+        end
+
+        staff_action_array
+      end
+
+      def get_screened_email_fields(screened_email)
+        screened_email_array = []
+
+        HEADER_ATTRS_FOR['screened_email'].each do |attr|
+          data =
+            if attr == 'action'
+              ScreenedEmail.actions.key(screened_email.attributes['action_type']).to_s
+            else
+              screened_email.attributes[attr]
+            end
+
+          screened_email_array.push(data)
+        end
+
+        screened_email_array
+      end
+
       def get_screened_ip_fields(screened_ip)
         screened_ip_array = []
 
-        SCREENED_IP_ATTRS.each do |attr|
-          screened_ip_array.push(screened_ip.attributes[attr])
+        HEADER_ATTRS_FOR['screened_ip'].each do |attr|
+          data =
+            if attr == 'action'
+              ScreenedIpAddress.actions.key(screened_ip.attributes['action_type']).to_s
+            else
+              screened_ip.attributes[attr]
+            end
+
+          screened_ip_array.push(data)
         end
 
         screened_ip_array
       end
 
+      def get_screened_url_fields(screened_url)
+        screened_url_array = []
+
+        HEADER_ATTRS_FOR['screened_url'].each do |attr|
+          data =
+            if attr == 'action'
+              action = ScreenedUrl.actions.key(screened_url.attributes['action_type']).to_s
+              action = "do nothing" if action.blank?
+            else
+              screened_url.attributes[attr]
+            end
+
+          screened_url_array.push(data)
+        end
+
+        screened_url_array
+      end
+
 
       def set_file_path
         @file_name = "export_#{SecureRandom.hex(4)}.csv"
diff --git a/app/jobs/regular/process_post.rb b/app/jobs/regular/process_post.rb
index 394b2ae191..cac70c050f 100644
--- a/app/jobs/regular/process_post.rb
+++ b/app/jobs/regular/process_post.rb
@@ -10,15 +10,29 @@ module Jobs
       # two levels of deletion
       return unless post.present? && post.topic.present?
 
-      post.update_column(:cooked, post.cook(post.raw, topic_id: post.topic_id)) if args[:cook].present?
+      orig_cooked = post.cooked
+      recooked = nil
+
+      if args[:cook].present?
+        recooked = post.cook(post.raw, topic_id: post.topic_id)
+        post.update_column(:cooked, recooked)
+      end
 
       cp = CookedPostProcessor.new(post, args)
       cp.post_process(args[:bypass_bump])
 
       # If we changed the document, save it
-      if cp.dirty?
-        post.update_column(:cooked, cp.html)
-        post.publish_change_to_clients! :revised
+      cooked = cp.html
+
+      if cooked != (recooked || orig_cooked)
+
+        if orig_cooked.present? && cooked.blank?
+          # TODO suicide if needed, let's gather a few here first
+          Rails.logger.warn("Cooked post processor in FATAL state, bypassing. You need to urgently restart sidekiq\norig: #{orig_cooked}\nrecooked: #{recooked}\ncooked: #{cooked}\npost id: #{post.id}")
+        else
+          post.update_column(:cooked, cp.html)
+          post.publish_change_to_clients! :revised
+        end
       end
     end
 
diff --git a/app/jobs/scheduled/purge_inactive.rb b/app/jobs/scheduled/purge_inactive.rb
index ee5e30a43b..a6615f5fe2 100644
--- a/app/jobs/scheduled/purge_inactive.rb
+++ b/app/jobs/scheduled/purge_inactive.rb
@@ -3,7 +3,7 @@ module Jobs
     every 1.day
 
     def execute(args)
-      User.purge_inactive
+      User.purge_unactivated
     end
   end
 end
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index 9192ea6e7c..218247690d 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -127,7 +127,7 @@ class UserNotifications < ActionMailer::Base
       title: post.topic.title,
       post: post,
       username: post.user.username,
-      from_alias: SiteSetting.enable_email_names ? post.user.name : post.user.username,
+      from_alias: (SiteSetting.enable_email_names && !post.user.name.empty?) ? post.user.name : post.user.username,
       allow_reply_by_email: true,
       use_site_subject: true,
       add_re_to_subject: true,
@@ -173,7 +173,7 @@ class UserNotifications < ActionMailer::Base
 
     user_name = @notification.data_hash[:original_username]
     if @post && SiteSetting.enable_email_names
-      user_name = User.find_by(id: @post.user_id).name
+      user_name = User.find_by(id: @post.user_id).name if !User.find_by(id: @post.user_id).name.empty?
     end
 
     notification_type = opts[:notification_type] || Notification.types[@notification.notification_type].to_s
diff --git a/app/models/post_action.rb b/app/models/post_action.rb
index b224f45276..a778057690 100644
--- a/app/models/post_action.rb
+++ b/app/models/post_action.rb
@@ -174,6 +174,8 @@ class PostAction < ActiveRecord::Base
     title = I18n.t("post_action_types.#{post_action_type}.email_title", title: post.topic.title)
     body = I18n.t("post_action_types.#{post_action_type}.email_body", message: opts[:message], link: "#{Discourse.base_url}#{post.url}")
 
+    title = title.truncate(255, separator: /\s/)
+
     opts = {
       archetype: Archetype.private_message,
       title: title,
@@ -232,7 +234,7 @@ class PostAction < ActiveRecord::Base
     else
       post_action = PostAction.where(where_attrs).first
 
-      # after_commit is not called on an `update_all` so do the notify ourselves
+      # after_commit is not called on an 'update_all' so do the notify ourselves
       post_action.notify_subscribers
     end
 
@@ -349,7 +351,7 @@ class PostAction < ActiveRecord::Base
       # Voting also changes the sort_order
       Post.where(id: post_id).update_all ["vote_count = :count, sort_order = :max - :count", count: count, max: Topic.max_sort_order]
     when :like
-      # `like_score` is weighted higher for staff accounts
+      # 'like_score' is weighted higher for staff accounts
       score = PostAction.joins(:user)
                         .where(post_id: post_id)
                         .sum("CASE WHEN users.moderator OR users.admin THEN #{SiteSetting.staff_like_weight} ELSE 1 END")
@@ -370,6 +372,7 @@ class PostAction < ActiveRecord::Base
 
   def enforce_rules
     post = Post.with_deleted.where(id: post_id).first
+    PostAction.auto_close_if_treshold_reached(post.topic)
     PostAction.auto_hide_if_needed(user, post, post_action_type_key)
     SpamRulesEnforcer.enforce!(post.user) if post_action_type_key == :spam
   end
@@ -380,6 +383,29 @@ class PostAction < ActiveRecord::Base
     end
   end
 
+  MAXIMUM_FLAGS_PER_POST = 3
+
+  def self.auto_close_if_treshold_reached(topic)
+    return if topic.closed?
+
+    flags = PostAction.active
+                      .flags
+                      .joins(:post)
+                      .where("posts.topic_id = ?", topic.id)
+                      .where.not(user_id: Discourse::SYSTEM_USER_ID)
+                      .group("post_actions.user_id")
+                      .pluck("post_actions.user_id, COUNT(post_id)")
+
+    # we need a minimum number of unique flaggers
+    return if flags.count < SiteSetting.num_flaggers_to_close_topic
+    # we need a minimum number of flags
+    return if flags.sum { |f| f[1] } < SiteSetting.num_flags_to_close_topic
+
+    # the threshold has been reached, we will close the topic waiting for intervention
+    message = I18n.t("temporarily_closed_due_to_flags")
+    topic.update_status("closed", true, Discourse.system_user, message)
+  end
+
   def self.auto_hide_if_needed(acting_user, post, post_action_type)
     return if post.hidden
 
diff --git a/app/models/site_setting.rb b/app/models/site_setting.rb
index 0419ff95f5..284df6d532 100644
--- a/app/models/site_setting.rb
+++ b/app/models/site_setting.rb
@@ -7,6 +7,11 @@ class SiteSetting < ActiveRecord::Base
   validates_presence_of :name
   validates_presence_of :data_type
 
+  after_save do |site_setting|
+    DiscourseEvent.trigger(:site_setting_saved, site_setting)
+    true
+  end
+
   def self.load_settings(file)
     SiteSettings::YamlLoader.new(file).load do |category, name, default, opts|
       if opts.delete(:client)
@@ -19,8 +24,10 @@ class SiteSetting < ActiveRecord::Base
 
   load_settings(File.join(Rails.root, 'config', 'site_settings.yml'))
 
-  Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|
-    load_settings(file)
+  unless Rails.env.test? && ENV['LOAD_PLUGINS'] != "1"
+    Dir[File.join(Rails.root, "plugins", "*", "config", "settings.yml")].each do |file|
+      load_settings(file)
+    end
   end
 
   client_settings << :available_locales
diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb
index cad2eebc97..9905a7b327 100644
--- a/app/models/top_topic.rb
+++ b/app/models/top_topic.rb
@@ -119,7 +119,7 @@ class TopTopic < ActiveRecord::Base
         WITH top AS (
           SELECT CASE
                    WHEN topics.created_at < :from THEN 0
-                   ELSE log(greatest(#{period}_views_count, 1)) + #{period}_likes_count + #{period}_posts_count * 2
+                   ELSE log(greatest(#{period}_views_count, 1)) + #{period}_likes_count * 2 + #{period}_posts_count * 2
                  END AS score,
                  topic_id
           FROM top_topics
diff --git a/app/models/topic.rb b/app/models/topic.rb
index d8572832e0..f71b695ac3 100644
--- a/app/models/topic.rb
+++ b/app/models/topic.rb
@@ -397,8 +397,8 @@ class Topic < ActiveRecord::Base
     similar
   end
 
-  def update_status(status, enabled, user)
-    TopicStatusUpdate.new(self, user).update!(status, enabled)
+  def update_status(status, enabled, user, message=nil)
+    TopicStatusUpdate.new(self, user).update!(status, enabled, message)
   end
 
   # Atomically creates the next post number
diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb
index 43ee405514..4f23d7c3de 100644
--- a/app/models/topic_status_update.rb
+++ b/app/models/topic_status_update.rb
@@ -1,12 +1,12 @@
 TopicStatusUpdate = Struct.new(:topic, :user) do
-  def update!(status, enabled)
+  def update!(status, enabled, message=nil)
     status = Status.new(status, enabled)
 
     Topic.transaction do
       change(status)
       highest_post_number = topic.highest_post_number
 
-      create_moderator_post_for(status)
+      create_moderator_post_for(status, message)
       update_read_state_for(status, highest_post_number)
     end
   end
@@ -31,8 +31,8 @@ TopicStatusUpdate = Struct.new(:topic, :user) do
     CategoryFeaturedTopic.feature_topics_for(topic.category)
   end
 
-  def create_moderator_post_for(status)
-    topic.add_moderator_post(user, message_for(status), options_for(status))
+  def create_moderator_post_for(status, message=nil)
+    topic.add_moderator_post(user, message || message_for(status), options_for(status))
     topic.reload
   end
 
diff --git a/app/models/user.rb b/app/models/user.rb
index 56cad0d705..7ac2fbc681 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -2,7 +2,6 @@ require_dependency 'email'
 require_dependency 'email_token'
 require_dependency 'trust_level'
 require_dependency 'pbkdf2'
-require_dependency 'summarize'
 require_dependency 'discourse'
 require_dependency 'post_destroyer'
 require_dependency 'user_name_suggester'
@@ -25,7 +24,7 @@ class User < ActiveRecord::Base
   has_many :post_actions, dependent: :destroy
   has_many :user_badges, -> {where('user_badges.badge_id IN (SELECT id FROM badges where enabled)')}, dependent: :destroy
   has_many :badges, through: :user_badges
-  has_many :email_logs, dependent: :destroy
+  has_many :email_logs, dependent: :delete_all
   has_many :post_timings
   has_many :topic_allowed_users, dependent: :destroy
   has_many :topics_allowed, through: :topic_allowed_users, source: :topic
@@ -791,16 +790,12 @@ class User < ActiveRecord::Base
     end
   end
 
-  # Delete inactive accounts that are over a week old
-  def self.purge_inactive
+  # Delete unactivated accounts (without verified email) that are over a week old
+  def self.purge_unactivated
 
-    # You might be wondering why this query matches on post_count = 0. The reason
-    # is a long time ago we had a bug where users could post before being activated
-    # and some sites still have those records which can't be purged.
     to_destroy = User.where(active: false)
                      .joins('INNER JOIN user_stats AS us ON us.user_id = users.id')
-                     .where("created_at < ?", SiteSetting.purge_inactive_users_grace_period_days.days.ago)
-                     .where('us.post_count = 0')
+                     .where("created_at < ?", SiteSetting.purge_unactivated_users_grace_period_days.days.ago)
                      .where('NOT admin AND NOT moderator')
                      .limit(100)
 
diff --git a/app/models/user_profile.rb b/app/models/user_profile.rb
index 06be18d41c..2941b92233 100644
--- a/app/models/user_profile.rb
+++ b/app/models/user_profile.rb
@@ -10,8 +10,8 @@ class UserProfile < ActiveRecord::Base
 
   BAKED_VERSION = 1
 
-  def bio_excerpt
-    excerpt = PrettyText.excerpt(bio_cooked, 350)
+  def bio_excerpt(length=350, opts={})
+    excerpt = PrettyText.excerpt(bio_cooked, length, opts)
     return excerpt if excerpt.blank? || (user.has_trust_level?(TrustLevel[1]) && !user.suspended?)
     PrettyText.strip_links(excerpt)
   end
@@ -23,7 +23,7 @@ class UserProfile < ActiveRecord::Base
 
   def bio_summary
     return nil unless bio_cooked.present?
-    Summarize.new(bio_cooked).summary
+    bio_excerpt(500, strip_links: true, text_entities: true)
   end
 
   def recook_bio
diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb
index 030a1e648d..92c08c3462 100644
--- a/app/serializers/topic_view_serializer.rb
+++ b/app/serializers/topic_view_serializer.rb
@@ -42,8 +42,8 @@ class TopicViewSerializer < ApplicationSerializer
              :has_deleted,
              :actions_summary,
              :expandable_first_post,
-             :is_warning
-
+             :is_warning,
+             :chunk_size
 
   # Define a delegator for each attribute of the topic we want
   attributes(*topic_attributes)
@@ -113,6 +113,9 @@ class TopicViewSerializer < ApplicationSerializer
     result
   end
 
+  def chunk_size
+    object.chunk_size
+  end
 
   def is_warning
     object.topic.private_message? && object.topic.subtype == TopicSubtype.moderator_warning
diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb
index 1313db0b76..460ccb0dd5 100644
--- a/app/serializers/user_serializer.rb
+++ b/app/serializers/user_serializer.rb
@@ -45,6 +45,7 @@ class UserSerializer < BasicUserSerializer
              :can_edit_email,
              :can_edit_name,
              :stats,
+             :can_send_private_messages,
              :can_send_private_message_to_user,
              :bio_excerpt,
              :trust_level,
@@ -66,7 +67,8 @@ class UserSerializer < BasicUserSerializer
   has_many :featured_user_badges, embed: :ids, serializer: UserBadgeSerializer, root: :user_badges
   has_one  :card_badge, embed: :object, serializer: BadgeSerializer
 
-  staff_attributes :number_of_deleted_posts,
+  staff_attributes :post_count,
+                   :number_of_deleted_posts,
                    :number_of_flagged_posts,
                    :number_of_flags_given,
                    :number_of_suspensions,
@@ -178,6 +180,12 @@ class UserSerializer < BasicUserSerializer
     UserAction.stats(object.id, scope)
   end
 
+  # Needed because 'send_private_message_to_user' will always return false
+  # when the current user is being serialized
+  def can_send_private_messages
+    scope.can_send_private_message?(Discourse.system_user)
+  end
+
   def can_send_private_message_to_user
     scope.can_send_private_message?(object)
   end
@@ -207,6 +215,10 @@ class UserSerializer < BasicUserSerializer
   ### STAFF ATTRIBUTES
   ###
 
+  def post_count
+    object.user_stat.try(:post_count)
+  end
+
   def number_of_deleted_posts
     Post.with_deleted
         .where(user_id: object.id)
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 931637e822..111e92e818 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -61,6 +61,9 @@
     <section id='main'>
     </section>
 
+    <div id='offscreen-content'>
+    </div>
+
     <% unless current_user %>
       <form id='hidden-login-form' method="post" action="<%=login_path%>" style="display: none;">
         <input name="username" type="text"     id="signin_username">
diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index 4367821cb0..8545f198e6 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -21,6 +21,7 @@
       <%- @featured_topics.each_with_index do |t, i| %>
         <div class='featured-topic'>
           <%= link_to t.title, "#{Discourse.base_url}#{t.relative_url}" %>
+          <br/>
           <%= email_category(t.category) %>
         </div>
 
@@ -57,7 +58,7 @@
         <div>
         <%- @new_by_category.each do |c| %>
           <span style='white-space: nowrap'>
-            <b><%= c[0].name %></b> <span style='color: #777; margin: 0 10px 0 5px; font-size: 0.9em;'> <%= c[1] %></span>
+            <a href='<%= Discourse.base_url %><%= c[0].url %>' style='color: #333'><%= c[0].name %></b> <span style='color: #777; margin: 0 10px 0 5px; font-size: 0.9em;'> <%= c[1] %></span>
           </span>
         <%- end %>
       </div>
@@ -72,6 +73,6 @@
 <div class='footer'>
   <%=raw(t :'user_notifications.digest.unsubscribe',
            site_link: html_site_link,
-             unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url, key: @user.temporary_key)))  %>
+           unsubscribe_link: link_to(t('user_notifications.digest.click_here'), email_unsubscribe_url(host: Discourse.base_url, key: @user.temporary_key)))  %>
 </div>
 
diff --git a/config/boot.rb b/config/boot.rb
index 4489e58688..517524d879 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,3 +1,12 @@
+if ENV['DISCOURSE_DUMP_HEAP'] == "1"
+  require 'objspace'
+  begin
+    ObjectSpace.trace_object_allocations_start
+  rescue NoMethodError
+    puts "Heap dumps not available for Ruby #{RUBY_VERSION} (> 2.1 required)"
+  end
+end
+
 require 'rubygems'
 
 # Set up gems listed in the Gemfile.
diff --git a/config/initializers/logster.rb b/config/initializers/logster.rb
index 652bac1ab4..d280a18f61 100644
--- a/config/initializers/logster.rb
+++ b/config/initializers/logster.rb
@@ -8,7 +8,10 @@ if Rails.env.production?
     /^ActionController::UnknownFormat/,
 
     # suppress trackback spam bots
-    Logster::IgnorePattern.new("Can't verify CSRF token authenticity", { REQUEST_URI: /\/trackback\/$/ })
+    Logster::IgnorePattern.new("Can't verify CSRF token authenticity", { REQUEST_URI: /\/trackback\/$/ }),
+
+    # API calls, TODO fix this in rails
+    Logster::IgnorePattern.new("Can't verify CSRF token authenticity", { REQUEST_URI: /api_key/ })
   ]
 end
 
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
new file mode 100644
index 0000000000..b3f66c129c
--- /dev/null
+++ b/config/locales/client.ar.yml
@@ -0,0 +1,543 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ar:
+  js:
+    number:
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            byte:
+              zero: بايت
+              one: بايت
+              two: بايت
+              few: بايت
+              many: بايت
+              other: بايت
+            gb: جيجا
+            kb: كيلو بايت
+            mb: ميجا
+            tb: تيرا
+    dates:
+      time: "سا:دد  ف"
+      long_no_year: "ش ش ش  ي  سا:دد ف"
+      long_no_year_no_time: "ش ش ش  ي"
+      long_with_year: "ش ش ش  ي,  س س س س  سا:دد  ف"
+      long_with_year_no_time: "ش ش ش  ي,  س س س س"
+      long_date_with_year: "ش ش ش  ي,  س س س س"
+      long_date_without_year: "ش ش ش  ي"
+      long_date_with_year_without_time: "ش ش ش  ي,  س س س س"
+      long_date_without_year_with_linebreak: "MMM D <br/>LT"
+      long_date_with_year_with_linebreak: "ش ش ش  ي,  س س س س"
+      tiny:
+        half_a_minute: "< 1د"
+        less_than_x_seconds:
+          zero: "> %{count}ث"
+          one: "> ثانية"
+          two: "> ثانيتان"
+          few: "> %{count}ث"
+          many: "> %{count}ث"
+          other: "> %{count}ث"
+        date_month: "ش ش ش  ي"
+        date_year: "ش ش ش  ي,  س س س س"
+      medium:
+        date_year: "ش ش ش  ي,  س س س س"
+      medium_with_ago:
+        x_days:
+          zero: "%{count} يوم مضى"
+          one: "%{count} يوم مضى"
+          two: "%{count} يوم مضى"
+          few: "%{count} يوم مضى"
+          many: "%{count} يوم مضى"
+          other: "%{count} يوم مضى"
+    share:
+      topic: 'ضع رابطاً في هذا الموضوع.'
+      post: 'ضع رابطاً في المشاركة #%{postNumber}'
+      close: 'اغلق'
+      twitter: 'شارك هذا الرابط عن طريق تويتر'
+      facebook: 'شارك هذا الرابط عن طريق فيس بوك'
+      google+: 'شارك هذا الرابط عن طريق جوجل+'
+      email: 'شارك هذا الرابط عن طريق البريد الالكتروني'
+    topic_admin_menu: "عمليات المدير"
+    edit: 'عدّل العنوان و التصنيف على هذا الموضوع'
+    not_implemented: "لم يتم تنفيذ هذه الميزة حتى الآن، نعتذر!"
+    no_value: "لا"
+    yes_value: "نعم"
+    generic_error: "نعتذر، حدث خطأ."
+    generic_error_with_reason: "حدث خطأ : %{error}"
+    sign_up: "إشترك"
+    log_in: "تسجيل الدخول "
+    age: "العمر"
+    joined: "إنضم"
+    admin_title: "المدير"
+    flags_title: "الأعلام"
+    show_more: "أعرض المزيد"
+    show_help: "مساعدة"
+    links: "روابط"
+    links_lowercase: "روابط"
+    faq: "التعليمات"
+    guidelines: "توجيهات "
+    privacy_policy: "سياسة الخصوصية "
+    privacy: "الخصوصية "
+    terms_of_service: "شروط الخدمة"
+    mobile_view: "رؤية هاتفية "
+    desktop_view: "رؤية مكتبية "
+    you: "انت"
+    or: "او"
+    now: "الآن"
+    read_more: 'اقرأ المزيد'
+    more: "المزيد"
+    less: "أقل"
+    never: "ابداً"
+    daily: "يومي"
+    weekly: "اسبوعي"
+    every_two_weeks: "كل اسبوعين"
+    max_of_count: "اقصى {{count}}"
+    suggested_topics:
+      title: "مواضيع مقترحة"
+    about:
+      simple_title: "نبذة"
+      title: "عن %{title}"
+      stats: "إحصائيات الموقع "
+      our_admins: "مدراؤنا"
+      our_moderators: "مشرفونا"
+      stat:
+        all_time: "دائما "
+        last_7_days: "آخر 7 أيام "
+      like_count: "اعجابات"
+      topic_count: "مواضيع"
+      post_count: "مشاركات"
+      user_count: "مستخدمين"
+    bookmarks:
+      not_logged_in: "نعتذر يجب ان تكون متصلا لكي تقوم بإضافة هدا الموضوع للمفضلة"
+      created: "لقد نجحت في إضافة الموضوع للمفضلة"
+      not_bookmarked: "لقد قمت بقراءة هذه المشاركة مسبقاً. اضغط هنا لحفظها."
+      last_read: "هذه آخر مشاركة تمت قرائتها. اضغط هنا لحفظها."
+      remove: "المفضلة"
+    click_to_show: "إضغط للعرض."
+    preview: "معاينة"
+    cancel: "الغاء"
+    save: "حفظ التغييرات"
+    saving: "يتم الحفظ..."
+    saved: "تم الحفظ!"
+    upload: "رفع"
+    uploading: "يتم الرفع..."
+    uploaded: "اكتمل الرفع!"
+    enable: "تمكين"
+    disable: "تعطيل"
+    undo: "تراجع"
+    revert: "عكس"
+    failed: "فشل"
+    choose_topic:
+      none_found: "لم يتم العثور على مواضيع."
+      title:
+        search: "بحث عن موضوع حسب الاسم، رابط أو رقم التعريف(id) :"
+        placeholder: "اكتب عنوان الموضوع هنا"
+    user_action:
+      user_posted_topic: "a href='{{userUrl}}'>{{user}}</a> مشاركات<a href='{{topicUrl}}'>هذا الموضوع</a>"
+      you_posted_topic: "<a href='{{userUrl}}'>ك</a> مشاركات<a href='{{topicUrl}}'>هذا الموضوع</a>"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> الرد على<a href='{{postUrl}}'>{{post_number}}</a>"
+      you_replied_to_post: "<a href='{{userUrl}}'>أنت</a> ردودك <a href='{{postUrl}}'>{{post_number}}</a>"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a> ردوا على  <a href='{{topicUrl}}'>هذا الموضوع</a>"
+      you_replied_to_topic: "<a href='{{userUrl}}'>أنت</a> ردك على <a href='{{topicUrl}}'>the topic</a>"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> منشن<a href='{{user2Url}}'>{{another_user}}</a>"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> منشنك<a href='{{user2Url}}'>you</a>"
+      posted_by_user: "مشاركة  <a href='{{userUrl}}'>{{user}}</a>"
+      posted_by_you: "مشاركتك <a href='{{userUrl}}'></a>"
+      sent_by_user: "مرسلة من قبل <a href='{{userUrl}}'>{{user}}</a>"
+      sent_by_you: "مرسلة من قبلك <a href='{{userUrl}}'></a>"
+    groups:
+      visible: "المجموعة مخفية عن جميع المستخدمين"
+      title:
+        zero: "مجموعات"
+        one: "مجموعات"
+        two: "مجموعات"
+        few: "مجموعات"
+        many: "مجموعات"
+        other: "مجموعات"
+      members: "أعضاء "
+      posts: "مشاركات"
+      alias_levels:
+        title: "من يستطيع أن يشارك في هذه المجموعة ؟"
+        nobody: "لا أحد"
+        only_admins: "المسؤولين فقط"
+        mods_and_admins: "فقط المدراء والمشرفون"
+        members_mods_and_admins: "فقط اعضاء المجموعة والمشرفون والمدراء"
+        everyone: "الكل"
+    user_action_groups:
+      '1': "الإعجابات التي قمت بإعطائها"
+      '2': "الإعجابات التي استلمتها"
+      '3': "المفضلة"
+      '4': "مواضيع"
+      '5': "مشاركات"
+      '6': "ردود "
+      '7': "إشارات"
+      '9': "إقتباسات"
+      '10': "تألقت"
+      '11': "التعديلات"
+      '12': "العناصر المرسلة"
+      '13': "البريد الوارد"
+    categories:
+      all: "جميع التصنيفات"
+      all_subcategories: "جميع"
+      no_subcategory: "لا شيء"
+      category: "تصنيف"
+      posts: "مشاركات"
+      topics: "مواضيع"
+      latest: "آخر"
+      latest_by: "الاحدث بـ"
+      toggle_ordering: "تبديل التحكم في الترتيب"
+      subcategories: "تصنيفات فرعية"
+      topic_stats: "عدد المواضيع الجديدة"
+      post_stats: "عدد المواضيع الجديدة"
+    ip_lookup:
+      title: 'جدول العناوين '
+      hostname: Hostname
+      location: الموقع
+      location_not_found: (غيرمعرف)
+      organisation: المنظمات
+      phone: هاتف
+      other_accounts: "حساب آخر بنفس العنوان"
+      delete_other_accounts: "حذف %{count}"
+      username: "إسم المستخدم"
+      trust_level: "TL"
+      read_time: "وقت القراءة"
+      topics_entered: " مواضيع شوهدت"
+      post_count: "# مشاركات"
+      confirm_delete_other_accounts: "هل أنت متأكد أنك تريد حذف هذا الحساب ؟"
+    user:
+      said: "{{username}}:"
+      profile: "الملف الشخصي"
+      mute: "كتم"
+      edit: "تعديل التفضيلات"
+      download_archive: " تحميل أرشيف مواضيعي"
+      new_private_message: "انشاء رسالة خاصة"
+      private_message: "رسائل خاصة"
+      private_messages: "الرسائل"
+      activity_stream: "النشاط"
+      preferences: " التفضيلات"
+      bookmarks: "المفضلة"
+      bio: "معلومات عنّي"
+      invited_by: "مدعو بواسطة"
+      trust_level: "مستوى الثقة"
+      notifications: "اشعارات"
+      dismiss_notifications: "جعل الجميع مقروء"
+      dismiss_notifications_tooltip: "جعل جميع اشعارات غيرمقروء الى مقروء"
+      disable_jump_reply: "لاتذهب الى مشاركة جديدة بعد الرد"
+      dynamic_favicon: " (أظهر تنبيهات الرسائل الواردة على فافيكون  (تجريبية "
+      edit_history_public: "جعل المستخدمين الاخرين يطلعون على تعديلاتي"
+      external_links_in_new_tab: "إفتح كل الروابط الخارجية في صفحة جديدة"
+      enable_quoting: "إسمح بإقتباس التعليقات لنصوص البارزة الملقى عليها ضوء"
+      change: "تغيير"
+      moderator: "{{user}} لديه صلاحية التعديل"
+      admin: "{{user}} مدير"
+      moderator_tooltip: "هذا المستخدم لديه صلاحية التعديل"
+      admin_tooltip: "هذا المستخدم مدير"
+      suspended_notice: "هذا المستخدم موقوف حتى تاريخ  {{date}}"
+      suspended_reason: "سبب"
+      github_profile: "Github"
+      mailing_list_mode: "استقبال بريد الكتروني لكل مشاركة  جديدة (بإسثناء لو قمت بكتم الموضوع او التصنيف)"
+      watched_categories: "متابع"
+      watched_categories_instructions: "تلقائيا ستقوم بمتابعة جميع المواضيع في هذا التصنيف , وسيتم اشعارك لجميع المشاركات والمواضيع وكذلك عداد الغيرمقروء والمشاركات الجديدة"
+      tracked_categories: "Tracked"
+      tracked_categories_instructions: "تلقائيا ستقوم بمتابعة جميع المواضيع في هذا التصنيف , وسيتم اشعارك لجميع المشاركات والمواضيع وكذلك عداد الغيرمقروء والمشاركات الجديدة"
+      muted_categories: "كتم"
+      change_password:
+        success: "(تم ارسال الرسالة)"
+        in_progress: "(يتم ارسال رسالة)"
+        error: "(خطأ)"
+      change_about:
+        title: "تعديل معلومات عنّي"
+      change_username:
+        title: "تغيير اسم المستخدم"
+        confirm: "إذا قمت بتغيير الاسم المستعار، فإن جميع المشاركات التي قمت بالمشاركة بها سيتم الغائها. هل أنت متأكد بقيامك على هذه الخطوة؟"
+        taken: "نأسف، اسم المستخدم مأخوذ."
+        error: "حدث خطأ عند تغيير اسم المستخدم."
+        invalid: "اسم المستخدم غير صالح. يجب ان يحتوي على ارقام وحروف فقط "
+      change_email:
+        title: "تغيير البريد الالكتروني"
+        taken: "نأسف، البريد الالكتروني غير متاح."
+        error: "حدث خطأ عند تغيير البريد الالكتروني. ربما يكون هذا البريد مستخدم من قبل؟"
+        success: "تم ارسال رسالة الى البريد الكتروني. يرجى اتباع تعليمات التأكيد."
+      email:
+        title: "بريد الكتروني"
+      name:
+        title: "الاسم"
+      username:
+        title: "اسم المستخدم"
+        global_mismatch: "مسجل مسبقا ، جرّب {{suggestion}} ؟"
+        not_available: "غير متاح. جرّب {{suggestion}} ؟"
+        checking: "يتم التاكد من توفر اسم المستخدم..."
+      password_confirmation:
+        title: "اعد كلمة المرور"
+      last_posted: " أخر موضوع"
+      last_emailed: "أخر مراسلة"
+      last_seen: "شوهد"
+      created: "إنضم"
+      log_out: "تسجيل الخروج"
+      location: "الموقع"
+      website: "موقع الكتروني"
+      email_settings: "بريد الكتروني"
+      email_digests:
+        title: "عندم لا تقوم بزيارة الموقع، سنرسل رسالة الكترونية تحتوي على الجديد من موقعنا بشكل:"
+        daily: "يومي"
+        weekly: "اسبوعي"
+        bi_weekly: "كل اسبوعين"
+      email_direct: "تلقي رسالة إلكترونية عندما يقوم شخص بإقتباس مشاركتك، الرد عليك او ذكر اسمك @username"
+      email_private_messages: "إستقبل بريدا لما يرسل لك شخصا رسالة خاصة"
+      other_settings: "اخرى"
+      new_topic_duration:
+        label: " \nإعتبر الوضوع جديد حين"
+        not_viewed: "لم تقم بالاطلاع عليهم حتى الان."
+      auto_track_options:
+        never: "ابداً"
+        always: "دائما"
+      invited:
+        title: "دعوة"
+        user: "المستخدمين المدعويين"
+        none: ".لم تقم بدعوة أي شخص إلى هنا حتى الأن"
+        redeemed: "دعوات مستخدمة"
+        redeemed_at: "مستخدمة"
+        pending: "دعوات قيد الإنتضار"
+        topics_entered: " مواضيع شوهدت"
+        posts_read_count: "مشاركات شوهدت"
+        rescind: "حذف"
+        rescinded: "الدعوة حذفت"
+        time_read: "وقت القراءة"
+        days_visited: "أيام الزيارة"
+        account_age_days: "عمر العضوية بالأيام"
+      password:
+        title: "كلمة المرور"
+        too_short: "كلمة المرور قصيرة جداً"
+        ok: "كلمة المرور هذة تعتبر جيدة."
+      ip_address:
+        title: "أخر عنوان أيبي"
+      avatar:
+        title: "صورة العرض"
+      title:
+        title: "عنوان"
+      filters:
+        all: "الكل"
+      stream:
+        posted_by: "ارسلت بواسطة"
+        sent_by: " أرسلت بواسطة"
+        private_message: "رسالة خاصة"
+        the_topic: "موضوع جديد"
+    loading: "يتم التحميل..."
+    close: "اغلاق"
+    learn_more: "تعلم المزيد..."
+    year: 'سنة'
+    year_desc: 'المواضيع المكتوبة خلال 365 يوم الماضية'
+    month: 'الشهر'
+    month_desc: 'المواضيع المكتوبة خلال 30 يوم الماضية'
+    week: 'أسبوع'
+    week_desc: ' المواضيع التي كتبت خلال 7 أيام الماضية'
+    first_post: الموضوع الأول
+    mute: كتم
+    unmute: إلغاء الكتم
+    last_post: أخر مشاركة
+    private_message_info:
+      title: " رسالة خاصة"
+      invite: " إستدعي الأخرين"
+    email: 'البريد الإلكتروني'
+    username: 'إسم المستخدم'
+    last_seen: 'شوهدت'
+    created: 'مكتوبة'
+    trust_level: 'مستوى التقة'
+    create_account:
+      title: "إنشاء حساب جديد"
+    forgot_password:
+      title: "نسيت الرمز السري"
+      action: "لقد نسيت رمزي  السري"
+      reset: " إعادة تعين الرمز السري"
+    login:
+      username: "المستخدم"
+      password: "الرمز السري"
+      email_placeholder: "البريد الإلكتروني أو إسم المستخدم"
+      error: "مشكل غير معروف"
+      reset_password: ' إعادة تعيين الرمز السري'
+      logging_in: "...تسجيل الدخول "
+      or: "أو "
+      authenticating: " ... جاري التأكد"
+      google:
+        title: "مع جوجل"
+        message: "التحقق من خلال حساب جوجل ( الرجاء التأكد من عدم تشغيل مانع الاعلانات المنبثقة في المتصفح)"
+      twitter:
+        title: "مع تويتر"
+        message: "التحقق من خلال حساب تويتر ( الرجاء التأكد من عدم تشغيل مانع الاعلانات المنبثقة في المتصفح)"
+      facebook:
+        title: "مع الفيسبوك"
+        message: "التحقق من خلال حساب الفيس بوك ( الرجاء التأكد من عدم تشغيل مانع الاعلانات المنبثقة في المتصفح)"
+      yahoo:
+        title: "مع ياهو"
+        message: "التحقق من خلال حساب ياهو ( الرجاء التأكد من عدم تشغيل مانع الاعلانات المنبثقة في المتصفح)"
+      github:
+        title: "مع جيتهب"
+        message: "التحقق من خلال حساب جيتهب ( الرجاء التأكد من عدم تشغيل مانع الاعلانات المنبثقة في المتصفح)"
+    composer:
+      posting_not_on_topic: "أي موضوع تود الرد عليه؟"
+      saving_draft_tip: "يتم الحفظ"
+      saved_draft_tip: "تم الحفظ"
+      saved_local_draft_tip: "تم الحفظ محلياً"
+      similar_topics: "موضوعك مشابه لـ ..."
+      drafts_offline: "مسودات محفوظة "
+      error:
+        title_missing: "العنوان مطلوب"
+        post_missing: "لا يمكن للمشاركة أن تكون خالية"
+        category_missing: "يجب عليك اختيارفئة"
+      save_edit: "حفظ التحرير"
+      reply_here: "الرد هنا"
+      reply: "الرد"
+      cancel: "إلغاء"
+      users_placeholder: "اضافة مستخدم"
+      upload_title: "رفع"
+      upload_description: "ادخل وصف الرفع هنا"
+    upload_selector:
+      title: "اضف صورة"
+      title_with_attachments: "اضف صورة او ملف"
+      from_my_computer: "عن طريق جهازي"
+      from_the_web: "عن طريق الويب"
+      uploading: "يتم الرفع"
+    post:
+      errors:
+        attachment_too_large: "نعتذر، الملف الذي تريد رفعه كبير جداَ ( الحد الاقصى {{max_size_kb}} كيلوبايت )"
+        too_many_uploads: "نأسف, يمكنك رفع ملف واحد فقط في نفس الوقت."
+        image_upload_not_allowed_for_new_user: "نعتذر، المستخدمين الجدد لا يمكنهم رفع صور."
+        attachment_upload_not_allowed_for_new_user: "نعتذر، المستخدمين الجدد لا يمكنهم رفع مرفقات."
+    category:
+      edit_permissions: "تعديل الصلاحيات"
+      add_permission: "اضف صلاحية"
+  admin_js:
+    admin:
+      dashboard:
+        version: "الاصدار"
+        critical_available: "يوجد تحديث هام."
+        updates_available: "يوجد تحديثات."
+        please_upgrade: "يرجى الترقية!"
+        installed_version: "مثبّت"
+        latest_version: "آخر"
+        problems_found: "يوجد بعض المشاكل عند تثبيت Discourse :"
+        last_checked: "آخر فحص"
+        refresh_problems: "تحديث"
+        no_problems: "لم يتم العثور على اي مشاكل."
+        moderators: 'مراقبين:'
+        admins: 'مدراء:'
+        blocked: 'محظور:'
+        private_messages_title: "رسائل خاصة"
+        reports:
+          today: "اليوم"
+          yesterday: "امس"
+          last_7_days: "اخر ٧ ايام "
+          last_30_days: "اخر ٣٠ يوم"
+          all_time: "كل الوقت"
+          7_days_ago: "منذ ٧ ايام"
+          30_days_ago: "منذ ٣٠ يوم"
+          all: "الكل"
+      commits:
+        latest_changes: "آخر تغيير: يرجى التحديث"
+        by: "بواسطة"
+      flags:
+        old: "قديم"
+        active: "نشط"
+        error: "حدث خطأ ما"
+      groups:
+        title: "مجموعات"
+        edit: "تعديل المجموعة"
+        selector_placeholder: "اضافة مستخدم"
+        name_placeholder: "اسم المجموعة, بدون مسافة, مثل قاعدة اسم المستخدم"
+        about: "هنا عدّل على عضوية المجموعة والاسماء"
+        delete: "حذف"
+        delete_confirm: "حذف هذة المجموعة؟"
+        delete_failed: "لا يمكن حذف هذه المجموعة. اذا كانت هذة المجموعة مجموعة تلقائية, لا يمكن حذفها."
+      api:
+        title: "API"
+        key: "API Key"
+        generate: "إنشاء"
+        regenerate: "إعادة إنشاء"
+      customize:
+        title: "تخصيص"
+        long_title: "تخصيص الموقع"
+        enabled: "تفعيل؟"
+        preview: "معاينة"
+        save: "حفظ"
+        new: "جديد"
+        delete: "حذف"
+        delete_confirm: "حذف هذا التخصيص؟"
+      email:
+        title: "بريد الكتروني"
+        settings: "اعدادات"
+        sent_at: "أرسلت في"
+        email_type: "نوع البريد الكتروني"
+        to_address: "الى العناوين"
+        test_email_address: "عنوان البريد الكتروني للتجربة"
+        sent_test: "اٌرسلت!"
+        delivery_method: "طريقة التسليم"
+        refresh: "تحديث"
+        html: "html"
+        text: "نص"
+        last_seen_user: "آخر مستخدم تواجد:"
+      users:
+        title: 'مستخدمين'
+        create: 'اضافة مدير'
+        last_emailed: "آخر بريد الكتروني"
+        not_found: "نعتذر، لا يوجد اسم المستخدم هذا في نظامنا."
+        active: "نشط"
+        nav:
+          new: "جديد"
+          active: "نشط"
+        titles:
+          active: 'مستخدمين نشطين'
+          new: 'مستخدمين جدد '
+          admins: 'مستخدمين مدراء'
+          moderators: 'مراقبين'
+          blocked: 'مستخدمين محظورين:'
+      user:
+        delete_all_posts: "حذف جميع المشاركات"
+        moderator: "مراقب؟"
+        admin: "مدير؟"
+        blocked: "محظور؟"
+        show_admin_profile: "مدير"
+        edit_title: "تعديل العنوان"
+        save_title: "حفظ العنوان"
+        refresh_browsers: "تحديث المتصفحات اجبارياً"
+        unblock: 'إلغاء حظر'
+        block: 'حظر'
+        permissions: صلاحيات
+        activity: أنشطة
+        private_topics_count: موضوع خاص
+        posts_read_count: المشاركات المقروءة
+        post_count: المشاركات المنشأة
+        topics_entered: المواضيع المشاهدة
+        time_read: "وقت القراءة"
+        delete: "حذف المستخدم"
+        deleted: "تم حذف المستخدم."
+        delete_failed: "حدث خطأ عند حذف المستخدم. يجب التاكد من انك حذفت جميع مشاركات المستخدم قبل محاولة حذف المستخدم."
+        send_activation_email: "ارسل رسالة تفعيل"
+        activation_email_sent: "تم ارسال رسالة التفعيل الى البريد."
+        send_activation_email_failed: "حدث خطأ عند محاولة ارسال رسالة تفعيل مرّة أخرى. %{error}"
+        activate: "تفعيل الحساب"
+        activate_failed: "حدث خطأ عند تفعيل هذا المستخدم."
+        deactivate_account: "تعطيل الحساب"
+        deactivate_failed: "حدث خطأ عند تعطيل هذا المستخدم."
+        unblock_failed: 'حدث خطأ عند الغاء حظر هذا المستخدم.'
+        block_failed: 'حدث خطأ عند حظر هذا المستخدم.'
+      site_settings:
+        none: 'لا شيء'
+    badges:
+      badge:
+        first_share:
+          description: مشاركة تعليق
+        first_link:
+          name: الرابط الأول
+          description: اضافة رابط لموضوع اخر
+        first_quote:
+          name: التعليق الأول
+          description: إقتباسات
+        read_guidelines:
+          name: 'توجيهات '
+          description: اطلع على  <a href="/guidelines">توجيهات المجتمع</a>
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 31592740bc..136149ca75 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -364,7 +364,6 @@ cs:
         ok: "Pro potvrzení vám pošleme email."
         invalid: "Zadejte prosím správnou emailovou adresu"
         authenticated: "Vaše emailová adresa byla autorizována přes službu {{provider}}."
-        frequency: "Budeme vás informovat emailem pouze pokud jste se na našem webu dlouho neukázali a pokud jste obsah, o kterém vás chceme informovat, doposud neviděli."
       name:
         title: "Jméno"
         instructions: "Celé jméno (volitelně)"
@@ -1702,6 +1701,8 @@ cs:
             label: "Nové:"
             ip_address: "IP adresa"
             add: "Přidat"
+        logster:
+          title: "Chybové záznamy"
       users:
         title: 'Uživatelé'
         create: 'Přidat administrátora'
@@ -1713,6 +1714,7 @@ cs:
           new: "Noví"
           active: "Aktivní"
           pending: "Čeká na schválení"
+          staff: 'Štáb'
           suspended: 'Zakázaní'
           blocked: 'Blokovaní'
         approved: "Schválen?"
@@ -1733,6 +1735,7 @@ cs:
           regular: 'Uživatelé s věrohodností 2 (Člen)'
           leader: 'Uživatelé s věrohodností 3 (Pravidelný uživatel)'
           elder: 'Uživatelé s věrohodností 4 (Vedoucí)'
+          staff: "Štáb"
           admins: 'Admininstrátoři'
           moderators: 'Moderátoři'
           blocked: 'Blokovaní uživatelé'
@@ -1907,13 +1910,18 @@ cs:
         grant: Udělit
         no_user_badges: "%{name} nezískal žádné oznaky."
         no_badges: Nejsou tu žádné odznaky, které by se dali rozdat.
+        allow_title: Povolit užití odzanku jako titul
         multiple_grant: Může být přiděleno několikrát
+        listable: Zobrazit odznak na veřejné stránce s odzanky
         enabled: Povolit odznaky
         icon: Ikona
         image: Obrázek
+        icon_help: "Použijte buď Font Awesome nebo URL k obrázku."
+        trigger: Spouštěč
         preview:
           bad_count_warning:
             header: "VAROVÁNÍ!"
+          sample: "Příklad:"
     lightbox:
       download: "download"
     search_help:
@@ -1968,6 +1976,8 @@ cs:
         mark_watching: '<b>m</b>, <b>w</b> Watch topic'
     badges:
       title: Odznaky
+      allow_title: "Povolit užití odzanku jako titulu?"
+      multiple_grant: "Může být přiděleno několikrát"
       badge_count:
         one: "1 odznak"
         few: "%{count} odznaky"
@@ -1983,6 +1993,8 @@ cs:
       select_badge_for_title: Vyberte odznak, který chcete použít jako svůj titul
       none: "<none>"
       badge_grouping:
+        getting_started:
+          name: Jak začít?
         community:
           name: Komunita
         trust_level:
@@ -1994,6 +2006,7 @@ cs:
       badge:
         editor:
           name: Editor
+          description: První úprava příspěvku.
         basic_user:
           name: Základní
         member:
@@ -2007,6 +2020,7 @@ cs:
           description: Obdrženo líbí se mi
         autobiographer:
           name: Autor vlastního životopisu
+          description: Vypněné informace v <a href="/my/preferences">profilu</a>.
         nice_post:
           name: Zdařilý příspěvek
           description: Obdrženo 10 líbí se na příspěvku. Tento odznak můžete získat opakovaně
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 3f4a927140..b8de4b6b14 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -333,7 +333,6 @@ da:
         instructions: "Profil baggrunde vil blive centrerede og have en standard bredde på 850 pixels"
       email:
         title: "E-mail"
-        frequency: "Vi sender dig kun e-mail, hvis du ikke har været på siden for nylig, og du ikke allerede har set de ting vi ville e-mail’e dig om."
       name:
         title: "Navn"
       username:
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index ab744d3d8a..6bb16c85df 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -260,6 +260,7 @@ de:
       mute: "Stummschalten"
       edit: "Einstellungen bearbeiten"
       download_archive: "Ein Archiv meiner Beiträge herunterladen"
+      new_private_message: "Neue private Nachricht"
       private_message: "Private Nachricht"
       private_messages: "Nachrichten"
       activity_stream: "Aktivität"
@@ -348,7 +349,10 @@ de:
         ok: "Wir senden dir zur Bestätigung eine E-Mail"
         invalid: "Bitte gib eine gültige E-Mail-Adresse ein"
         authenticated: "Deine E-Mail-Adresse wurde von {{provider}} bestätigt"
-        frequency: "Wir werden dir nur E-Mails senden, wenn wir dich kürzlich nicht gesehen haben und wenn du die betroffenen Inhalte noch nicht gesehen hast."
+        frequency:
+          zero: "Wir werden dir sofort eine E-Mail senden, wenn du die betroffenen Inhalte noch nicht gelesen hast."
+          one: "Wir werden dir nur dann eine E-Mail senden, wenn wir dich innerhalb der letzten Minute nicht gesehen haben und wenn du die betroffenen Inhalte noch nicht gelesen hast. "
+          other: "Wir werden dir nur dann eine E-Mail senden, wenn wir dich innerhalb der letzten {{count}} Minuten nicht gesehen haben und wenn du die betroffenen Inhalte noch nicht gelesen hast. "
       name:
         title: "Name"
         instructions: "Dein vollständiger Name (optional)"
@@ -395,7 +399,7 @@ de:
       categories_settings: "Kategorien"
       new_topic_duration:
         label: "Themen als neu ansehen, wenn"
-        not_viewed: "ich sie noch nicht betrachtet habe"
+        not_viewed: "ich diese noch nicht betrachtet habe"
         last_here: "seit meinem letzten Besuch erstellt"
         after_n_days:
           one: "vor einem Tag erstellt"
@@ -553,7 +557,7 @@ de:
       requires_invite: "Entschuldige, der Zugriff auf dieses Forum ist nur mit einer Einladung möglich."
       not_activated: "Du kannst dich noch nicht anmelden. Wir haben dir schon eine E-Mail zur Aktivierung an <b>{{sentTo}}</b> geschickt. Bitte folge den Anweisungen in dieser E-Mail, um dein Benutzerkonto zu aktivieren."
       not_allowed_from_ip_address: "Du kannst dich mit dieser IP-Adresse nicht anmelden."
-      resend_activation_email: "Klicke hier um eine neue Aktivierungsmail zu schicken."
+      resend_activation_email: "Klicke hier, um eine neue Aktivierungsmail zu schicken."
       sent_activation_email_again: "Wir haben dir eine weitere E-Mail zur Aktivierung an <b>{{currentEmail}}</b> geschickt. Es könnte ein paar Minuten dauern, bis diese ankommt; sieh auch im Spam-Ordner nach."
       google:
         title: "mit Google"
@@ -597,7 +601,7 @@ de:
       reply: "Antworten"
       cancel: "Abbrechen"
       create_topic: "Thema erstellen"
-      create_pm: "Private Nachricht"
+      create_pm: "Private Nachricht erstellen"
       title: "Oder drücke Strg+Eingabetaste"
       users_placeholder: "Benutzer hinzufügen"
       title_placeholder: "Um was geht es in dieser Diskussion? Schreib einen kurzen Satz."
@@ -639,7 +643,7 @@ de:
       admin_options_title: "Optionale Mitarbeiter-Einstellungen für dieses Thema"
       auto_close:
         label: "Thema automatisch schließen:"
-        error: "Bitte geben Sie einen gültigen Wert ein."
+        error: "Bitte gib einen gültigen Wert ein."
         based_on_last_post: "Das Thema nicht schließen, wenn der letzte Beitrag nicht mindestens so alt ist."
         all:
           examples: 'Gib die Anzahl von Stunden (24), eine absolute Uhrzeit (17:30) oder einen Zeitstempel (2013-11-22 14:00) ein.'
@@ -685,6 +689,7 @@ de:
         user: "Beiträge von @{{username}} durchsuchen"
         category: "Kategorie „{{category}}“ durchsuchen"
         topic: "Dieses Thema durchsuchen"
+        private_messages: "Private Nachrichten durchsuchen"
     site_map: "zu einer anderen Themenliste oder Kategorie wechseln"
     go_back: 'zurückgehen'
     not_logged_in_user: 'Benutzerseite mit einer Zusammenfassung der Benutzeraktivitäten und Einstellungen'
@@ -1520,6 +1525,7 @@ de:
             title: "Die Datenbank auf den letzten funktionierenden Zustand zurücksetzen"
             confirm: "Möchtest du wirklich die Datenbank auf den letzten funktionierenden Stand zurücksetzen?"
       export_csv:
+        success: "Der Export wurde gestartet. Du wirst in Kürze über den Fortschritt benachrichtigt."
         failed: "Der Export ist fehlgeschlagen. Bitte überprüfe die Logs."
         button_text: "Exportieren"
       customize:
@@ -1689,6 +1695,9 @@ de:
           title: "Überprüfte IPs"
           description: 'IP-Adressen die beobachtet werden. Benutze „Erlauben“, um IP-Adressen auf die Whitelist zu setzen.'
           delete_confirm: "Möchtest du wirklich die Regel für %{ip_address} entfernen?"
+          roll_up_confirm: "Möchtest du wirklich die häufig blockierten IP-Adressen zu Subnetzen zusammenfassen?"
+          rolled_up_some_subnets: "Die geblockten IP-Adressen wurden erfolgreich zu diesen Subnetzen zusammengefasst: %{subnets}"
+          rolled_up_no_subnet: "Es konnte nichts zusammengefasst werden."
           actions:
             block: "Blockieren"
             do_nothing: "Erlauben"
@@ -1697,6 +1706,9 @@ de:
             label: "Neu:"
             ip_address: "IP-Adresse"
             add: "Hinzufügen"
+          roll_up:
+            text: "Zusammenfassen"
+            title: "Erzeugt neue Einträge zum Blockieren von Subnetzen, wenn mindestens 'min_ban_entries_for_roll_up' Einträge vorhanden sind."
         logster:
           title: "Fehlerprotokolle"
       impersonate:
@@ -1707,14 +1719,17 @@ de:
         create: 'Administrator hinzufügen'
         last_emailed: "Letzte E-Mail"
         not_found: "Entschuldige, dieser Benutzername existiert im System nicht."
+        id_not_found: "Entschuldigung, diese Benutzerkennung ist in unserem System nicht vorhanden."
         active: "Aktiv"
         show_emails: "E-Mails anzeigen"
         nav:
           new: "Neu"
           active: "Aktiv"
           pending: "Genehmigung"
+          staff: 'Mitarbeiter'
           suspended: 'Gesperrt'
           blocked: 'Blockiert'
+          suspect: 'Verdächtiger'
         approved: "Genehmigt?"
         approved_selected:
           one: "Benutzer genehmigen"
@@ -1731,10 +1746,12 @@ de:
           regular: 'Benutzer mit Vertrauensstufe 2 (Mitglied)'
           leader: 'Benutzer mit Vertrauensstufe 3 (Stammgast)'
           elder: 'Benutzer mit Vertrauensstufe 4 (Leitwolf)'
+          staff: "Mitarbeiter"
           admins: 'Administratoren'
           moderators: 'Moderatoren'
           blocked: 'Blockierte Benutzer'
           suspended: 'Gesperrte Benutzer'
+          suspect: 'Verdächtige Benutzer'
         reject_successful:
           one: "Erfolgreich 1 Benutzer abgelehnt."
           other: "Erfolgreich %{count} Benutzer abgelehnt."
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 317d37e421..c3290d52f6 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -293,6 +293,7 @@ en:
       mute: "Mute"
       edit: "Edit Preferences"
       download_archive: "download archive of my posts"
+      new_private_message: "New Private Message"
       private_message: "Private Message"
       private_messages: "Messages"
       activity_stream: "Activity"
@@ -391,7 +392,10 @@ en:
         ok: "We will email you to confirm"
         invalid: "Please enter a valid email address"
         authenticated: "Your email has been authenticated by {{provider}}"
-        frequency: "We'll only email you if we haven't seen you recently and you haven't already seen the thing we're emailing you about."
+        frequency:
+          zero: "We'll email you immediately if you haven't read the thing we're emailing you about."
+          one: "We'll only email you if we haven't seen you in the last minute and you haven't read the thing we're emailing you about."
+          other: "We'll only email you if we haven't seen you in the last {{count}} minutes and you haven't read the thing we're emailing you about."
 
       name:
         title: "Name"
@@ -765,6 +769,7 @@ en:
         user: "Search posts by @{{username}}"
         category: "Search the \"{{category}}\" category"
         topic: "Search this topic"
+        private_messages: "Search private messages"
 
     site_map: "go to another topic list or category"
     go_back: 'go back'
@@ -1683,13 +1688,15 @@ en:
             confirm: "Are your sure you want to rollback the database to the previous working state?"
 
       export_csv:
-        users:
-          title: "Export full user list in CSV format."
-        screened_ips:
-          title: "Export full screened IPs list in CSV format."
         success: "Export initiated, you will be notified shortly with progress."
         failed: "Export failed. Please check the logs."
         button_text: "Export"
+        button_title:
+          user: "Export full user list in CSV format."
+          staff_action: "Export full staff action log in CSV format."
+          screened_email: "Export full screened email list in CSV format."
+          screened_ip: "Export full screened IP list in CSV format."
+          screened_url: "Export full screened URL list in CSV format."
 
       customize:
         title: "Customize"
@@ -1861,7 +1868,7 @@ en:
           title: "Screened IPs"
           description: 'IP addresses that are being watched. Use "Allow" to whitelist IP addresses.'
           delete_confirm: "Are you sure you want to remove the rule for %{ip_address}?"
-          roll_up_confirm: "Are you sure you want to roll up ban entries?"
+          roll_up_confirm: "Are you sure you want to roll up commonly screened IP addresses into subnets?"
           rolled_up_some_subnets: "Successfully rolled up IP ban entries to these subnets: %{subnets}."
           rolled_up_no_subnet: "There was nothing to roll up."
           actions:
@@ -1887,6 +1894,7 @@ en:
         create: 'Add Admin User'
         last_emailed: "Last Emailed"
         not_found: "Sorry, that username doesn't exist in our system."
+        id_not_found: "Sorry, that user id doesn't exist in our system."
         active: "Active"
         show_emails: "Show Emails"
         nav:
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index 9f21f7d951..c43a1e6645 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -247,6 +247,7 @@ es:
       organisation: Organización
       phone: Teléfono
       other_accounts: "Otras cuentas con esta dirección IP:"
+      delete_other_accounts: "Eliminar %{count}"
       username: "usuario"
       trust_level: "NC"
       read_time: "tiempo de lectura"
@@ -259,6 +260,7 @@ es:
       mute: "Silenciar"
       edit: "Editar Preferencias"
       download_archive: "descargar un archivo con mis publicaciones"
+      new_private_message: "Nuevo Mensaje Privado"
       private_message: "Mensaje Privado"
       private_messages: "Mensajes"
       activity_stream: "Actividad"
@@ -347,7 +349,10 @@ es:
         ok: "Te enviaremos un email para confirmar"
         invalid: "Por favor, introduce una dirección de correo válida"
         authenticated: "Tu dirección de correo ha sido autenticada por {{provider}}"
-        frequency: "Sólo te enviaremos e-mails si no te hemos visto recientemente y todavía no has visto lo que te estamos enviando."
+        frequency:
+          zero: "Te enviaremos un email inmediatamente si no has leído aquello que vamos a enviarte."
+          one: "Solo te enviaremos emails si, pasado un minuto, no te hemos visto y no has leído aquello que vamos a enviarte."
+          other: "Solo te enviaremos emails si, pasados {{count}} minutos, no te hemos visto y no has leído aquello que vamos a enviarte."
       name:
         title: "Nombre"
         instructions: "Tu nombre completo (opcional)"
@@ -684,6 +689,7 @@ es:
         user: "Buscar posts por @{{username}}"
         category: "Buscar la categoría \"{{category}}\""
         topic: "Buscar este tema"
+        private_messages: "Buscar en mensajes privados"
     site_map: "ir a otra lista de temas o categoría"
     go_back: 'volver'
     not_logged_in_user: 'página con el resumen de actividad y preferencias'
@@ -1517,7 +1523,9 @@ es:
             title: "Regresar la base de datos al estado funcional anterior"
             confirm: "¿Estás seguro que quieres regresar la base de datos al estado funcional anterior?"
       export_csv:
+        success: "Exportación iniciada, serás notificado dentro de poco sobre el progreso."
         failed: "Exportación fallida, revisa los logs."
+        button_text: "Exportar"
       customize:
         title: "Personalizar"
         long_title: "Personalizaciones del sitio"
@@ -1685,6 +1693,9 @@ es:
           title: "IPs bloqueadas"
           description: 'Direcciones IP que están siendo vigiladas. Usa "Permitir" para añadir direcciones IP preaprobadas.'
           delete_confirm: "Estás seguro que quieres remover el bloqueo para %{ip_address}?"
+          roll_up_confirm: "¿Estás seguro de que quieres agrupar las IPs vistas con frecuencia en subredes?"
+          rolled_up_some_subnets: "Se han agrupado con éxito las entradas de IP baneadas a estos rangos: %{subnets}."
+          rolled_up_no_subnet: "No había nada para agrupar."
           actions:
             block: "Bloquear"
             do_nothing: "Permitir"
@@ -1693,6 +1704,9 @@ es:
             label: "Nueva:"
             ip_address: "Dirección IP"
             add: "Añadir"
+          roll_up:
+            text: "Agrupar"
+            title: "Crea un nuevo rango de entradas para banear si hay al menos 'min_ban_entries_for_roll_up' entradas."
         logster:
           title: "Registros de errores"
       impersonate:
@@ -1703,14 +1717,17 @@ es:
         create: 'Añadir Usuario Administrador'
         last_emailed: "Último email enviado"
         not_found: "Lo sentimos, ese usuario no existe."
+        id_not_found: "Lo sentimos, esa id de usuario no existe en nuestro sistema."
         active: "Activo"
         show_emails: "Mostrar emails"
         nav:
           new: "Nuevo"
           active: "Activo"
           pending: "Pendiente"
+          staff: 'Staff'
           suspended: 'Suspendidos'
           blocked: 'Bloqueados'
+          suspect: 'Sospechoso'
         approved: "Aprobado/s?"
         approved_selected:
           one: "aprobar usuario"
@@ -1727,10 +1744,12 @@ es:
           regular: 'Usuarios con Nivel de confianza 2 (Miembro)'
           leader: 'Usuarios con Nivel de confianza 3 (Habitual)'
           elder: 'Usuarios con Nivel de confianza 4 (Líder)'
+          staff: "Staff"
           admins: 'Administradores'
           moderators: 'Moderadores'
           blocked: 'Usuarios bloqueados'
           suspended: 'Usuarios suspendidos'
+          suspect: 'Usuarios sospechados'
         reject_successful:
           one: "1 usuario rechazado con éxito."
           other: "%{count} usuarios rechazados con éxito."
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index 416e956223..b25953a4e8 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -246,12 +246,21 @@ fi:
       location_not_found: (tuntematon)
       organisation: Yritys
       phone: Puhelin
+      other_accounts: "Muut tilit samasta IP osoitteesta:"
+      delete_other_accounts: "Poista %{count}"
+      username: "käyttäjätunnus"
+      trust_level: "LT"
+      read_time: "lukuaika"
+      topics_entered: "katseltuja ketjuja"
+      post_count: "# viestiä"
+      confirm_delete_other_accounts: "Oletko varma, että haluat poistaa nämä tunnukset?"
     user:
       said: "{{username}}:"
       profile: "Profiili"
       mute: "Vaimenna"
       edit: "Muokkaa asetuksia"
       download_archive: "lataa arkisto viesteistäsi"
+      new_private_message: "Uusi yksityisviesti"
       private_message: "Yksityisviesti"
       private_messages: "Viestit"
       activity_stream: "Toiminta"
@@ -275,6 +284,7 @@ fi:
       admin_tooltip: "Tämä käyttäjä on ylläpitäjä"
       suspended_notice: "Tämä käyttäjätili on hyllytetty {{date}} asti."
       suspended_reason: "Syy:"
+      github_profile: "GitHub"
       mailing_list_mode: "Lähetä sähköposti jokaisesta uudesta viestistä (paitsi vaimennetuista ketjuista ja alueilta)."
       watched_categories: "Tarkkaillut"
       watched_categories_instructions: "Näiden alueiden ketjut asetetaan automaattisesti tarkkailuun. Saat ilmoituksen kaikista uusista viesteistä ja ketjuista ja uusien ja lukemattomien viestien lukumäärä näytetään ketjujen listauksissa. "
@@ -287,6 +297,7 @@ fi:
       deleted_yourself: "Käyttäjätilisi on poistettu."
       delete_yourself_not_allowed: "Et voi poistaa käyttäjätiliäsi juuti nyt. Sinun tulee pyytää ylläpitäjää poistamaan tilisi."
       unread_message_count: "Viestit"
+      admin_delete: "Poista"
       staff_counters:
         flags_given: "hyödyllisiä lippuja"
         flagged_posts: "liputettuja viestejä"
@@ -334,14 +345,32 @@ fi:
         instructions: "Taustakuvan leveys on 590 pikseliä."
       email:
         title: "Sähköposti"
-        frequency: "Lähetämme sähköpostia vain aiheista, joita et ole nähnyt, ja kun emme ole nähneet sinua viime aikoina."
+        instructions: "Ei tule julkiseksi"
+        ok: "Lähetämme sinulle sähköpostin varmistukseksi."
+        invalid: "Ole hyvä ja anna toimiva sähköpostiosoite"
+        authenticated: "{{provider}} on todentanut sähköpostiosoitteesi"
+        frequency:
+          zero: "Lähetämme sähköpostia heti, jos et ole lukenut sähköpostin aihetta."
+          one: "Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen minuutin aikana, etkä ole lukenut sähköpostin aihetta."
+          other: "Lähetämme sähköpostia vain, jos emme ole nähneet sinua edellisen {{count}} minuutin aikana, etkä ole lukenut sähköpostin aihetta."
       name:
         title: "Nimi"
+        instructions: "Koko nimesi (valinnainen)"
+        too_short: "Nimesi on liian lyhyt"
+        ok: "Nimesi vaikuttaa hyvältä"
       username:
         title: "Käyttäjätunnus"
+        instructions: "Uniikki, lyhyt, ei välilyöntejä"
+        short_instructions: "Muut käyttäjät voivat viitata sinuun nimellä @{{username}}"
+        available: "Käyttäjätunnus on vapaana"
+        global_match: "Sähköposti vastaa rekisteröityä käyttäjänimeä"
         global_mismatch: "Nimi on jo käytössä. Kokeile {{suggestion}}?"
         not_available: "Ei saatavilla. Kokeile {{suggestion}}?"
+        too_short: "Käyttäjätunnus on liian lyhyt"
+        too_long: "Käyttäjätunnus on liian pitkä"
         checking: "Tarkistetaan käyttäjätunnusta..."
+        enter_email: 'Käyttäjänimi löydetty; kirjoita sitä vastaava sähköpostiosoite.'
+        prefilled: "Sähköposti vastaa tätä käyttäjänimeä"
       locale:
         title: "Käyttöliittymän kieli"
         instructions: "Käyttöliittymän kieli. Kieli vaihtuu sivun uudelleen lataamisen yhteydessä."
@@ -456,6 +485,8 @@ fi:
         fixed: "Lataa sivu"
     close: "Sulje"
     assets_changed_confirm: "Sivustolla on tehty päivityksiä. Ladataanko uudelleen?"
+    logout: "Sinut kirjattiin ulos."
+    refresh: "Lataa uudelleen"
     read_only_mode:
       enabled: "Ylläpitäjä on käynnistänyt vain luku -tilan. Voit jatkaa sivuston selaamista, mutta osa toiminallisuudesta on poistettu käytöstä."
       login_disabled: "Kirjautuminen ei ole käytössä sivuston ollessa vain luku -tilassa."
@@ -569,6 +600,8 @@ fi:
       reply_here: "Vastaa tänne"
       reply: "Vastaa"
       cancel: "Peruuta"
+      create_topic: "Uusi ketju"
+      create_pm: "Yksityisviesti"
       title: "Tai paina Ctrl+Enter"
       users_placeholder: "Lisää käyttäjä"
       title_placeholder: "Kuvaile lyhyesti mistä tässä ketjussa on kyse?"
@@ -639,7 +672,10 @@ fi:
       title_with_attachments: "Lisää kuva tai tidosto"
       from_my_computer: "Tästä laitteesta"
       from_the_web: "Netistä"
+      remote_tip: "linkki kuvaan"
+      remote_tip_with_attachments: "linkki kuvaan tai tiedostoon ({{authorized_extensions}})"
       local_tip: "Klikkaa tästä ladataksesi kuvan laitteeltasi"
+      local_tip_with_attachments: "klikkaa valitaksesi kuvan tai tiedoston laitteeltasi ({{authorized_extensions}})"
       hint: "(voit myös raahata ne editoriin ladataksesi ne sivustolle)"
       hint_for_supported_browsers: "(voit myös raahata tai liittää kuvia editoriin ladataksesi ne sivustolle)"
       uploading: "Lähettää"
@@ -653,6 +689,7 @@ fi:
         user: "Etsi @{{username}} viestejä"
         category: "Etsi alueelta \"{{category}}\""
         topic: "Etsi tästä ketjusta"
+        private_messages: "Etsi yksityisviesteistä"
     site_map: "siirry toiseen ketjuun tai alueelle"
     go_back: 'mene takaisin'
     not_logged_in_user: 'käyttäjäsivu, jossa on tiivistelmä käyttäjän viimeaikaisesta toiminnasta sekä käyttäjäasetukset'
@@ -706,6 +743,7 @@ fi:
         top: "Huippuketjuja ei ole enempää."
     topic:
       filter_to: "{{post_count}} viestiä ketjussa"
+      create: 'Uusi ketju'
       create_long: 'Luo uusi ketju'
       private_message: 'Luo yksityisviesti'
       list: 'Ketjut'
@@ -863,6 +901,7 @@ fi:
         n_posts:
           one: "1 viesti"
           other: "{{count}} viestiä"
+        cancel: "Poista suodatin"
       split_topic:
         title: "Siirrä uuteen ketjuun"
         action: "siirrä uuteen ketjuun"
@@ -1099,6 +1138,7 @@ fi:
       general: 'Yleistä'
       settings: 'Asetukset'
       delete: 'Poista alue'
+      create: 'Uusi alue'
       save: 'Tallenna alue'
       creation_error: Alueen luonnissa tapahtui virhe.
       save_error: Alueen tallennuksessa tapahtui virhe.
@@ -1149,6 +1189,8 @@ fi:
           title: "Vaimennettu"
           description: "Et saa imoituksia uusista viesteistä näillä alueilla, eivätkä ne näy Lukemattomat-välilehdellä"
     flagging:
+      title: 'Kiitos avustasi yhteisön hyväksi!'
+      private_reminder: 'liput ovat yksityisiä, ne näkyvät <b>ainoastaan</b> henkilökunnalle'
       action: 'Liputa viesti'
       take_action: "Ryhdy toimiin"
       notify_action: 'Yksityisviesti'
@@ -1160,11 +1202,18 @@ fi:
       submit_tooltip: "Toimita lippu"
       take_action_tooltip: "Saavuta liputusraja välittömästi, ennemmin kuin odota muidenkin käyttäjien liputuksia."
       cant: "Pahoittelut, et pysty liputtamaan tätä viestiä tällä hetkellä."
+      formatted_name:
+        off_topic: "Se on asiaankuulumaton"
+        inappropriate: "Se on asiaton"
+        spam: "Se on roskapostia"
+      custom_placeholder_notify_user: "Esitä asiasi ymmärrettäväsi, ole rakentava ja kohtelias."
+      custom_placeholder_notify_moderators: "Kerro ymmärrettävästi ja selvästi, mistä olet huolestunut ja lisää viestiin oleelliset esimerkit ja linkit, jos mahdollista."
       custom_message:
         at_least: "kirjoita vähintään {{n}} merkkiä"
         more: "vielä {{n}}..."
         left: "{{n}} jäljellä"
     flagging_topic:
+      title: "Kiitos avustasi yhteisön hyväksi!"
       action: "Liputa ketju"
       notify_action: "Yksityisviesti"
     topic_map:
@@ -1323,6 +1372,11 @@ fi:
           7_days_ago: "7 päivää sitten"
           30_days_ago: "30 päivää sitten"
           all: "Kaikki"
+          view_table: "taulukko"
+          view_chart: "pylväsdiagrammi"
+          refresh_report: "Päivitä raportti"
+          start_date: "Alkupäivämäärä"
+          end_date: "Loppupäivämäärä"
       commits:
         latest_changes: "Viimeisimmät muutokset: päivitä usein!"
         by: "käyttäjältä"
@@ -1469,11 +1523,15 @@ fi:
             title: "Palauta tietokanta edelliseen toimivaan tilaan"
             confirm: "Oletko varma, että haluat palauttaa tietokannan edelliseen toimivaan tilaan?"
       export_csv:
+        success: "Vienti on käynnissä, saat pian ilmoituksen sen edistymisestä."
         failed: "Vienti epäonnistui. Tarkista loki-tiedostot."
+        button_text: "Vie"
       customize:
         title: "Mukauta"
         long_title: "Sivuston mukautukset"
+        css: "CSS"
         header: "Header"
+        footer: "Footer"
         override_default: "Älä sisällytä oletus-tyylitiedostoa"
         enabled: "Otettu käyttöön?"
         preview: "esikatselu"
@@ -1543,6 +1601,7 @@ fi:
         settings: "Asetukset"
         all: "Kaikki"
         sending_test: "Lähetetään testisähköpostia..."
+        error: "<b>VIRHE</b> - %{server_error}"
         test_error: "Testisähköpostin lähettäminen ei onnistunut. Tarkista uudelleen sähköpostiasetukset, varmista, että palveluntarjoajasi ei estä sähköpostiyhteyksiä ja kokeile sitten uudestaan."
         sent: "Lähetetty"
         skipped: "Jätetty väliin"
@@ -1556,6 +1615,7 @@ fi:
         sent_test: "lähetetty!"
         delivery_method: "Lähetystapa"
         preview_digest: "Esikatsele tiivistelmä"
+        preview_digest_desc: "Esikatsele palstan viikoittaisten sähköpostitiivistelmien sisältöä."
         refresh: "Päivitä"
         format: "Muotoilu"
         html: "html"
@@ -1617,6 +1677,7 @@ fi:
             check_email: "tarkista sähköposti"
             delete_topic: "poista ketju"
             delete_post: "poista viesti"
+            impersonate: "esiinny käyttäjänä"
         screened_emails:
           title: "Seulottavat sähköpostiosoitteet"
           description: "Uuden käyttäjätunnuksen luonnin yhteydessä annettua sähköpostiosoitetta verrataan alla olevaan listaan ja tarvittaessa tunnuksen luonti joko estetään tai suoritetaan muita toimenpiteitä."
@@ -1632,6 +1693,8 @@ fi:
           title: "Seulottavat IP:t"
           description: 'IP-osoitteet joita tarkkaillaan. Valitse "Salli" lisätäksesi osoitteen ohitettavien listalle.'
           delete_confirm: "Oletko varma, että haluat poistaa tämän säännön osoitteelle %{ip_address}?"
+          rolled_up_some_subnets: "Porttikieltojen IP osoitteet käärittiin onnistuneesti näiksi aliverkoiksi: %{subnets}."
+          rolled_up_no_subnet: "Mitään käärittävää ei ollut."
           actions:
             block: "Estä"
             do_nothing: "Salli"
@@ -1640,6 +1703,9 @@ fi:
             label: "Uusi:"
             ip_address: "IP-osoite"
             add: "Lisää"
+          roll_up:
+            text: "Kääri"
+            title: "Luo uusia aliverkkojen laajuisia porttikieltoja, jos kieltoja on asetettu vähintään 'min_ban_entries_for_roll_up' asetuksen määrä."
         logster:
           title: "Virhelokit"
       impersonate:
@@ -1650,13 +1716,17 @@ fi:
         create: 'Lisää ylläpitäjä'
         last_emailed: "Viimeksi lähetetty sähköpostia"
         not_found: "Pahoittelut, tuota käyttäjänimeä ei löydy järjestelmästä."
+        id_not_found: "Pahoittelut, tuota käyttäjätunnusta ei löydy järjestelmästä."
         active: "Aktiivinen"
+        show_emails: "Näytä sähköpostit"
         nav:
           new: "Uudet"
           active: "Aktiiviset"
           pending: "Odottaa"
+          staff: 'Henkilökunta'
           suspended: 'Hyllytetyt'
           blocked: 'Estetyt'
+          suspect: 'Epäilty'
         approved: "Hyväksytty?"
         approved_selected:
           one: "hyväksy käyttäjä"
@@ -1673,10 +1743,12 @@ fi:
           regular: 'Käyttäjät luottamustasolla 2 (Konkari)'
           leader: 'Käyttäjät luottamustasolla 3 (Mestari)'
           elder: 'Käyttäjät luottamustasolla 4 (Johtaja)'
+          staff: "Henkilökunta"
           admins: 'Ylläpitäjät'
           moderators: 'Valvojat'
           blocked: 'Estetyt käyttäjät'
           suspended: 'Hyllytetyt käyttäjät'
+          suspect: 'Epäillyt käyttäjät'
         reject_successful:
           one: "Yksi käyttäjä torjuttiin."
           other: "({{count}}) käyttäjää torjuttiin."
@@ -1958,6 +2030,7 @@ fi:
       actions:
         title: 'Toiminnot'
         star: '<b>f</b> Merkitse ketju tähdellä'
+        pin_unpin_topic: '<b>shift p</b> Kiinnitä ketju/poista kiinnitys'
         share_topic: '<b>shift s</b> Jaa ketju'
         share_post: '<b>s</b> Jaa viesti'
         reply_as_new_topic: '<b>t</b> Aloita uusi yhdistetty ketju'
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 25441ab04e..7e54de4988 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -247,6 +247,7 @@ fr:
       organisation: Société
       phone: Téléphone
       other_accounts: "Autres comptes avec cette adresse IP :"
+      delete_other_accounts: "Supprimer %{count}"
       username: "nom d'utilisateur"
       trust_level: "NC"
       read_time: "temps de lecture"
@@ -259,6 +260,7 @@ fr:
       mute: "Silencieux"
       edit: "Modifier les préférences"
       download_archive: "télécharger une archive de mes messages"
+      new_private_message: "Nouveau Message Privé"
       private_message: "Message privé"
       private_messages: "Messages privés"
       activity_stream: "Activité"
@@ -347,7 +349,10 @@ fr:
         ok: "On vous envoie un mail pour confirmer"
         invalid: "Merci d'entrer une adresse email valide"
         authenticated: "Votre adresse email a été authentifiée par {{provider}}"
-        frequency: "Nous vous envoyons des courriels contenant uniquement des informations que vous n'avez pas déjà vues lors d'une précédente connexion."
+        frequency:
+          zero: "Nous vous enverrons des courriels seulement si vous n'avez pas lu le contenu pour lequel nous envoyons un courriel."
+          one: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans la dernière minute et que vous n'avez pas lu le contenu pour lequel nous envoyons un courriel."
+          other: "Nous vous enverrons des courriels seulement si nous ne vous avons pas vu sur le site dans les dernières {{count}} minutes et que vous n'avez pas lu le contenu pour lequel nous envoyons un courriel."
       name:
         title: "Nom"
         instructions: "Votre nom complet (facultatif)"
@@ -595,7 +600,7 @@ fr:
       reply_here: "Répondre ici"
       reply: "Répondre"
       cancel: "Annuler"
-      create_topic: "Nouvelle discussion"
+      create_topic: "Créer votre sujet"
       create_pm: "Message privé"
       title: "ou appuyez sur Ctrl+Entrée"
       users_placeholder: "Ajouter un utilisateur"
@@ -637,7 +642,7 @@ fr:
       toggler: "Afficher ou cacher le composer"
       admin_options_title: "Paramètres optionnels pour ce sujet"
       auto_close:
-        label: "Heure de fermeture automatique de cette discussion:"
+        label: "Heure de fermeture automatique de ce sujet :"
         error: "Merci d'entrer une valeur valide."
         based_on_last_post: "Ne pas fermer tant que le dernier message dans ce sujet n'est pas plus ancien que çà."
         all:
@@ -684,6 +689,7 @@ fr:
         user: "Chercher dans les messages de @{{username}}"
         category: "Rechercher dans la catégorie \"{{category}}\""
         topic: "Rechercher dans ce sujet"
+        private_messages: "Chercher les messages privés"
     site_map: "aller à une autre liste de sujet ou catégorie"
     go_back: 'retour'
     not_logged_in_user: 'page utilisateur avec un résumé de l''activité en cours et les préférences '
@@ -741,7 +747,7 @@ fr:
         top: "Il n'y a plus de meilleurs sujets."
     topic:
       filter_to: "{{post_count}} messages sur ce sujet"
-      create: 'Nouvelle discussion'
+      create: 'Créer votre sujet'
       create_long: 'Créer un nouveau sujet'
       private_message: 'Commencer un message privé'
       list: 'Sujets'
@@ -1521,7 +1527,9 @@ fr:
             title: "Restaurer (RollBack) la base de données à l'état de travail précédent"
             confirm: "Êtes-vous sûr de vouloir restaurer (rollback) la base de données à l'état de fonctionnement précédent?"
       export_csv:
+        success: "L'export a commencé, vous serez notifié prochainement de sa progression."
         failed: "L'export a échoué. Veuillez consulter les logs."
+        button_text: "Exporter"
       customize:
         title: "Personnaliser"
         long_title: "Personnalisation du site"
@@ -1689,6 +1697,8 @@ fr:
           title: "IP Suivies"
           description: 'Adresses IP qui sont surveillés. Utiliser "Autoriser" pour ajouter les adresses IP à la liste blanche.'
           delete_confirm: "Êtes-vous sûr de vouloir supprimer la règle pour %{ip_address} ?"
+          rolled_up_some_subnets: "Consolidation réussie des adresses IP interdites sous cette forme de plages de sous réseaux: %{subnets}."
+          rolled_up_no_subnet: "Aucune consolidation possible."
           actions:
             block: "Bloquer"
             do_nothing: "Autoriser"
@@ -1697,6 +1707,9 @@ fr:
             label: "Nouveau :"
             ip_address: "Adresse IP"
             add: "Ajouter"
+          roll_up:
+            text: "Consolider"
+            title: "Créer de nouvelles plages de sous réseaux à bannir s'il y a au moins 'min_ban_entries_for_roll_up' entrées."
         logster:
           title: "Logs d'erreurs"
       impersonate:
@@ -1707,14 +1720,17 @@ fr:
         create: 'Ajouter un administateur'
         last_emailed: "Derniers contacts"
         not_found: "Désolé ce pseudo n'existe pas dans notre système."
+        id_not_found: "Désolé cet identifiant d'utilisateur n'existe pas dans notre système."
         active: "Actifs"
         show_emails: "Afficher les adresses de courriels"
         nav:
           new: "Nouveaux"
           active: "Actifs"
           pending: "En attente"
+          staff: 'Membres de l''équipe'
           suspended: 'Suspendus'
           blocked: 'Bloqués'
+          suspect: 'Suspect'
         approved: "Approuvé ?"
         approved_selected:
           one: "Approuver l'utilisateur"
@@ -1731,10 +1747,12 @@ fr:
           regular: 'Utilisateurs de niveau 2 (Membre)'
           leader: 'Utilisateurs de niveau 3 (Régulier)'
           elder: 'Utilisateurs de niveau 4 (Meneur)'
+          staff: "Membres de l'équipe"
           admins: 'Administrateurs'
           moderators: 'Modérateurs'
           blocked: 'Utilisateurs bloqués'
           suspended: 'Utilisateurs suspendus'
+          suspect: 'Utilisateurs suspects'
         reject_successful:
           one: "Utilisateur rejeté avec succès."
           other: "%{count} utilisateurs rejetés avec succès."
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 1a96734de1..d077ec3ff4 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -247,6 +247,7 @@ he:
       organisation: ארגון
       phone: טלפון
       other_accounts: "חשבונות נוספים עם כתובת IP זו:"
+      delete_other_accounts: "מחיקה %{count}"
       username: "שם משתמש"
       trust_level: "TL"
       read_time: "זמן צפייה"
@@ -259,6 +260,7 @@ he:
       mute: "השתק"
       edit: "ערוך העדפות"
       download_archive: "הורד ארכיון של ההודעות שלי"
+      new_private_message: "מסר פרטי חדש"
       private_message: "הודעה פרטית"
       private_messages: "הודעות"
       activity_stream: "פעילות"
@@ -347,7 +349,10 @@ he:
         ok: "נשלח לך דואר אלקטרוני לאישור"
         invalid: "בבקשה הכנס כתובת דואר אלקטרוני חוקית"
         authenticated: "כתובת הדואר האלקטרוני שלך אושרה על ידי {{provider}}"
-        frequency: "נשלח לך דואר אלקטרוני רק אם לא ראינו אותך לאחרונה ועדיין לא ראית את מה שאנחנו רוצים לשלוח"
+        frequency:
+          zero: "נעדכן אותך מיד בדוא\"ל אם לא קראת את הדבר שעליו אנחנו שולחים אליך דוא\"ל."
+          one: "נשלח לך דוא\"ל רק אם לא ראינו אותך בדקה האחרונה ולא קראת את הדבר שעליו אנחנו שולחים לך את הדוא\"ל."
+          other: "נשלח לך דוא\"ל רק אם לא ראינו אותך ב-{{count}} דקןץ האחרונות ואם לא קראת את הדבר שאנחנו שולחים לך עליו דוא\"ל."
       name:
         title: "שם"
         instructions: "שמך המלא (רשות)"
@@ -684,6 +689,7 @@ he:
         user: "חיפוש פרסומים לפי @{{username}}"
         category: "חיפוש בקטגוריה \"{{category}}\""
         topic: "חפשו בנושא זה"
+        private_messages: "חיפוש הודעות פרטיות"
     site_map: "לך לרשימת נושאים או קטגוריה אחרת"
     go_back: 'חזור אחורה'
     not_logged_in_user: 'עמוד משתמש עם סיכום פעילות נוכחית והעדפות'
@@ -1517,7 +1523,9 @@ he:
             title: "הזחר את מסד הנתונים למצב עבודה קודם"
             confirm: "אתה בטוח שברצונך להחזיר את מסד הנתונים למצב עבודה קודם?"
       export_csv:
+        success: "פעולת הייצוא החלה, תוך זמן קצר תעודכנו בהתקדמות."
         failed: "הייצוא נכשל. אנא בדקו ברישומי הלוג."
+        button_text: "ייצוא"
       customize:
         title: "התאם אישית"
         long_title: "התאמה של האתר"
@@ -1685,6 +1693,8 @@ he:
           title: "כתובות IP מסוננות"
           description: 'כתובות IP שנצפות כרגע. השתמש בכפתור "אפשר" בשביל לבטל חסימת כתובת'
           delete_confirm: "אתה בטוח שברצונך להסיר את הכלל עבור הכתובת %{ip_address}?"
+          rolled_up_some_subnets: "ערכי IP אסורים גולגלו בהצלחה לרשתות המשנה הבאות: %{subnets}."
+          rolled_up_no_subnet: "לא היה שום דבר לגלגל"
           actions:
             block: "חסום"
             do_nothing: "אפשר"
@@ -1693,6 +1703,9 @@ he:
             label: "חדש:"
             ip_address: "כתובת IP"
             add: "הוסף"
+          roll_up:
+            text: "גלגול (Roll up)"
+            title: "יוצר ערכי איסור משנה חדשים, אם יש לפחות 'min_ban_entries_for_roll_up' ערכים."
         logster:
           title: "רישום תקלות"
       impersonate:
@@ -1703,14 +1716,17 @@ he:
         create: 'הוסף מנהל'
         last_emailed: "נשלח בדואר אלקטרוני לאחרונה"
         not_found: "סליחה, שם המשתמש הזה אינו קיים במערכת שלנו."
+        id_not_found: "מצטערים, זהות המשתמש/ת אינה קיימת במערכת שלנו."
         active: "פעיל"
         show_emails: "הצגת דוא\"לים"
         nav:
           new: "חדש"
           active: "פעיל"
           pending: "ממתין"
+          staff: 'צוות'
           suspended: 'מושעים'
           blocked: 'חסום'
+          suspect: 'חשוד/ה'
         approved: "מאושר?"
         approved_selected:
           one: "אשר משתמש"
@@ -1727,10 +1743,12 @@ he:
           regular: 'משתמשים בדרגת אמון 2 (חברים)'
           leader: 'משתמשים בדרגת אמון 3 (רגילים)'
           elder: 'משתמשים בדרגת אמון 4 (מובילים)'
+          staff: "צוות"
           admins: 'מנהלים ראשיים'
           moderators: 'מנהלים'
           blocked: 'משתמשים חסומים'
           suspended: 'משתמשים מושעים'
+          suspect: 'משתמשים חשודים'
         reject_successful:
           one: "משתמש אחד נדחה בהצלחה."
           other: "%{count} משתמשים נדחו בהצלחה."
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index b27f036e0c..2a389c74e9 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -247,14 +247,20 @@ it:
       organisation: Organizzazione
       phone: Telefono
       other_accounts: "Altri account con questo indirizzo IP:"
+      delete_other_accounts: "Cancella %{count}"
       username: "nome utente"
       trust_level: "TL"
+      read_time: "durata lettura"
+      topics_entered: "argomenti creati"
+      post_count: "n° messaggi"
+      confirm_delete_other_accounts: "Sicuro di voler cancellare questi account?"
     user:
       said: "{{username}}:"
       profile: "Profilo"
       mute: "Ignora"
       edit: "Modifica opzioni"
       download_archive: "scarica lo storico dei miei messaggi"
+      new_private_message: "Nuovo Messaggio Privato"
       private_message: "Messaggio privato"
       private_messages: "Messaggi"
       activity_stream: "Attività"
@@ -339,17 +345,32 @@ it:
         instructions: "Le immagini di sfondo saranno centrate e per difetto avranno un'ampiezza di 590px."
       email:
         title: "Email"
-        frequency: "Ti invieremo mail solo se è un po' che non ti si vede; le email riguarderanno solo le conversazioni che non hai letto."
+        instructions: "Mai mostrato pubblicamente"
+        ok: "Ti invieremo una email di conferma"
+        invalid: "Inserisci un indirizzo email valido"
+        authenticated: "{{provider}} ha autenticato la tua email"
+        frequency:
+          zero: "Se non hai letto quello per cui ti stiamo scrivendo email ti  manderemo immediatamente una email."
+          one: "Se non ti abbiamo visto nell'ultimo minuto e se non hai letto quello che ti stiamo mandando ti manderemo una email."
+          other: "Se non ti abbiamo visto negli ultimi {{count}} minuti e se non hai letto quello per cui ti stiamo scrivendo, ti manderemo email"
       name:
         title: "Nome"
+        instructions: "Nome completo (facoltativo)"
+        too_short: "Il nome è troppo breve"
+        ok: "Il nome sembra adeguato"
       username:
         title: "Nome utente"
-        available: "Il tuo nome utente è disponibile"
+        instructions: "Deve essere univoco, senza spazi e breve"
+        short_instructions: "Gli utenti possono citarti scrivendo @{{username}}"
+        available: "Il nome utente è disponibile"
+        global_match: "L'email corrisponde al nome utente registrato"
         global_mismatch: "Già registrato. Prova {{suggestion}}?"
         not_available: "Non disponibile. Prova {{suggestion}}?"
-        too_short: "Il tuo nome utente è troppo corto"
-        too_long: "Il tuo nome utente è troppo lungo"
+        too_short: "Il nome utente è troppo corto"
+        too_long: "Il nome utente è troppo lungo"
         checking: "Controllo la disponibilità del nome utente..."
+        enter_email: 'Nome utente trovato; inserisci l''email corrispondente'
+        prefilled: "L'email corrisponde al nome utente registrato"
       locale:
         title: "Lingua dell'interfaccia"
         instructions: "Lingua dell'interfaccia utente. Cambierà quando aggiornerai la pagina."
@@ -464,6 +485,7 @@ it:
         fixed: "Carica Pagina"
     close: "Chiudi"
     assets_changed_confirm: "Questo sito è stato aggiornato. Aggiornare ora alla nuova versione?"
+    logout: "Ti sei disconnesso."
     refresh: "Ricarica"
     read_only_mode:
       enabled: "Un amministratore ha attivato la modalità di sola lettura. Puoi continuare a navigare nel sito ma le interazioni potrebbero non funzionare."
@@ -667,6 +689,7 @@ it:
         user: "Cerca messaggi di @{{username}}"
         category: "Cerca nella categoria \"{{category}}\""
         topic: "Cerca in questo argomento"
+        private_messages: "Cerca nei messaggi privati"
     site_map: "vai a un altro elenco di argomenti o categoria"
     go_back: 'indietro'
     not_logged_in_user: 'pagina utente con riassunto delle attività correnti e delle impostazioni'
@@ -1167,6 +1190,7 @@ it:
           description: "Non ti verrà notificato nulla sui nuovi argomenti di queste categorie, e non compariranno nella tua  tab dei non letti."
     flagging:
       title: 'Grazie per aiutarci a mantenere la nostra comunità civile!'
+      private_reminder: 'le segnalazioni sono private, visibili <b>soltanto</b> allo staff  '
       action: 'Segnala Messaggio'
       take_action: "Procedi"
       notify_action: 'Messaggio privato'
@@ -1182,6 +1206,8 @@ it:
         off_topic: "E' fuori tema"
         inappropriate: "È inappropriato"
         spam: "E' Spam"
+      custom_placeholder_notify_user: "Sii dettagliato, costruttivo e sempre gentile."
+      custom_placeholder_notify_moderators: "Facci sapere esattamente cosa ti preoccupa, fornendo collegamenti pertinenti ed esempi ove possibile."
       custom_message:
         at_least: "inserisci almeno {{n}} caratteri"
         more: "{{n}} alla fine..."
@@ -1326,7 +1352,7 @@ it:
         stale_data: "Non è stato effettuato un controllo recente sugli aggiornamenti. Assicurati che sidekiq sia attivo."
         version_check_pending: "Sembra che tu abbia aggiornato di recente. Ottimo!"
         installed_version: "Installata"
-        latest_version: "Ultimi"
+        latest_version: "Ultima"
         problems_found: "Si sono verificati dei problemi con la tua installazione di Discourse:"
         last_checked: "Ultimo controllo"
         refresh_problems: "Aggiorna"
@@ -1497,7 +1523,9 @@ it:
             title: "Ripristina il database a una versione funzionante precedente"
             confirm: "Sicuro di voler ripristinare una precedente versione funzionante del database?"
       export_csv:
+        success: "L'esportazione è stata avviata, ti verrà a breve notificato il progresso del processo."
         failed: "Esportazione fallita. Controlla i log."
+        button_text: "Esporta"
       customize:
         title: "Personalizza"
         long_title: "Personalizzazioni Sito"
@@ -1573,6 +1601,7 @@ it:
         settings: "Impostazioni"
         all: "Tutto"
         sending_test: "Invio email di prova in corso..."
+        error: "<b>ERRORE</b> - %{server_error}"
         test_error: "C'è stato un problema nell'invio dell'email di test. Controlla nuovamente le impostazioni email, verifica che il tuo host non blocchi le connessioni email e riprova."
         sent: "Inviato"
         skipped: "Omesso"
@@ -1586,6 +1615,7 @@ it:
         sent_test: "inviata!"
         delivery_method: "Metodo di consegna"
         preview_digest: "Anteprima Riassunto"
+        preview_digest_desc: "Vedi in anteprima il contenuto delle email di riassunto inviate agli utenti inattivi."
         refresh: "Aggiorna"
         format: "Formato"
         html: "html"
@@ -1647,6 +1677,7 @@ it:
             check_email: "controlla email"
             delete_topic: "cancella argomento"
             delete_post: "cancella messaggio"
+            impersonate: "impersona"
         screened_emails:
           title: "Email Scansionate"
           description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email  e la registrazione viene bloccata, o eseguita qualche altra azione."
@@ -1662,6 +1693,9 @@ it:
           title: "IP scansionati"
           description: 'Gli indirizzi IP che sono sotto controllo. Usa "Permetti" per inserirli nella lista bianca.'
           delete_confirm: "Davvero vuoi rimuovere la regola per %{ip_address}?"
+          roll_up_confirm: "Sei sicuro di volere raggruppare in sottoreti gli indirizzi IP schermati normalmente?"
+          rolled_up_some_subnets: "L'elenco di indirizzi IP interdetti sono stati sintetizzati con successo: %{subnets}."
+          rolled_up_no_subnet: "Non c'era nulla da sintetizzare."
           actions:
             block: "Blocca"
             do_nothing: "Permetti"
@@ -1670,6 +1704,9 @@ it:
             label: "Nuovo:"
             ip_address: "Indirizzo IP"
             add: "Aggiungi"
+          roll_up:
+            text: "Sintetizza"
+            title: "Crea nuovi elenchi di indirizzi IP interdetti se ci sono almeno 'min_ban_entries_for_roll_up' elementi."
         logster:
           title: "Log Errori"
       impersonate:
@@ -1680,14 +1717,17 @@ it:
         create: 'Aggiungi Utente Amministratore'
         last_emailed: "Ultima email inviata"
         not_found: "Spiacenti, questo nome utente non esiste nel sistema."
+        id_not_found: "Mi dispiace, nel nostro sistema non esiste questo id utente."
         active: "Attivo"
         show_emails: "Mostre Email"
         nav:
           new: "Nuovi"
           active: "Attivi"
           pending: "In attesa"
+          staff: 'Staff'
           suspended: 'Sospesi'
           blocked: 'Bloccati'
+          suspect: 'Sospetti'
         approved: "Approvato?"
         approved_selected:
           one: "approva l'utente"
@@ -1704,10 +1744,12 @@ it:
           regular: 'Utenti al Livello Esperienza 2 (Assiduo)'
           leader: 'Utenti al Livello Esperienza 3 (Esperto)'
           elder: 'Utenti al Livello Esperienza 4 (Veterano)'
+          staff: "Staff"
           admins: 'Utenti Amministratori'
           moderators: 'Moderatori'
           blocked: 'Utenti Bloccati'
           suspended: 'Utenti Sospesi'
+          suspect: 'Utenti Sospetti'
         reject_successful:
           one: "1 utente rifiutato."
           other: "%{count} utenti rifiutati."
@@ -1864,7 +1906,7 @@ it:
         none: "Scegli un tipo di contenuto per iniziare la modifica."
         title: 'Contenuto Testuale'
       site_settings:
-        show_overriden: 'Mostra solo i sovrascritti'
+        show_overriden: 'Mostra solo le opzioni sovrascritte'
         title: 'Impostazioni'
         reset: 'reimposta'
         none: 'nessuno'
@@ -1989,6 +2031,7 @@ it:
       actions:
         title: 'Azioni'
         star: '<b>f</b> Aggiungi l''argomento ai preferiti'
+        pin_unpin_topic: '<b>shift p</b> Appunta/Spunta argomento'
         share_topic: '<b>shift s</b> Condividi argomento'
         share_post: '<b>s</b> Condividi messaggio'
         reply_as_new_topic: '<b>t</b> Rispondi con argomento collegato'
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index 291293ae37..483a74cf6e 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -301,7 +301,6 @@ ja:
         title: "プロフィール背景"
       email:
         title: "メールアドレス"
-        frequency: "メールは、あなたがしばらくの間サイトにログインせず未読トピックが溜まった時のみ送信されます。"
       name:
         title: "名前"
       username:
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index 05aad45ccb..38d2e0a326 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -191,8 +191,8 @@ ko:
       '2': "받은 '좋아요'"
       '3': "북마크"
       '4': "토픽"
-      '5': "게시글"
-      '6': "답글"
+      '5': "작성한 답글"
+      '6': "받은 답글"
       '7': "언급"
       '9': "인용"
       '10': "즐겨찾기"
@@ -224,6 +224,12 @@ ko:
       organisation: 소속
       phone: 전화
       other_accounts: "현재 IP주소의 다른 계정들:"
+      delete_other_accounts: "삭제 %{count}"
+      username: "아이디"
+      trust_level: "TL"
+      read_time: "읽은 시간"
+      post_count: "포스트 개수"
+      confirm_delete_other_accounts: "정말 이 계정들을 삭제하시겠습니까?"
     user:
       said: "{{username}}:"
       profile: "프로필"
@@ -314,14 +320,27 @@ ko:
         instructions: "배경 이미지는 가운데를 기준으로 표시되며 590px이 기본 가로 사이즈 입니다."
       email:
         title: "이메일"
-        frequency: "당신의 활동이 뜸해지거나 저희가 보낸 이메일에 포함된 글들을 읽지 못하셨다면 확인 이메일을 보내드립니다."
+        instructions: "절대로 공개되지 않습니다."
+        ok: "당신에게 확인 메일을 보내겠습니다."
+        invalid: "유효한 이메일 주소를 입력해주세요."
+        authenticated: "당신의 이메일은 {{provider}}에 의해 인증되었습니다."
       name:
         title: "이름"
+        instructions: "이름을 적어주세요. (선택사항)"
+        too_short: "이름이 너무 짧습니다."
+        ok: "사용 가능한 이름입니다."
       username:
         title: "아이디"
+        instructions: "중복될 수 없으며 띄어쓰기 사용이 불가합니다. 짧을 수록 좋아요."
+        short_instructions: "@{{username}}으로 언급이 가능합니다."
+        available: "아이디\x1D로 사용가능합니다."
         global_mismatch: "이미 등록된 아이디입니다. 다시 시도해보세요. {{suggestion}}"
         not_available: "사용할 수 없는 아이디입니다. 다시 시도해보세요. {{suggestion}}"
+        too_short: "아이디가 너무 짧습니다"
+        too_long: "아이디가 너무 깁니다."
         checking: "사용가능한지 확인 중..."
+        enter_email: '아이디를 찾았습니다. 일치하는 이메일을 입력해주세요.'
+        prefilled: "이메일이 등록된 아이디와 연결되어 있습니다."
       locale:
         title: "인터페이스 언어"
         instructions: "UI 언어. 변경 후 새로 고침하면 반영됩니다."
@@ -432,6 +451,8 @@ ko:
         fixed: "페이지 열기"
     close: "닫기"
     assets_changed_confirm: "사이트가 업데이트 되었습니다. 새로고침하시겠습니까?"
+    logout: "로그아웃 되었습니다."
+    refresh: "새로고침"
     read_only_mode:
       enabled: "관리자가 일기 전용모드를 활성화 하였습니다. 컨텐츠를 읽을 수는 있지만 활동할 수는 없습니다."
       login_disabled: "사이트가 읽기 전용모드로 되면서 로그인은 비활성화되었습니다."
@@ -1427,7 +1448,9 @@ ko:
             title: "데이터베이스를 이전 workiong state로 되돌리기"
             confirm: "정말로 이전 작업 상태로 데이터베이스를 롤백하시겠습니까?"
       export_csv:
+        success: "내보내기가 시작되었습니다. 곧 진행사항을 알려드릴께요."
         failed: "내보내기가 실패했습니다. 로그를 확인해주세요"
+        button_text: "내보니기"
       customize:
         title: "사용자 지정"
         long_title: "사이트 사용자 지정"
@@ -1503,6 +1526,7 @@ ko:
         settings: "설정"
         all: "전체"
         sending_test: "테스트 메일 발송중..."
+        error: "<b>에러</b> - %{server_error}"
         test_error: "테스트 메일을 전송하는데 문제가 있습니다. 메일 설정을 다시한번 체크해보고 메일 전송이 정상인지 다시 확인하고 시도해주세요."
         sent: "보낸 메일"
         skipped: "생략"
@@ -1618,6 +1642,7 @@ ko:
           new: "새로운 사용자"
           active: "활성화 사용자"
           pending: "보류된 사용자"
+          staff: '스태프'
           suspended: '접근 금지 사용자'
           blocked: '블락된 사용자'
         approved: "승인?"
@@ -1634,6 +1659,7 @@ ko:
           regular: '사용자 신뢰도 2 (회원)'
           leader: '사용자 신뢰도 3 (정규)'
           elder: '사용자 신뢰도 4 (지도자)'
+          staff: "스태프"
           admins: '관리자 사용자 목록'
           moderators: '운영자'
           blocked: '블락된 사용자들'
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 574aa88ac8..6f8b9b127d 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -84,7 +84,7 @@ nb_NO:
           other: "%{count} dager siden"
     share:
       topic: 'del en lenke til dette emnet'
-      post: 'del en lenke til dette innlegget'
+      post: 'del en lenke til innlegg #%{postNumber}'
       close: 'lukk'
       twitter: 'del denne lenken på Twitter'
       facebook: 'del denne lenken på Facebook'
@@ -247,15 +247,20 @@ nb_NO:
       organisation: Organisasjon
       phone: Telefon
       other_accounts: "Andre kontoer med denne IP-adressen:"
+      delete_other_accounts: "Slett %{count}"
       username: "brukernavn"
+      trust_level: "TN"
       read_time: "lesetid"
+      topics_entered: "emner laget"
       post_count: "# innlegg"
+      confirm_delete_other_accounts: "Er du sikker på at du vil slette disse kontoene?"
     user:
       said: "{{username}}:"
       profile: "Profil"
       mute: "Demp"
       edit: "Rediger innstillinger"
       download_archive: "last ned arkiv av mine innlegg"
+      new_private_message: "Ny Privat Melding"
       private_message: "Privat melding"
       private_messages: "Meldinger"
       activity_stream: "Aktivitet"
@@ -340,8 +345,14 @@ nb_NO:
         instructions: "Bakgrunnsbilder vil bli sentrert og ha en standard bredde på 590px."
       email:
         title: "E-post"
+        instructions: "Aldri vist i offentlighet"
         ok: "Vi sender deg en email for å bekrefte"
-        frequency: "Vi sender deg bare en e-post om vi ikke har sett deg nylig og du ikke allerede har sett det vi varsler deg om."
+        invalid: "Vennligst gi en gyldig email-addresse"
+        authenticated: "Din email har blitt autentisert av {{provider}}"
+        frequency:
+          zero: "Vi sender deg straks en email hvis du ikke har lest tingen vi sendte deg en email om."
+          one: "Vi sender deg bare en email hvis vi ikke har sett deg i det siste minuttet og du har ikke lest tingen vi sender deg en email om."
+          other: "Vi sender deg bare en email om vi ikke har sett deg i de siste {{count}} minuttene og du har ikke lest tingen vi sender deg en email om."
       name:
         title: "Navn"
         instructions: "Ditt fulle navn (valgfritt)"
@@ -352,11 +363,14 @@ nb_NO:
         instructions: "Unikt, kort og uten mellomrom."
         short_instructions: "Folk kan nevne deg som @{{username}}."
         available: "Ditt brukernavn er tilgjengelig."
+        global_match: "Email stemmer med det registrerte brukernavnet"
         global_mismatch: "Allerede registrert. Prøv {{suggestion}}?"
         not_available: "Ikke tilgjengelig. Prøv {{suggestion}}?"
         too_short: "Ditt brukernavn er for kort."
         too_long: "Ditt brukernavn er for langt."
         checking: "Sjekker brukernavnets tilgjengelighet..."
+        enter_email: 'Brukernavn funnet; oppgi samsvarende email'
+        prefilled: "Email stemmer med dette registrerte brukernavnet"
       locale:
         title: "Språk for grensesnitt"
         instructions: "Språk for grensesnitt. Endringen vil tre i kraft når du oppdaterer siden."
@@ -471,6 +485,7 @@ nb_NO:
         fixed: "Last side"
     close: "Lukk"
     assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Oppdater nå for nyeste versjon?"
+    logout: "De ble logget ut."
     refresh: "Refresh"
     read_only_mode:
       enabled: "En administrator har aktivert skrivebeskyttet modus. Du kan fortsette å benytte siden, men enkelte operasjoner vil kanskje ikke fungere."
@@ -660,6 +675,7 @@ nb_NO:
       remote_tip: "link til bilde"
       remote_tip_with_attachments: "link til bilde eller fil ({{authorized_extensions}})"
       local_tip: "klikk for å velge et bilde fra din enhet."
+      local_tip_with_attachments: "klikk for å velge et bilde eller en fil fra din enhet ({{authorized_extensions}})"
       hint: "(du kan også drag & drop inn i editoren for å laste dem opp)"
       hint_for_supported_browsers: "(du kan også drag og drop eller lime inn bilder inn i editoren for å laste dem opp)"
       uploading: "Laster opp bilde"
@@ -673,6 +689,7 @@ nb_NO:
         user: "Søk innleggene av @{{username}}"
         category: "Søk i kategorien \"{{category}}\""
         topic: "Søk i dette emnet"
+        private_messages: "Søk i private meldinger"
     site_map: "gå til en annen emneliste eller kategori"
     go_back: 'gå tilbake'
     not_logged_in_user: 'brukerside med oppsummering av nylig aktivtet og preferanser.'
@@ -1172,6 +1189,8 @@ nb_NO:
           title: "Dempet"
           description: "Du vil ikke bli varslet om noe vedrørende disse emnene i disse kategoriene og de vil ikke vises i din ulest-liste."
     flagging:
+      title: 'Takk for at du hjelper å holde forumet ryddig!'
+      private_reminder: 'flagg er private, <b>bare</b> synlige for staben'
       action: 'Rapporter innlegg'
       take_action: "Ta Handling"
       notify_action: 'Privat melding'
@@ -1188,11 +1207,13 @@ nb_NO:
         inappropriate: "Det er upassende"
         spam: "Det er reklame"
       custom_placeholder_notify_user: "Vær spesifikk, konstruktiv og snill."
+      custom_placeholder_notify_moderators: "La oss vite nøyaktig hva problemet er, og del relevante lenker og eksempler hvorvidt det er mulig."
       custom_message:
         at_least: "skriv minst {{n}} bokstaver"
         more: "{{n}} igjen..."
         left: "{{n}} gjenstående"
     flagging_topic:
+      title: "Takk for at du hjelper med å vedlikeholde god skikk i samfundet vårt!"
       action: "Rapporter emne"
       notify_action: "Privat melding"
     topic_map:
@@ -1243,6 +1264,7 @@ nb_NO:
     history: "Historie"
     changed_by: "av {{author}}"
     raw_email:
+      title: "Rå Email"
       not_available: "Ikke tilgjengelig!"
     categories_list: "Kategoriliste"
     filters:
@@ -1350,6 +1372,9 @@ nb_NO:
           7_days_ago: "7 Dager Siden"
           30_days_ago: "30 Dager Siden"
           all: "Alle"
+          view_table: "tabell"
+          view_chart: "stolpediagram"
+          refresh_report: "Refresh Rapport"
           start_date: "Startdato"
           end_date: "Sluttdato"
       commits:
@@ -1498,7 +1523,9 @@ nb_NO:
             title: "Gjenopprett databasen til en tidligere fungerende tilstand"
             confirm: "Er du sikker på at du vil gjenopprette databasen til en tidligere fungerende tilstand?"
       export_csv:
+        success: "Eksport igangsatt; du vil motta en prosessrapport om kort tid."
         failed: "Eksporteringen feilet. Venligst undersøk loggene."
+        button_text: "Eksporter"
       customize:
         title: "Tilpasse"
         long_title: "Nettstedstilpasninger"
@@ -1574,6 +1601,7 @@ nb_NO:
         settings: "Instillinger"
         all: "Alle"
         sending_test: "Sender e-post for testing"
+        error: "<b>ERROR</b> - %{server_error}"
         test_error: "Det oppsto et problem ved utsendelse av e-post for testing. Sjekk e-postinnstillinger nøye, sjekk at verten ikke blokkerer e-posttilkoblinger, og prøv igjen."
         sent: "Sendt"
         skipped: "Hoppet over"
@@ -1649,6 +1677,7 @@ nb_NO:
             check_email: "sjekk e-post"
             delete_topic: "slett emne"
             delete_post: "slett innlegg"
+            impersonate: "overta brukerkonto"
         screened_emails:
           title: "Kontrollerte Emails"
           description: "Når noen forsøker å lage en ny konto, vil de følgende e-postadressene bli sjekket, og registreringen vil bli blokkert, eller en annen handling vil bli utført."
@@ -1664,6 +1693,8 @@ nb_NO:
           title: "Kontrollerte IPs"
           description: 'IP-adresser som blir fulgt. Benytt "Tillat" for å hvitliste IP-adresser.'
           delete_confirm: "Er du sikker på at du vil fjerne regelen for %{ip_address}?"
+          rolled_up_some_subnets: "Fullførte sammenslåingen av blokkerte IP-addresser til disse subnettene: %{subnets}."
+          rolled_up_no_subnet: "Det var ingenting å slå sammen."
           actions:
             block: "Blokker"
             do_nothing: "Tillat"
@@ -1672,6 +1703,9 @@ nb_NO:
             label: "Ny:"
             ip_address: "IP-adresse"
             add: "Legg til"
+          roll_up:
+            text: "Slå sammen."
+            title: "Lager nye blokkeringsoppføringer for subnett hvis det er minst 'min_ban_entries_for_roll_up' oppføringer."
         logster:
           title: "Feillogg"
       impersonate:
@@ -1682,14 +1716,17 @@ nb_NO:
         create: 'Legg til Admin Bruker'
         last_emailed: "Sist kontaktet"
         not_found: "Beklager, det brukernavner eksisterer ikke i systemet vårt."
+        id_not_found: "Beklager, denne brukerID eksisterer ikke i vårt system."
         active: "Aktiv"
         show_emails: "Vis email"
         nav:
           new: "Ny"
           active: "Aktiv"
           pending: "Ventende"
+          staff: 'Stab'
           suspended: 'Bannlyst'
           blocked: 'Blokkert'
+          suspect: 'Mistenkt'
         approved: "Godkjent?"
         approved_selected:
           one: "godkjenn bruker"
@@ -1706,10 +1743,12 @@ nb_NO:
           regular: 'Brukere med tillitsnivå 2 (Medlem)'
           leader: 'Brukere med tillitsnivå 3 (Aktivt medlem)'
           elder: 'Brukere med tillitsnivå 4 (Leder)'
+          staff: "Stab"
           admins: 'Admins'
           moderators: 'Moderatorer'
           blocked: 'Blokkerte brukere'
           suspended: 'Bannlyste brukere'
+          suspect: 'Mistenkte Brukere'
         reject_successful:
           one: "Avvist 1 bruker."
           other: "Avviste %{count} brukere."
@@ -1924,6 +1963,7 @@ nb_NO:
         enabled: Aktiver merke
         icon: Ikon
         image: Bilde
+        icon_help: "Bruk enten en Font Awesome class eller URL for et bilde"
         query: Spørring for merke (SQL)
         target_posts: Spørring har innlegg som mål
         auto_revoke: Kjør tilbakedragningsspørring daglig
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 9e0ccb0904..6249345e96 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -104,6 +104,7 @@ nl:
     admin_title: "Beheer"
     flags_title: "Meldingen"
     show_more: "meer..."
+    show_help: "help"
     links: "Links"
     links_lowercase: "links"
     faq: "FAQ"
@@ -138,6 +139,10 @@ nl:
       stat:
         all_time: "Sinds het begin"
         last_7_days: "Afgelopen 7 dagen"
+      like_count: "Likes"
+      topic_count: "Topics"
+      post_count: "Berichten"
+      user_count: "Gebruikers"
     bookmarks:
       not_logged_in: "sorry, je moet ingelogd zijn om berichten aan je favorieten toe te kunnen voegen"
       created: "je hebt dit bericht aan je favorieten toegevoegd"
@@ -146,13 +151,13 @@ nl:
       remove: "Verwijder favoriet"
     topic_count_latest:
       one: "{{count}} nieuwe of aangepaste discussie."
-      other: "{{count}} nieuwe of aangepaste discussies."
+      other: "{{count}} nieuwe of bijgewerkte topics."
     topic_count_unread:
       one: "{{count}} ongelezen discussie."
-      other: "{{count}} ongelezen discussies."
+      other: "{{count}} ongelezen topics."
     topic_count_new:
       one: "{{count}} nieuwe discussie. "
-      other: "{{count}} nieuwe discussies."
+      other: "{{count}} nieuwe topics."
     click_to_show: "Klik om te bekijken."
     preview: "voorbeeld"
     cancel: "annuleer"
@@ -241,12 +246,17 @@ nl:
       location_not_found: (onbekend)
       organisation: Organisatie
       phone: Telefoon
+      other_accounts: "Andere accounts met dit IP-adres"
+      username: "gebruikersnaam"
+      topics_entered: "topics ingevoerd"
+      confirm_delete_other_accounts: "Weet je zeker dat je deze accounts wil verwijderen?"
     user:
       said: "{{username}}:"
       profile: "Profiel"
       mute: "Negeer"
       edit: "Wijzig voorkeuren"
       download_archive: "download een archief van mijn berichten"
+      new_private_message: "Nieuw persoonlijk bericht"
       private_message: "Privébericht"
       private_messages: "Berichten"
       activity_stream: "Activiteit"
@@ -256,7 +266,9 @@ nl:
       invited_by: "Uitgenodigd door"
       trust_level: "Trustlevel"
       notifications: "Notificaties"
-      disable_jump_reply: "Niet naar je nieuwe bericht gaan na reageren"
+      dismiss_notifications: "Markeer als gelezen"
+      dismiss_notifications_tooltip: "Markeer alle niet gelezen berichten als gelezen"
+      disable_jump_reply: "Niet na reageren naar je nieuwe bericht gaan"
       dynamic_favicon: "Laat notificatie voor nieuw bericht zien in favicon (experiment)"
       edit_history_public: "Laat andere gebruikers mijn aanpassingen aan dit bericht zien."
       external_links_in_new_tab: "Open alle externe links in een nieuw tabblad"
@@ -268,18 +280,19 @@ nl:
       admin_tooltip: "Deze gebruiker is een admin"
       suspended_notice: "Deze gebruiker is geschorst tot {{date}}."
       suspended_reason: "Reden: "
-      mailing_list_mode: "Ontvang een mail als er een nieuw bericht op het forum geplaatst is (tenzij je het topic of de betreffende categorie op stil zet)"
+      mailing_list_mode: "Ontvang een e-mail bij elk nieuwe bericht (tenzij je het topic of de categorie op stil zet)"
       watched_categories: "In de gaten gehouden"
-      watched_categories_instructions: "Je krijgt bericht van alle nieuwe berichten en topics in deze categoriën, daarnaast zal het aantal ongelezen en nieuwe berichten naast de topiclijst verschijnen."
+      watched_categories_instructions: "Je zal automatisch alle nieuwe topics in deze categorieën bekijken. Je ontvangt een notificatie van alle nieuwe berichten en topics. Daarnaast zal het aantal ongelezen en nieuwe berichten naast de topiclijst verschijnen."
       tracked_categories: "Gevolgd"
-      tracked_categories_instructions: "Het aantal ongelezen en nieuwe berichten in deze categoriën zal naast de topiclijst verschijnen"
+      tracked_categories_instructions: "Je zal automatisch alle nieuwe topics in deze categorieën volgen. Het aantal ongelezen en nieuwe berichten zal naast de topiclijst verschijnen."
       muted_categories: "Genegeerd"
-      muted_categories_instructions: "Je zal geen notificaties krijgen over nieuwe topics en berichten in deze categoriën"
+      muted_categories_instructions: "Je zal geen notificaties krijgen over nieuwe topics en berichten in deze categoriën en ze verschijnen niet op je ongelezen overzicht."
       delete_account: "Verwijder mijn account"
       delete_account_confirm: "Weet je zeker dat je je account definitief wil verwijderen? Dit kan niet meer ongedaan gemaakt worden!"
       deleted_yourself: "Je account is verwijderd."
       delete_yourself_not_allowed: "Je kan je account nu niet verwijderen. Neem contact op met een admin om je account te laten verwijderen."
       unread_message_count: "Berichten"
+      admin_delete: "Verwijder"
       staff_counters:
         flags_given: "behulpzame markeringen"
         flagged_posts: "gemarkeerde berichten"
@@ -313,7 +326,7 @@ nl:
         title: "Wijzig je avatar"
         gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, gebaseerd op"
         refresh_gravatar_title: "Laad je Gravatar opnieuw"
-        letter_based: "Automatisch aangemaakte avatar"
+        letter_based: "Automatisch toegewezen avatar"
         uploaded_avatar: "Eigen afbeelding"
         uploaded_avatar_empty: "Voeg een eigen afbeelding toe"
         upload_title: "Upload je afbeelding"
@@ -323,7 +336,6 @@ nl:
         title: "Profielachtergrond"
       email:
         title: "E-mail"
-        frequency: "We zullen je alleen maar mailen als we je een tijd niet gezien hebben, en als je toevallig hetgeen waarover we je mailen nog niet hebt gezien op onze site."
       name:
         title: "Naam"
       username:
@@ -333,7 +345,7 @@ nl:
         checking: "Kijken of gebruikersnaam beschikbaar is..."
       locale:
         title: "Interfacetaal"
-        instructions: "De taal van de foruminterface. Deze verandert als je de pagina herlaadt"
+        instructions: "De taal waarin het forum wordt getoond. Deze verandert als je de pagina herlaadt."
         default: "(standaard)"
       password_confirmation:
         title: "Nogmaals het wachtwoord"
@@ -677,6 +689,7 @@ nl:
         top: "Er zijn geen top-topics meer."
     topic:
       filter_to: "{{post_count}} berichten in topic"
+      create: 'Nieuw topic'
       create_long: 'Maak een nieuw topic'
       private_message: 'Stuur een privébericht'
       list: 'Topics'
@@ -823,6 +836,7 @@ nl:
         n_posts:
           one: "één bericht"
           other: "{{count}} berichten"
+        cancel: "Verwijder filter"
       split_topic:
         title: "Verplaats naar nieuwe topic"
         action: "verplaats naar nieuwe topic"
@@ -1053,6 +1067,7 @@ nl:
       general: 'Algemeen'
       settings: 'Instellingen'
       delete: 'Verwijder categorie'
+      create: 'Nieuwe categorie'
       save: 'Bewaar categorie'
       creation_error: Er ging bij het maken van de categorie iets mis.
       save_error: Er ging iets mis bij het opslaan van de categorie.
@@ -1109,6 +1124,8 @@ nl:
       hidden_email_address: "(verborgen)"
       submit_tooltip: "Verstuur de privé markering"
       cant: "Sorry, je kan dit bericht momenteel niet melden."
+      formatted_name:
+        spam: "Dit is spam"
       custom_message:
         at_least: "Gebruik ten minste {{n}} tekens"
         more: "Nog {{n}} te gaan..."
@@ -1160,6 +1177,8 @@ nl:
     category_title: "Categorie"
     history: "Geschiedenis"
     changed_by: "door {{author}}"
+    raw_email:
+      not_available: "Niet beschikbaar"
     categories_list: "Categorielijst"
     filters:
       with_topics: "%{filter} topics"
@@ -1265,6 +1284,8 @@ nl:
           7_days_ago: "7 Dagen geleden"
           30_days_ago: "30 Dagen geleden"
           all: "Alle"
+          start_date: "Start datum"
+          end_date: "Eind datum"
       commits:
         latest_changes: "Laatste wijzigingen: update regelmatig!"
         by: "door"
@@ -1410,10 +1431,12 @@ nl:
             confirm: "Weet je zeker dat je de database wil herstellen naar de laatste versie?"
       export_csv:
         failed: "Exporteren is mislukt. Controleer de logbestanden."
+        button_text: "Exporteren"
       customize:
         title: "Aanpassingen"
         long_title: "Aanpassingen aan de site"
         header: "Header"
+        footer: "Voettekst"
         override_default: "Sluit de standaard stylesheet uit"
         enabled: "Ingeschakeld?"
         preview: "voorbeeld"
@@ -1475,6 +1498,8 @@ nl:
           love:
             name: 'liefde'
             description: "De like knop kleur."
+          wiki:
+            name: 'wiki'
       email:
         title: "E-mail"
         settings: "Instellingen"
@@ -1593,6 +1618,7 @@ nl:
           pending: "Te beoordelen"
           suspended: 'Geschorst'
           blocked: 'Geblokt'
+          suspect: 'Verdacht'
         approved: "Goedgekeurd?"
         approved_selected:
           one: "accepteer lid"
@@ -1752,6 +1778,7 @@ nl:
           disabled: "wijzigen niet mogelijk"
         field_types:
           text: 'Tekstveld'
+          confirm: 'Bevestiging'
       site_settings:
         show_overriden: 'Bekijk alleen bewerkte instellingen'
         title: 'Instellingen'
@@ -1807,6 +1834,7 @@ nl:
         listable: Badge op de publieke badges pagina tonen
         enabled: Badge aanzetten
         icon: Icoon
+        image: Afbeelding
         trigger_type:
           none: "Dagelijks bijwerken"
         preview:
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 3c392e5ea6..db573d577b 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -270,6 +270,7 @@ pl_PL:
       organisation: Organizacja
       phone: Numer telefonu
       other_accounts: "Inne konta z tym adresem IP:"
+      delete_other_accounts: "Usuń %{count}"
       username: "nazwa użytkownika"
       trust_level: "TL"
       read_time: "czas czytania:"
@@ -282,6 +283,7 @@ pl_PL:
       mute: "Wycisz"
       edit: "Edytuj ustawienia"
       download_archive: "pobierz archiwum moich wpisów"
+      new_private_message: "Nowa Prywatna Wiadomość"
       private_message: "Prywatna wiadomość"
       private_messages: "Wiadomości"
       activity_stream: "Aktywność"
@@ -370,7 +372,8 @@ pl_PL:
         ok: "Otrzymasz potwierdzenie emailem"
         invalid: "Podaj poprawny adres email"
         authenticated: "Twój email został potwierdzony przez {{provider}}"
-        frequency: "Wyślemy do Ciebie email tylko jeżeli dawno Cię nie widzieliśmy i wyłącznie na temat rzeczy których jeszcze nie widziałeś."
+        frequency:
+          zero: "Otrzymasz email natychmiast jeśli nie widziałeś rzeczy na temat której wysyłamy email."
       name:
         title: "Pełna nazwa"
         instructions: "Twoja pełna nazwa (opcjonalna)"
@@ -711,6 +714,7 @@ pl_PL:
         user: "Szukaj wpisów @{{username}}"
         category: "Szukaj w kategorii \"{{category}}\""
         topic: "Szukaj w tym temacie"
+        private_messages: "Wyszukiwanie w prywatnych wiadomościach"
     site_map: "przejdź do innej listy tematów lub kategorii"
     go_back: 'wróć'
     not_logged_in_user: 'strona użytkownika z podsumowaniem bieżących działań i ustawień'
@@ -1580,7 +1584,9 @@ pl_PL:
             title: "Wycofaj bazę danych do poprzedniego poprawnego stanu"
             confirm: "Czy na pewno chcesz przywrócić bazę danych do poprzedniego poprawnego stanu?"
       export_csv:
+        success: "Rozpoczęto eksport, wkrótce otrzymasz powiadomienie z informacją o postępie."
         failed: "Eksport zakończył się niepowodzeniem. Sprawdź logi."
+        button_text: "Eksportuj"
       customize:
         title: "Wygląd"
         long_title: "Personalizacja strony"
@@ -1748,6 +1754,8 @@ pl_PL:
           title: "Ekranowane adresy IP"
           description: 'Adres IP który teraz oglądasz. Użyj "Zezwól" aby dodać do białej listy adresów IP.'
           delete_confirm: "Czy na pewno chcesz usunąć regułę dla %{ip_address}?"
+          rolled_up_some_subnets: "Pomyślnie zwinięto ban IP dla podsieci: %{subnets}."
+          rolled_up_no_subnet: "Brak pozycji do zwinięcia."
           actions:
             block: "Zablokuj"
             do_nothing: "Zezwól"
@@ -1756,6 +1764,9 @@ pl_PL:
             label: "Nowy:"
             ip_address: "Adres IP"
             add: "Dodaj"
+          roll_up:
+            text: "Zgrupuj"
+            title: "Tworzy nowy ban dla podsieci jeśli jest co najmniej  'min_ban_entries_for_roll_up' pozycji."
         logster:
           title: "Logi błędów"
       impersonate:
@@ -1766,14 +1777,17 @@ pl_PL:
         create: 'Dodaj Administratora'
         last_emailed: "Ostatnio wysłano email"
         not_found: "Przepraszamu, taka nazwa użytkowanika nie istnieje w naszym systemie."
+        id_not_found: "Przepraszamy, ten identyfikator użytkownika nie istnieje w naszym systemie."
         active: "Aktywny"
         show_emails: "Pokaż emaile"
         nav:
           new: "Nowi"
           active: "Aktywni"
           pending: "Oczekujący"
+          staff: 'Zespół'
           suspended: 'Zawieszeni'
           blocked: 'Zablokowani'
+          suspect: 'Podejrzani'
         approved: "Zatwierdzam?"
         approved_selected:
           one: "zatwierdź użytkownika"
@@ -1792,10 +1806,12 @@ pl_PL:
           regular: 'Użytkownicy na 2 poziomie zaufania (Zwyczajni)'
           leader: 'Użytkownicy na 3 poziomie zaufania (Regularni)'
           elder: 'Użytkownicy na 4 poziomie zaufania (Weterani)'
+          staff: "Zespół"
           admins: 'Administratorzy'
           moderators: 'Moderatoratorzy'
           blocked: 'Zablokowane konta'
           suspended: 'Zawieszone konta'
+          suspect: 'Podejrzani użytkownicy'
         reject_successful:
           one: "Odrzucenie 1 użytkownika(-czki) powiodło się."
           few: "Odrzucenie %{count} użytkowników powiodło się."
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 1f73ac3deb..1f7c78f01f 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -90,6 +90,7 @@ pt:
       facebook: 'partilhar este link no Facebook'
       google+: 'partilhar este link no Google+'
       email: 'enviar este link num email'
+    topic_admin_menu: "Ações administrativas dos Tópicos"
     edit: 'editar o título ou a categoria deste tópico'
     not_implemented: "Essa característica ainda não foi implementada, desculpe!"
     no_value: "Não"
@@ -103,6 +104,7 @@ pt:
     admin_title: "Admin"
     flags_title: "Sinalizações"
     show_more: "mostrar mais"
+    show_help: "Ajuda"
     links: "Links"
     links_lowercase: "links"
     faq: "FAQ"
@@ -122,6 +124,7 @@ pt:
     daily: "diário"
     weekly: "semanal"
     every_two_weeks: "a cada duas semanas"
+    max_of_count: "máximo de {{count}}"
     character_count:
       one: "{{count}} caracter"
       other: "{{count}} caracteres"
@@ -136,6 +139,10 @@ pt:
       stat:
         all_time: "Sempre"
         last_7_days: "Últimos 7 Dias"
+      like_count: "Gostos"
+      topic_count: "Tópicos"
+      post_count: "Mensagens"
+      user_count: "Utilizadores"
     bookmarks:
       not_logged_in: "desculpe, necessita de ter a sessão iniciada para marcar posts"
       created: "adicionou este post aos marcadores"
@@ -239,11 +246,21 @@ pt:
       location_not_found: (desconhecido)
       organisation: Organização
       phone: Telefóne
+      other_accounts: "Outras contas com este endereço IP:"
+      delete_other_accounts: "Apagar %{count}"
+      username: "nome de utilizador"
+      trust_level: "TL"
+      read_time: "tempo de leitura"
+      topics_entered: "entrada de tópicos"
+      post_count: "# mensagens"
+      confirm_delete_other_accounts: "Tem a certeza que quer apagar estas contas?"
     user:
+      said: "{{username}}:"
       profile: "Perfil"
       mute: "Silenciar"
       edit: "Editar Preferências"
       download_archive: "fazer o download do arquivo das minhas mensagens"
+      new_private_message: "Nova mensagem privada"
       private_message: "Mensagem Particular"
       private_messages: "Mensagens"
       activity_stream: "Atividade"
@@ -253,6 +270,8 @@ pt:
       invited_by: "Convidado Por"
       trust_level: "Nível de Confiança"
       notifications: "Notificações"
+      dismiss_notifications: "Marcar tudo como lido"
+      dismiss_notifications_tooltip: "Marcar como lidas todas as notificações por ler"
       disable_jump_reply: "Não vá para o seu novo post após ter respondido"
       dynamic_favicon: "Exibir notificações de novas mensagens no favicon (experimental)"
       edit_history_public: "Permitir que outros utilizadores vejam as minhas revisões de publicação"
@@ -265,6 +284,7 @@ pt:
       admin_tooltip: "Este utilizador é um admin"
       suspended_notice: "Utilizador suspenso até {{date}}."
       suspended_reason: "Razão: "
+      github_profile: "Github"
       mailing_list_mode: "Receber um email para cada post novo (salvo quando silenciar o tópico ou categoria)"
       watched_categories: "Observado"
       watched_categories_instructions: "Observará automaticamente todos os novos tópicos nestas categorias. Será notificado de todos os novos posts e tópicos. Além disso, a contagem de posts novos e não lidos irá surgir ao lado da listagem do tópico. "
@@ -277,6 +297,7 @@ pt:
       deleted_yourself: "A sua conta foi eliminada com sucesso."
       delete_yourself_not_allowed: "Neste momento não pode eliminar a sua conta. Contacte um administrador para que este elimine a sua conta por sí."
       unread_message_count: "Mensagens"
+      admin_delete: "Apagar"
       staff_counters:
         flags_given: "denúncias úteis"
         flagged_posts: "posts sinalizados"
@@ -318,16 +339,38 @@ pt:
         image_is_not_a_square: "Alerta: nós cortamos a sua imagem, pois ela não era rectangular."
       change_profile_background:
         title: "Fundo de Perfil"
+        instructions: "A imagem de fundo será centrada e terá por defeito uma largura de 850px."
+      change_card_background:
+        title: "Fundo do cartão de utilizador"
+        instructions: "As imagens de fundo serão centradas e terão por defeito uma largura de 590px."
       email:
         title: "Email"
-        frequency: "Vamos enviar-lhe emails apenas quando não o virmos há algum tempo e não tiver visto as coisas que temos enviado."
+        instructions: "Nunca mostrar ao público"
+        ok: "Enviar-lhe-emos um email para confirmar"
+        invalid: "Por favor introduza um endereço de email válido"
+        authenticated: "O seu email foi autenticado por {{provider}}"
+        frequency:
+          zero: "Enviar-lhe-emos um email imediatamente caso não leia o que lhe estamos a enviar."
+          one: "Apenas lhe enviaremos um email se não o virmos no último minuto e caso não leia o que lhe estamos a enviar."
+          other: "Apenas lhe enviaremos um email se não o virmos nos últimos {{count}} minutos e caso não leia o que lhe estamos a enviar."
       name:
         title: "Nome"
+        instructions: "O seu nome completo (opcional)"
+        too_short: "O seu nome é demasiado curto"
+        ok: "O seu nome parece adequado"
       username:
         title: "Nome de Utilizador"
+        instructions: "Único, sem espaços, curto"
+        short_instructions: "Podem mencioná-lo como @{{username}}"
+        available: "O seu nome de utilizador está disponível"
+        global_match: "O email coincide com o nome de utilizador no registo"
         global_mismatch: "Já está registado. Tente {{suggestion}}?"
         not_available: "Não está disponível. Tente {{suggestion}}?"
+        too_short: "O seu nome de utilizador é demasiado curto"
+        too_long: "O seu nome de utilizador é demasiado longo"
         checking: "A verificar a disponibilidade do nome de utilizador..."
+        enter_email: 'Nome de utilizador encontrado, introduza o email correspondente'
+        prefilled: "Email corresponde com nome de utilizador registado"
       locale:
         title: "Idioma de Interface"
         instructions: "Idioma da interface de utilizador. Será alterado quando atualizar a página."
@@ -340,6 +383,8 @@ pt:
       created: "Juntou-se"
       log_out: "Terminar sessão"
       location: "Localização"
+      card_badge:
+        title: "Medalha de cartão de utilizador"
       website: "Site"
       email_settings: "Email"
       email_digests:
@@ -386,6 +431,8 @@ pt:
         expired: "Este convite expirou."
         rescind: "Remover"
         rescinded: "Convite Removido"
+        reinvite: "Reenviar convite"
+        reinvited: "Convite reenviado"
         time_read: "Tempo de Leitura"
         days_visited: "Dias Visitados"
         account_age_days: "Idade da conta em dias"
@@ -401,6 +448,8 @@ pt:
         too_short: "A sua palavra-chave é muito curta."
         common: "Essa senha é demasiada comum."
         ok: "A sua palavra-chave parece estar OK."
+        instructions: "Pelo menos %{count} caracteres."
+      associated_accounts: "Contas associadas"
       ip_address:
         title: "Último endereço IP"
       registration_ip_address:
@@ -436,6 +485,8 @@ pt:
         fixed: "Carregar Página"
     close: "Fechar"
     assets_changed_confirm: "Este site foi actualizado. Recarregar agora para a versão mais recente?"
+    logout: "Foi-lhe feito 'log out'"
+    refresh: "Atualizar"
     read_only_mode:
       enabled: "Um administrador activou o modo só de leitura. Pode continuar a navegar no site mas as interacções poderão não funcionar. "
       login_disabled: "A função de login está desactivada enquanto o site se encontrar no modo só de leitura."
@@ -474,6 +525,7 @@ pt:
     created: 'Criado'
     created_lowercase: 'criado'
     trust_level: 'Nível de confiança'
+    search_hint: 'nome de utilizador, email ou endereço de IP'
     create_account:
       title: "Criar Conta Nova"
       failed: "Houve um erro, talvez este email já esteja registado, tente usar o link Esqueci-me da Palavra-chave."
@@ -535,6 +587,7 @@ pt:
       drafts_offline: "rascunhos offline"
       min_length:
         need_more_for_title: "{{n}} no título"
+        need_more_for_reply: "{{n}} para avançar"
       error:
         title_missing: "O Título é obrigatório"
         title_too_short: "Título tem que ter no mínimo {{min}} caracteres."
@@ -547,6 +600,8 @@ pt:
       reply_here: "Responda Aqui"
       reply: "Responder"
       cancel: "Cancelar"
+      create_topic: "Novo Tópico"
+      create_pm: "Mensagem privada"
       title: "Ou prima Ctrl+Enter"
       users_placeholder: "Adicionar um utilizador"
       title_placeholder: "Numa breve frase, de que se trata esta discussão?"
@@ -556,6 +611,7 @@ pt:
       view_new_post: "Ver as suas novas mensagens."
       saving: "A Gravar..."
       saved: "Gravado!"
+      saved_draft: "Mensagem rascunho em progresso. Selecione para continuar."
       uploading: "A enviar..."
       show_preview: 'mostrar pré-visualização &raquo;'
       hide_preview: '&laquo; esconder pré-visualização'
@@ -585,6 +641,15 @@ pt:
       help: "Ajuda da edição Markdown"
       toggler: "esconder ou exibir o painel de composição"
       admin_options_title: "Configurações opcionais de staff para este tópico"
+      auto_close:
+        label: "Tempo de fecho automático do tópico:"
+        error: "Por favor introduza um valor válido."
+        based_on_last_post: "Não feche até que a última mensagem do tópico tenha pelo menos este tempo."
+        all:
+          examples: 'Insira o número de horas (24), tempo absoluto (17:30) ou um selo temporal (2013-11-22 14:00).'
+        limited:
+          units: "(# de horas)"
+          examples: 'Introduza o número de horas (24).'
     notifications:
       title: "notificações de menção de @nome, respostas às suas mensagens e tópicos, mensagens privadas, etc"
       none: "Não há notifcações neste momento."
@@ -607,7 +672,10 @@ pt:
       title_with_attachments: "Adicionar uma imagem ou um ficheiro"
       from_my_computer: "Do meu dispositivo "
       from_the_web: "Da internet"
+      remote_tip: "hiperligação para imagem"
+      remote_tip_with_attachments: "hiperligação para imagem ou ficheiro ({{authorized_extensions}})"
       local_tip: "Carregue para selecionar um ficheiro do seu dispositivo"
+      local_tip_with_attachments: "pressione para selecionar uma imagem ou ficheiro do seu dispositivo ({{authorized_extensions}})"
       hint: "(poderá também arrastar o ficheiro para o editor para fazer o upload)"
       hint_for_supported_browsers: "(também pode arrastar ou colar imagens no editor de forma a carregá-las)"
       uploading: "A enviar"
@@ -621,6 +689,7 @@ pt:
         user: "Procurar posts por @{{username}}"
         category: "Procurar na categoria \"{{category}}\""
         topic: "Pesquisar este tópico"
+        private_messages: "Procurar mensagens privadas"
     site_map: "ir para outra lista de tópicos ou categorias"
     go_back: 'voltar atrás'
     not_logged_in_user: 'página de utilizador com resumo da actividade actual e preferências  '
@@ -643,6 +712,7 @@ pt:
         actions: "Acções de Selecção"
         change_category: "Mudar Categoria"
         close_topics: "Fechar Tópicos"
+        archive_topics: "Arquivar tópicos"
         notification_level: "Mudar Nível de Notificação"
         selected:
           one: "Seleccionou  <b>1</b> tópico."
@@ -671,6 +741,7 @@ pt:
         top: "Não existem mais tópicos populares."
     topic:
       filter_to: "{{post_count}} posts no tópico"
+      create: 'Novo tópico'
       create_long: 'Criar um novo Tópico'
       private_message: 'Começar uma nova conversa privada'
       list: 'Tópicos'
@@ -720,6 +791,7 @@ pt:
       jump_reply_down: avançar para resposta mais antiga
       deleted: "Este tópico foi apagado"
       auto_close_notice: "Este tópico vai ser automaticamente fechado em %{timeLeft}."
+      auto_close_notice_based_on_last_post: "Este tópico será fechado %{duration} depois da última resposta"
       auto_close_title: 'Configurações para Fechar Automaticamente'
       auto_close_save: "Guardar"
       auto_close_remove: "Não Fechar Automaticamente Este Tópico"
@@ -743,6 +815,8 @@ pt:
           '2_4': 'Receberá notificações porque inseriu uma resposta neste tópico.'
           '2_2': 'Receberá notificações porque está a monitorizar este tópico.'
           '2': 'Receberá notificações porque <a href="/users/{{username}}/preferences">leu este tópico</a>.'
+          '1_2': 'Será notificado se alguém mencionar o seu @nome ou responder às suas mensagens'
+          '1': 'Será notificado se alguém mencionar o seu @nome ou responder às suas mensagens'
           '0_7': 'Está a ignorar todas as notificações nesta categoria.'
           '0_2': 'Está a ignorar todas as notificações para este tópico.'
           '0': 'Está a ignorar todas as notificações para este tópico.'
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index 44d1387434..6b98b41b08 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -247,6 +247,7 @@ pt_BR:
       organisation: Organização
       phone: Telefone
       other_accounts: "Outras contas com esse endereço de IP:"
+      delete_other_accounts: "Excluir %{count}"
       username: "nome de usuário"
       trust_level: "TL"
       read_time: "tempo de leitura"
@@ -259,6 +260,7 @@ pt_BR:
       mute: "Silenciar"
       edit: "Editar Preferências"
       download_archive: "baixar o arquivo das minhas mensagens"
+      new_private_message: "Nova mensagem privada"
       private_message: "Mensagem Privada"
       private_messages: "Mensagens"
       activity_stream: "Atividade"
@@ -347,7 +349,10 @@ pt_BR:
         ok: "Nós vamos pedir confirmação por email"
         invalid: "Insira um endereço de email"
         authenticated: "Seu email foi autenticado por {{provider}}"
-        frequency: "Vamos lhe enviar emails apenas quando não o virmos há algum tempo e você não tiver visto as coisas que temos enviado."
+        frequency:
+          zero: "Não se preocupe, caso você não leia uma mensagem, enviaremos um email para você."
+          one: "Vamos lhe enviar emails apenas quando não o virmos há algum tempo e você não tiver visto as coisas que temos enviado"
+          other: "Vamos lhe enviar emails apenas se não vimos você nos últimos {{count}} você não tiver visto as coisas que temos enviado"
       name:
         title: "Nome"
         instructions: "Seu nome completo (opcional)"
@@ -684,6 +689,7 @@ pt_BR:
         user: "Procurar respostas de @{{username}}"
         category: "Procurar a categoria \"{{category}}\""
         topic: "Procurar nesse tópico"
+        private_messages: "Procurar mensagens privadas"
     site_map: "ir para outra lista de tópicos ou categorias"
     go_back: 'voltar'
     not_logged_in_user: 'página do usuário com resumo de atividades correntes e preferencias'
@@ -1517,7 +1523,9 @@ pt_BR:
             title: "Reverter o banco de dados para seu estado anterior"
             confirm: "Tem certeza de que quer reverter o banco de dados para o estado anterior?"
       export_csv:
+        success: "Exportação iniciada, você será notificado brevemente com o progresso."
         failed: "Falha na exportação. Por favor verifique os logs."
+        button_text: "Exportar"
       customize:
         title: "Personalizar"
         long_title: "Personalizações do Site"
@@ -1703,14 +1711,17 @@ pt_BR:
         create: 'Adicionar Usuário Admin'
         last_emailed: "Último email enviado"
         not_found: "Desculpe, esse nome de usuário não existe no nosso sistema."
+        id_not_found: "Desculpe, esse nome de usuário não existe no nosso sistema."
         active: "Ativo"
         show_emails: "Mostrar Emails"
         nav:
           new: "Novos"
           active: "Ativos"
           pending: "Pendentes"
+          staff: 'Equipe'
           suspended: 'Suspenso'
           blocked: 'Bloqueados'
+          suspect: 'Suspeito'
         approved: "Aprovado?"
         approved_selected:
           one: "aprovar usuário"
@@ -1727,10 +1738,12 @@ pt_BR:
           regular: 'Usuário no Nível de Confiança 2 (Regular)'
           leader: 'Usuário no Nível de Confiança 3 (Líder)'
           elder: 'Usuário no Nível de Confiança 4 (Ancião)'
+          staff: "Equipe de apoio"
           admins: 'Usuários Administradores'
           moderators: 'Moderadores'
           blocked: 'Usuários Boqueados'
           suspended: 'Usuários Suspensos'
+          suspect: 'Usuários suspeitos'
         reject_successful:
           one: "1 usuário foi rejeitado com sucesso."
           other: "%{count} usuários foram rejeitados com sucesso."
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index 46a56b8692..87483e9bd5 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -270,6 +270,7 @@ ru:
       organisation: Организация
       phone: Телефон
       other_accounts: "Другие учетные записи с этим IP адресом"
+      delete_other_accounts: "Удалить %{count}"
       username: "псевдоним"
       trust_level: "Уровень"
       read_time: "время чтения"
@@ -282,6 +283,7 @@ ru:
       mute: "Отключить"
       edit: "Настройки"
       download_archive: "скачать архив ваших сообщений"
+      new_private_message: "Новое Личное Сообщение"
       private_message: "Личное сообщение"
       private_messages: "Личные сообщения"
       activity_stream: "Активность"
@@ -370,7 +372,6 @@ ru:
         ok: "Мы вышлем вам письмо для подтверждения"
         invalid: "Введите действующий адрес электронной почты"
         authenticated: "Ваш адрес электронной почты подтвержден {{provider}}"
-        frequency: "В случае вашего отсутствия на форуме вы будете получать уведомления, но только о новых сообщениях."
       name:
         title: "Имя"
         instructions: "Ваше полное имя (опционально)"
@@ -711,6 +712,7 @@ ru:
         user: "Искать сообщения от @{{username}}"
         category: "Искать в разделе \"{{category}}\""
         topic: "Искать в этой теме"
+        private_messages: "Поиск в личных сообщениях"
     site_map: "перейти к другому списку тем или другому разделу"
     go_back: 'вернуться'
     not_logged_in_user: 'страница пользователя с историей его последней активности и настроек'
@@ -1584,7 +1586,9 @@ ru:
             title: "Откатить базу данных к предыдущему рабочему состоянию"
             confirm: "Вы уверены, что хотите откатить базу данных к предыдущему рабочему состоянию?"
       export_csv:
+        success: "Экспорт начат, вы будете уведомлены о прогрессе."
         failed: "Экспорт не удался. Пожалуйста, проверьте логи."
+        button_text: "Экспорт"
       customize:
         title: "Оформление"
         long_title: "Стили и заголовки"
@@ -1752,6 +1756,9 @@ ru:
           title: "IP адреса"
           description: 'IP адреса за которыми вести наблюдение. Используйте "Разрешить" для добавления IP адреса в белый список.'
           delete_confirm: "Вы уверены, что хотите удалить правило для %{ip_address}?"
+          roll_up_confirm: "Вы уверены, что хотите сконвертировать часто встречающиеся IP  в подсети?"
+          rolled_up_some_subnets: "Заблокированные IP сконвертированы в подсети: %{subnets}."
+          rolled_up_no_subnet: "Нечего конвертировать"
           actions:
             block: "Заблокировать"
             do_nothing: "Разрешить"
@@ -1760,6 +1767,8 @@ ru:
             label: "Новые:"
             ip_address: "IP адрес"
             add: "Добавить"
+          roll_up:
+            text: "Конвертация"
         logster:
           title: "Журнаш ошибок"
       impersonate:
@@ -1770,14 +1779,17 @@ ru:
         create: 'Добавить администратора'
         last_emailed: "Последнее письмо"
         not_found: "К сожалению, такой псевдоним не зарегистрирован."
+        id_not_found: "К сожалению, этот пользователь не зарегистрирован."
         active: "Активные"
         show_emails: "Показать адреса e-mail"
         nav:
           new: "Новые"
           active: "Активные"
           pending: "Ожидает одобрения"
+          staff: 'Персонал'
           suspended: 'Замороженные'
           blocked: 'Заблокированные'
+          suspect: 'Подозрительные'
         approved: "Подтвердить?"
         approved_selected:
           one: "подтвердить пользователя"
@@ -1796,10 +1808,12 @@ ru:
           regular: 'Пользователи с уровнем доверия 2 (активные)'
           leader: 'Пользователи с уровнем доверия 3 (лидеры сообщества)'
           elder: 'Пользователи с уровнем доверия 4 (старейшины)'
+          staff: "Персонал"
           admins: 'Администраторы'
           moderators: 'Модераторы'
           blocked: 'Заблокированные пользователи'
           suspended: 'Замороженные пользователи'
+          suspect: 'Подозрительные пользователи'
         reject_successful:
           one: "Успешно отклонен 1 пользователь."
           few: "Успешно отклонены %{count} пользователя."
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index 1f6e47af8f..f3dba01673 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -336,7 +336,6 @@ sq:
         instructions: "Sfondi profilit do të vendoset në qendër dhe do të ketë një gjerësi prej 590px."
       email:
         title: "Email"
-        frequency: "We'll only email you if we haven't seen you recently and you haven't already seen the thing we're emailing you about."
       name:
         title: "Emri"
       username:
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index f7fe315273..ed29635598 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -90,6 +90,7 @@ sv:
       facebook: 'dela denna länk på Facebook'
       google+: 'dela denna länk på Google+'
       email: 'skicka denna länk i ett email'
+    topic_admin_menu: "ämne admin åtgärder"
     edit: 'redigera titel och kategori för denna tråd'
     not_implemented: "Denna funktion har inte implementerats än, vi beklagar!"
     no_value: "Nej"
@@ -123,6 +124,7 @@ sv:
     daily: "dagligen"
     weekly: "veckovis"
     every_two_weeks: "varannan vecka"
+    max_of_count: "max av {{count}}"
     character_count:
       one: "{{count}} tecken"
       other: "{{count}} tecken"
@@ -245,11 +247,20 @@ sv:
       organisation: Organisation
       phone: Telefon
       other_accounts: "Andra konton med samma IP-adress"
+      delete_other_accounts: "Ta bort %{count}"
+      username: "användarnamn"
+      trust_level: "TL"
+      read_time: "lästid"
+      topics_entered: "ämnen skapade"
+      post_count: "# inlägg"
+      confirm_delete_other_accounts: "Är du säker på att du vill ta bort dessa här konton?"
     user:
+      said: "{{användarnamn}}:"
       profile: "Profil"
       mute: "Dämpa"
       edit: "Redigera inställningar"
       download_archive: "ladda ned ett arkiv med mina inlägg"
+      new_private_message: "Nytt Privat Meddelande"
       private_message: "Privat meddelande"
       private_messages: "Meddelanden"
       activity_stream: "Aktivitet"
@@ -334,14 +345,32 @@ sv:
         instructions: "Bakgrundsbilder kommer att vara centrerade och ha en standardbredd på 590 px."
       email:
         title: "E-post"
-        frequency: "Vi kommer bara maila dig om vi inte har sett dig nyligen och du inte redan sett det vi mailar dig om."
+        instructions: "Visas aldrig publikt"
+        ok: "Vi skickar e-post till dig för bekräftelse."
+        invalid: "Vänligen ange en giltig e-postadress."
+        authenticated: "Din e-postadress har blivit verifierad av {{provider}}"
+        frequency:
+          zero: "Vi kommer att skicka e-post till dig omedelbart om du inte har läst det som vi skickar e-post till dig om."
+          one: "Vi kommer bara att skicka e-post till dig om vi inte sett dig den senaste minuten och du inte har läst det som vi skickar e-post till dig om."
+          other: "Vi kommer bara att skicka e-post till dig om vi inte sett dig de senaste  {{count}} minuterna och du inte har läst det som vi skickar e-post till dig om."
       name:
         title: "Namn"
+        instructions: "Ditt fullständiga namn (valfritt)"
+        too_short: "Ditt namn är för kort"
+        ok: "Ditt namn ser bra ut"
       username:
         title: "Användarnamn"
+        instructions: "Unikt, inga mellanrum, kort"
+        short_instructions: "Folk kan nämna dig som @{{username}}"
+        available: "Ditt användarnamn är tillgängligt"
+        global_match: "E-postadressen matchar det registrerade användarnamnet"
         global_mismatch: "Redan registrerat. Prova {{suggestion}}?"
         not_available: "Inte tillgängligt. Prova {{suggestion}}?"
+        too_short: "Ditt användarnamn är för kort"
+        too_long: "Ditt användarnamn är för långt"
         checking: "Kollar användarnamnets tillgänglighet..."
+        enter_email: 'Annvändarnamn hittat; ange matchande e-postadress'
+        prefilled: "E-postadressen matchar det här registrerade användarnamnet"
       locale:
         title: "gränssnittsspråk"
         instructions: "Språket som används av forumsgränssnittet. Det kommer att ändras när du laddar om sidan."
@@ -354,6 +383,8 @@ sv:
       created: "Gick med"
       log_out: "Logga ut"
       location: "Plats"
+      card_badge:
+        title: "Visitkortsbricka"
       website: "Webbplats"
       email_settings: "E-post"
       email_digests:
@@ -454,6 +485,8 @@ sv:
         fixed: "Ladda sida"
     close: "Stäng"
     assets_changed_confirm: "Den här siten uppdaterades precis. Ladda om för att se den senaste versionen?"
+    logout: "Du loggades ut."
+    refresh: "Uppdatera"
     read_only_mode:
       enabled: "En administratör har aktiverat läsläge. Du kan fortsätta kolla runt på sidan men kanske inte interagera med den."
       login_disabled: "Det går inte att logga in medan siten är i skrivskyddat läge."
@@ -656,6 +689,7 @@ sv:
         user: "Sök inlägg av @{{username}}"
         category: "Sök i kategorin \"{{category}}\""
         topic: "Sök i denna diskussion"
+        private_messages: "Sök privata meddelanden"
     site_map: "gå till en annan trådlista eller kategori"
     go_back: 'gå tillbaka'
     not_logged_in_user: 'användarsida med sammanställning av aktuell aktivitet och inställningar'
@@ -968,6 +1002,7 @@ sv:
             other: "Vill du radera de {{count}} direkta svaren på det här inlägget också?"
           yes_value: "Ja, radera även svaren"
           no_value: "Nej, bara det här inlägget"
+        admin: "inlägg admin åtgärder"
         wiki: "Skapa wiki"
         unwiki: "Ta bort wiki"
         convert_to_moderator: "Lägg till "
@@ -1331,6 +1366,9 @@ sv:
           7_days_ago: "7 dagar sedan"
           30_days_ago: "30 dagar sedan"
           all: "Alla"
+          view_table: "tabell"
+          start_date: "Startdatum"
+          end_date: "Slutdatum"
       commits:
         latest_changes: "Senaste ändringarna: snälla uppdatera ofta!"
         by: "av"
@@ -1338,13 +1376,41 @@ sv:
         title: "Flaggningar"
         old: "Gamla"
         active: "Aktiva"
+        agree: "Godkänn"
+        agree_title: "Bekräfta att den här flaggan är giltig och korrekt"
+        agree_flag_modal_title: "Bekräfta och..."
+        agree_flag_hide_post: "Godkänn (dölj inlägg + skicka PM)"
+        agree_flag_hide_post_title: "Dölj detta inlägg och skicka automatiskt ett privat meddelande som ber användaren att redigera det"
+        agree_flag_restore_post: "Godkänn (återställ inlägg)"
+        agree_flag_restore_post_title: "Återställ detta inlägg"
+        agree_flag: "Godkänn flaggning"
+        agree_flag_title: "Godkänn flaggning och behåll inlägget oförändrat"
+        defer_flag_title: "Ta bort den här flaggan; den kräver ingen åtgärd för tillfället."
+        delete: "Ta bort"
+        delete_title: "Ta bort inlägget som den här flaggan refererar till."
+        delete_post_defer_flag_title: "Ta bort inlägg; om det är det första inlägget, ta bort ämnet"
+        delete_post_agree_flag: "Ta bort inlägg och godkänn flaggning."
+        delete_post_agree_flag_title: "Ta bort inlägg; om det är det första inlägget, ta bort ämnet"
+        delete_flag_modal_title: "Ta bort och..."
+        delete_spammer: "Radera spammare"
+        delete_spammer_title: "Radera användaren och alla hens inlägg och trådar."
+        disagree_flag_unhide_post: "Håll inte med (avgöm inlägg)"
+        disagree_flag_unhide_post_title: "Ta bort alla flaggor från detta inlägg och gör det synligt igen"
+        disagree_flag: "Håll inte med"
+        disagree_flag_title: "Neka den här flaggningen som ogiltig eller inkorrekt"
         clear_topic_flags: "Klar"
         clear_topic_flags_title: "Tråden har undersökts och eventuella problem har lösts. Klicka på klar för att ta bort flaggorna."
+        more: "(mer svar...)"
         flagged_by: "Flaggad av"
+        resolved_by: "Löst av"
         system: "System"
         error: "Någonting gick snett"
+        reply_message: "Svara"
         no_results: "Det finns inga flaggor."
         topic_flagged: "Denna <strong>tråd</strong> har blivit flaggad."
+        visit_topic: "Besök ämnet för att vidta åtgärder"
+        was_edited: "Inlägget redigerades efter den första flaggningen"
+        previous_flags_count: "Det här inlägget har redan flaggats {{count}} gånger."
         summary:
           action_type_3:
             one: "off-topic"
@@ -1367,9 +1433,11 @@ sv:
         title: "Groups"
         edit: "Edit Groups"
         refresh: "uppdatera"
+        new: "Ny"
         selector_placeholder: "add users"
         name_placeholder: "Group name, no spaces, same as username rule"
         about: "Edit your group membership and names here"
+        group_members: "Gruppmedlemmar"
         delete: "Radera"
         delete_confirm: "Delete this group?"
         delete_failed: "Unable to delete group. If this is an automatic group, it cannot be destroyed."
@@ -1386,24 +1454,42 @@ sv:
         confirm_revoke: "Är du säker på att du vill återkalla den nyckeln?"
         info_html: "Your API key will allow you to create and update topics using JSON calls."
         all_users: "Alla användare"
+        note_html: "Håll denna nyckel <strong>hemlig</strong>, alla användare som har den kan skapa godtyckliga inlägg som alla användare."
       backups:
         title: "säkerhetskopior"
         menu:
           backups: "säkerhetskopior"
           logs: "loggar"
         none: "Ingen säkerhetskopia är tillgänglig."
+        read_only:
+          enable:
+            title: "Aktivera skrivskyddat läget"
+            text: "Aktivera skrivskyddat läge"
+            confirm: "Är du säker på att du vill aktivera skrivskyddat läge?"
+          disable:
+            title: "Avaktivera skrivskyddat läget"
+            text: "Avaktivera skrivskyddat läge"
+        logs:
+          none: "Inga loggar ännu..."
         columns:
           filename: "filnamn"
           size: "storlek"
         upload:
+          text: "Ladda upp"
+          uploading: "Laddar upp..."
           success: "'{{filename}}' har laddats upp."
           error: "Ett fel har uppstått vid uppladdning av '{{filename}}': {{message}}"
         operations:
+          is_running: "En operation körs just nu..."
+          failed: " {{operation}} misslyckades. Kontrollera loggarna."
           cancel:
             text: "avbryt"
+            title: "Avbryt den pågående operationen"
+            confirm: "Är du säker på att du vill avbryta den pågående operationen?"
           backup:
             text: "säkerhetskopia"
             title: "skapa en säkerhetskopia"
+            confirm: "Vill du skapa en ny säkerhetskopiering?"
             without_uploads: "Ja (inkluder inte filer)"
           download:
             text: "ladda ned"
@@ -1422,7 +1508,9 @@ sv:
             title: "Gör rollback på databasen till ett tidigare fungerande tillstånd."
             confirm: "Är du säker på att du vill göra rollback på databasen till det tidigare fungerande tillståndet?"
       export_csv:
+        success: "Exporteringen har påbörjats, du kommer snart att få en notifiering över hur det går."
         failed: "Exporteringen misslyckades. Kontrollera loggarna."
+        button_text: "Exportera"
       customize:
         title: "Anpassa"
         long_title: "Sidanpassningar"
@@ -1434,11 +1522,15 @@ sv:
         preview: "förhandsgranska"
         undo_preview: "ta bort förhandsgranskning"
         rescue_preview: "standard stil"
+        explain_preview: "Se sidan med skräddarsydd stilmall"
+        explain_undo_preview: "Gå tillbaka till den nuvarande aktiva stilmallen"
+        explain_rescue_preview: "Se sidan med standard stilmallen"
         save: "Spara"
         new: "Ny"
         new_style: "Ny Stil"
         delete: "Radera"
         delete_confirm: "Radera denna anpassning?"
+        about: "Modifiera CSS stilmallar och HTML sidhuvuden på sidan. Lägg till en anpassning för att börja."
         color: "Färg"
         opacity: "Opacitet"
         copy: "Kopiera"
@@ -1458,14 +1550,28 @@ sv:
           revert_title: "Återställ den här färgen till Discourse standard färgschema."
           primary:
             name: 'primär'
+            description: 'Det mesta av texten, ikoner och ramar.'
           secondary:
             name: 'sekundär'
             description: 'Den huvudsakliga bakgrundsfärgen, och textfärgen på vissa knappar.'
+          tertiary:
+            description: 'Länkar, några knappar, notiser, och accentfärger.'
           quaternary:
             description: "Navigationslänkar."
+          header_background:
+            name: "Bakgrund för sidhuvud"
+            description: "Bakgrundsfärg för sidans sidhuvud. "
+          header_primary:
+            name: "sidhuvud primär"
+            description: "Text och ikoner i sidans sidhuvud."
+          highlight:
+            name: 'highlight'
           danger:
             name: 'fara'
+          success:
+            description: 'Används för att indikera att en åtgärd lyckades.'
           love:
+            name: 'älska'
             description: "Gillaknappens färg."
           wiki:
             name: 'wiki'
@@ -1475,6 +1581,8 @@ sv:
         settings: "Inställningar"
         all: "alla"
         sending_test: "Skickar testmail..."
+        error: "<b>ERROR</b> - %{server_error}"
+        test_error: "Det uppstod ett problem med att skicka test meddelandet. Dubbelkolla dina e-postinställningar, verifiera att din host inte blockerar e-postkopplingar, och försök igen."
         sent: "skickade"
         skipped: "överhoppade"
         sent_at: "Skickat"
@@ -1487,6 +1595,7 @@ sv:
         sent_test: "skickat!"
         delivery_method: "Leveransmetod"
         preview_digest: "Sammandrag"
+        preview_digest_desc: "Förhandsgrandska innehållet i sammanfattningen som veckovis skickas till inaktiva användare."
         refresh: "Uppdatera"
         format: "Format"
         html: "html"
@@ -1547,6 +1656,7 @@ sv:
             check_email: "kolla epost"
             delete_topic: "ta bort tråd"
             delete_post: "ta bort inlägg"
+            impersonate: "imitera"
         screened_emails:
           title: "Kontrollerade email"
           description: "När någon försöker skapa ett nytt konto, kommer följande emailadresser att kontrolleras och registrationen blockeras, eller någon annan åtgärd vidtas."
@@ -1572,11 +1682,15 @@ sv:
             add: "Lägg till"
         logster:
           title: "Felprotokoll"
+      impersonate:
+        title: "Imitera"
+        help: "Använd det här verktyget för att imitera ett användarkonto för avlusningssyften. Du kommer behöva logga ut när du är klar."
       users:
         title: 'Användare'
         create: 'Lägg till Administratör'
         last_emailed: "Senast Mailad"
         not_found: "Tyvärr den användaren existerar inte i vårt system."
+        id_not_found: "Tyvärr, den användaren existerar inte i vårt system."
         active: "Aktiv"
         show_emails: "Visa Epost"
         nav:
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
new file mode 100644
index 0000000000..3d2a8ab850
--- /dev/null
+++ b/config/locales/client.tr_TR.yml
@@ -0,0 +1,2077 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+tr_TR:
+  js:
+    number:
+      human:
+        storage_units:
+          format: '%n %u'
+          units:
+            byte:
+              other: Bayt
+            gb: GB
+            kb: KB
+            mb: MB
+            tb: TB
+    dates:
+      time: "h:mm a"
+      long_no_year: "D MMM h:mm a"
+      long_no_year_no_time: "D MMM"
+      long_with_year: "D MMM, YYYY h:mm a"
+      long_with_year_no_time: "D MMM, YYYY"
+      long_date_with_year: "D MMM, 'YY LT"
+      long_date_without_year: "D MMM, LT"
+      long_date_with_year_without_time: "D MMM, 'YY"
+      long_date_without_year_with_linebreak: "D MMM <br/>LT"
+      long_date_with_year_with_linebreak: "D MMM, 'YY <br/>LT"
+      tiny:
+        half_a_minute: "< 1d"
+        less_than_x_seconds:
+          other: "< %{count}s"
+        x_seconds:
+          other: "%{count}s"
+        less_than_x_minutes:
+          other: "< %{count}d"
+        x_minutes:
+          other: "%{count}d"
+        about_x_hours:
+          other: "%{count}s"
+        x_days:
+          other: "%{count}g"
+        about_x_years:
+          other: "%{count}y"
+        over_x_years:
+          other: "> %{count}y"
+        almost_x_years:
+          other: "%{count}y"
+        date_month: "D MMM"
+        date_year: "MMM 'YY"
+      medium:
+        x_minutes:
+          other: "%{count} dakika"
+        x_hours:
+          other: "%{count} saat"
+        x_days:
+          other: "%{count} gün"
+        date_year: "D MMM, 'YY"
+      medium_with_ago:
+        x_minutes:
+          other: "%{count} dakika önce"
+        x_hours:
+          other: "%{count} saat önce"
+        x_days:
+          other: "%{count} gün önce"
+    share:
+      topic: 'bu konunun bağlantısını paylaşın'
+      post: '#%{postNumber}başlığın bağlantısını paylaşın'
+      close: 'kapat'
+      twitter: 'bu bağlantıyı Twitter''da paylaşın'
+      facebook: 'bu bağlantıyı Facebook''da paylaşın'
+      google+: 'bu bağlantıyı Google+''da paylaşın'
+      email: 'bu bağlantıyı email ile gönderin'
+    topic_admin_menu: "konuyla alakalı admin aksiyonları"
+    edit: 'bu konunun başlığını ve kategorisini düzenleyin'
+    not_implemented: "Bu özellik henüz geliştirilmedi, üzgünüz!"
+    no_value: "Hayır"
+    yes_value: "Evet"
+    generic_error: "Üzgünüz, bir hata oluştu."
+    generic_error_with_reason: "Bir hata oluştu: %{error}"
+    sign_up: "Üye Ol"
+    log_in: "Giriş Yap"
+    age: "Yaş"
+    joined: "Katıldı"
+    admin_title: "Admin"
+    flags_title: "Bayraklar"
+    show_more: "devamını göster"
+    show_help: "yardım"
+    links: "Bağlantılar"
+    links_lowercase: "bağlantılar"
+    faq: "SSS"
+    guidelines: "Yönerge"
+    privacy_policy: "Gizlilik Politikası"
+    privacy: "Gizlilik"
+    terms_of_service: "Hizmet Kullanım Koşulları"
+    mobile_view: "Mobil Görüntüleme"
+    desktop_view: "Masaüstü Görüntüleme"
+    you: "Siz"
+    or: "veya"
+    now: "hemen şimdi"
+    read_more: 'devamını oku'
+    more: "Daha fazla"
+    less: "Daha az"
+    never: "asla"
+    daily: "günlük"
+    weekly: "haftalık"
+    every_two_weeks: "her iki haftada bir"
+    max_of_count: "azami {{count}}"
+    character_count:
+      other: "{{count}} karakter"
+    suggested_topics:
+      title: "Önerilen Konular"
+    about:
+      simple_title: "Hakkında"
+      title: "%{title} Hakkında"
+      stats: "Site İstatistikleri"
+      our_admins: "Adminlerimiz"
+      our_moderators: "Moderatörlerimiz"
+      stat:
+        all_time: "Tüm Zamanlar"
+        last_7_days: "Son 7 Gün"
+      like_count: "Beğeniler"
+      topic_count: "Konular"
+      post_count: "Gönderiler"
+      user_count: "Kullanıcılar"
+    bookmarks:
+      not_logged_in: "üzgünüz, gönderileri işaretleyebilmek için giriş yapmanız gerekiyor"
+      created: "bu gönderiyi işaretlediniz"
+      not_bookmarked: "bu gönderiyi okudunuz; işaretlemek için tıklayın"
+      last_read: "bu okuduğunuz son gönderi; işaretlemek için tıklayın"
+      remove: "İşareti Kaldır"
+    topic_count_latest:
+      other: "{{count}} yeni ya da güncellenmiş konular."
+    topic_count_unread:
+      other: "{{count}} okunmamış konular."
+    topic_count_new:
+      other: "{{count}} yeni konular."
+    click_to_show: "Görüntülemek için tıkla."
+    preview: "önizleme"
+    cancel: "iptal"
+    save: "Değişiklikleri Kaydet"
+    saving: "Kaydediliyor..."
+    saved: "Kaydedildi!"
+    upload: "Yükle"
+    uploading: "Yükleniyor..."
+    uploaded: "Yüklendi!"
+    enable: "Etkinleştir"
+    disable: "Devre Dışı Bırak"
+    undo: "Geri Al"
+    revert: "Eski Haline Getir"
+    failed: "Başarısız Oldu"
+    banner:
+      close: "Bu manşeti yoksay."
+    choose_topic:
+      none_found: "Hiç bir konu bulunamadı."
+      title:
+        search: "İsim, url ya da id ile Başlık arayın:"
+        placeholder: "konu başlığını buraya yazın"
+    user_action:
+      user_posted_topic: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{topicUrl}}'>konuyu</a> açtı"
+      you_posted_topic: "<a href='{{topicUrl}}'>konuyu</a> <a href='{{userUrl}}'>sen</a> açtın"
+      user_replied_to_post: "<a href='{{userUrl}}'>{{user}}</a> <a href='{{postUrl}}'>{{post_number}}</a> gönderiyi cevapladı"
+      you_replied_to_post: "<a href='{{postUrl}}'>{{post_number}}</a> gönderiyi <a href='{{userUrl}}'>sen</a> cevapladın"
+      user_replied_to_topic: "<a href='{{userUrl}}'>{{user}}</a>  <a href='{{topicUrl}}'>konuya</a> cevap verdi"
+      you_replied_to_topic: "<a href='{{userUrl}}'>Siz</a>  <a href='{{topicUrl}}'>konuya</a> cevap verdiniz"
+      user_mentioned_user: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>{{another_user}}</a> adlı kullanıcıdan bahsetti"
+      user_mentioned_you: "<a href='{{user1Url}}'>{{user}}</a> <a href='{{user2Url}}'>sizden</a> bahsetti"
+      you_mentioned_user: "<a href='{{user1Url}}'>Siz</a>, <a href='{{user2Url}}'>{{another_user}}</a> adlı kullanıcıdan bahsettiniz"
+      posted_by_user: "<a href='{{userUrl}}'>{{user}}</a> tarafından gönderildi"
+      posted_by_you: "<a href='{{userUrl}}'>Sizin</a> tarafınızdan gönderildi"
+      sent_by_user: "<a href='{{userUrl}}'>{{user}}</a> tarafından yollandı"
+      sent_by_you: "<a href='{{userUrl}}'>Sizin</a> tarafınızdan yollandı"
+    groups:
+      visible: "Grup tüm kullanıcılar tarafından görüntülenebiliyor"
+      title:
+        other: "gruplar"
+      members: "Üyeler"
+      posts: "Gönderiler"
+      alias_levels:
+        title: "Kimler bu grubu ikinci adı olarak kullanabilir?"
+        nobody: " Hiç Kimse"
+        only_admins: "Sadece adminler"
+        mods_and_admins: "Sadece moderatörler ve adminler"
+        members_mods_and_admins: "Sadece Grup Üyeleri, Moderatörler ve Adminler"
+        everyone: "Herkes"
+    user_action_groups:
+      '1': "Verilen Beğeniler"
+      '2': "Alınan Beğeniler"
+      '3': "İşaretlenenler"
+      '4': "Konular"
+      '5': "Gönderiler"
+      '6': "Cevaplar"
+      '7': "Bahsedenler"
+      '9': "Alıntılar"
+      '10': "Yıldızlılar"
+      '11': "Düzenlemeler"
+      '12': "Yollanmış ögeler"
+      '13': "Gelen Kutusu"
+    categories:
+      all: "bütün kategoriler"
+      all_subcategories: "hepsi"
+      no_subcategory: "hiçbiri"
+      category: "Kategori"
+      posts: "Gönderiler"
+      topics: "Konular"
+      latest: "En Son"
+      latest_by: "göre sonuncu"
+      toggle_ordering: "sıralama kontrolünü aç/kapa"
+      subcategories: "Alt kategoriler"
+      topic_stats: "Yeni konu sayısı"
+      topic_stat_sentence:
+        other: "%{unit} beri %{count} yeni konu."
+      post_stats: "Yeni gönderi sayısı"
+      post_stat_sentence:
+        other: "%{unit} beri %{count} yeni gönderi."
+    ip_lookup:
+      title: IP Adresi Ara
+      hostname: Sunucu ismi
+      location: Yer
+      location_not_found: (bilinmeyen)
+      organisation: Organizasyon
+      phone: Telefon
+      other_accounts: "Bu IP adresine sahip diğer hesaplar:"
+      delete_other_accounts: "Sil %{count}"
+      username: "kullanıcı adı"
+      trust_level: "TL"
+      read_time: "okunma zamanı"
+      topics_entered: "açılan konular"
+      post_count: "# gönderi"
+      confirm_delete_other_accounts: "Bu hesapları silmek isteğinize emin misiniz?"
+    user:
+      said: "{{username}}:"
+      profile: "Profil"
+      mute: "Sustur"
+      edit: "Tercihleri Düzenle"
+      download_archive: "gönderilerimin arşivini indir"
+      new_private_message: "Yeni Özel Mesaj"
+      private_message: "Özel Mesaj"
+      private_messages: "Mesajlar"
+      activity_stream: "Aktivite"
+      preferences: "Tercihler"
+      bookmarks: "İşaretlenenler"
+      bio: "Hakkımda"
+      invited_by: "Tarafından Davet Edildi"
+      trust_level: "Güven Seviyesi"
+      notifications: "Bildirimler"
+      dismiss_notifications: "Hepsini okunmuş olarak işaretle"
+      dismiss_notifications_tooltip: "Tüm okunmamış bildirileri okunmuş olarak işaretle"
+      disable_jump_reply: "Cevapladıktan sonra yeni gönderine geçme"
+      dynamic_favicon: "Favicon üzerinde gelen mesaj bildirimlerini göster (deneysel)"
+      edit_history_public: "Gönderimde yaptığım revizyonları diğer kullanıcıların görmesine izin ver"
+      external_links_in_new_tab: "Tüm dış bağlantıları yeni sekmede aç"
+      enable_quoting: "Vurgulanan yazıyı alıntılayarak cevaplama özelliğini etkinleştir"
+      change: "değiştir"
+      moderator: "{{user}} bir moderatördür"
+      admin: "{{user}} bir admindir"
+      moderator_tooltip: "Bu kullanıcı bir moderatör"
+      admin_tooltip: "Bu kullanıcı bir admin."
+      suspended_notice: "Bu kullanıcı {{tarih}} tarihine kadar uzaklaştırıldı."
+      suspended_reason: "Neden:"
+      github_profile: "Github"
+      mailing_list_mode: "Her yeni gönderi için email alın (susturduğunuz konu ve kategorilerdekiler hariç)"
+      watched_categories: "Gözlendi"
+      watched_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konular size bildirilecek. Ayrıca, okunmamış ve yeni gönderilerin sayısı ilgili konu yanında belirecek. "
+      tracked_categories: "Takip edildi"
+      tracked_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksiniz. Okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek."
+      muted_categories: "Susturuldu"
+      muted_categories_instructions: "Bu kategorideki yeni konular okunmamışlar sekmenizde belirmeyecek, ve haklarında hiçbir bildirim almayacaksınız."
+      delete_account: "Hesabımı Sil"
+      delete_account_confirm: "Hesabınızı kalıcı olarak silmek istediğinize emin misiniz? Bu işlemi geri alamazsınız!"
+      deleted_yourself: "Hesabınız başarıyla silindi."
+      delete_yourself_not_allowed: "Hesabınızı şu an silemezsiniz. Hesabınızı silmesi için bir admin ile iletişime geçin."
+      unread_message_count: "Mesajlar"
+      admin_delete: "Sil"
+      staff_counters:
+        flags_given: "yararlı bayraklar"
+        flagged_posts: "bayraklanan gönderiler"
+        deleted_posts: "silinen gönderiler"
+        suspensions: "uzaklaştırmalar"
+        warnings_received: "uyarılar"
+      messages:
+        all: "Hepsi"
+        mine: "Benimkiler"
+        unread: "Okunmamışlar"
+      change_password:
+        success: "(email gönderildi)"
+        in_progress: "(email yollanıyor)"
+        error: "(hata)"
+        action: "Şifre Sıfırlama Emaili Yolla"
+        set_password: "Şifre Belirle"
+      change_about:
+        title: "Hakkımda'yı Değiştir"
+      change_username:
+        title: "Kullanıcı Adını Değiştir"
+        confirm: "Kullanıcı adınızı degiştirmeniz halinde, eski gönderilerinizden yapılan tüm alıntılar ve @isim bahsedilişler bozulacak. Bunu yapmak istediginize gerçekten emin misiniz?"
+        taken: "Üzgünüz, bu kullanıcı adı alınmış."
+        error: "Kullanıcı adınızı değiştirirken bir hata oluştu."
+        invalid: "Bu kullanıcı adı geçersiz. Sadece sayı ve harf içermelidir."
+      change_email:
+        title: "Email Adresinizi Değiştirin"
+        taken: "Üzgünüz, bu email müsait değil."
+        error: "Email adresinizi değiştirirken bir hata oluştu. Belki bu adres zaten kullanımdadır?"
+        success: "Adresinize bir email gönderdik. Lütfen onaylama talimatlarını uygulayınız."
+      change_avatar:
+        title: "Avatarınızı değiştirin"
+        gravatar: "<a href='//gravatar.com/emails' target='_blank'>Gravatar</a>, baz alındı"
+        refresh_gravatar_title: "Avatarınızı Yenileyin"
+        letter_based: "Sistem tarafından verilen avatar"
+        uploaded_avatar: "Özel resim"
+        uploaded_avatar_empty: "Özel resim ekleyin"
+        upload_title: "Resminizi yükleyin"
+        upload_picture: "Resim Yükle"
+        image_is_not_a_square: "Uyarı: resminizi kırptık; kare şeklinde değildi. "
+      change_profile_background:
+        title: "Profil Arkaplanı"
+        instructions: "Profil arkaplanları ortalanacak ve genişlikleri 850px olacak. "
+      change_card_background:
+        title: "Kullanıcı Kartı Arkaplanı"
+        instructions: "Profil arkaplanları ortalanacak ve genişlikleri 590px olacak. "
+      email:
+        title: "Email"
+        instructions: "Kimseye gösterilmedi"
+        ok: "Onay için size email atacağız"
+        invalid: "Lütfen geçerli bir email adresini giriniz"
+        authenticated: "Email adresiniz {{provider}} tarafından doğrulanmıştır"
+        frequency:
+          zero: "Eğer yollamak üzere olduğumuz şeyi okumadıysanız size direk email yollayacağız."
+          one: "Sadece, son bir dakika içinde forumu ziyaret etmediyseniz ve yollamak üzere olduğumuz şeyi okumadıysanız size email yollayacağız."
+          other: "Sadece, son {{count}} dakika içinde forumu ziyaret etmediyseniz ve yollamak üzere olduğumuz şeyi okumadıysanız size email yollayacağız."
+      name:
+        title: "İsim"
+        instructions: "Adınız ve soyadınız (zorunlu değil)"
+        too_short: "İsminiz çok kısa"
+        ok: "İsminiz iyi görünüyor"
+      username:
+        title: "Kullanıcı adı"
+        instructions: "Özgün, boşluksuz ve kısa"
+        short_instructions: "Kişiler sizden @{{username}} olarak bahsedebilirler"
+        available: "Kullanıcı adınız müsait"
+        global_match: "Email kayıtlı kullanıcı adıyla eşleşiyor"
+        global_mismatch: "Zaten mevcut. {{suggestion}} deneyin?"
+        not_available: "Müsait değil. {{suggestion}} deneyin?"
+        too_short: "Kullanıcı adınız çok kısa"
+        too_long: "Kullanıcı adınız çok uzun"
+        checking: "Kullanıcı adı müsait mi kontrol ediliyor..."
+        enter_email: 'Kullanıcı adı bulundu; eşleşen email adresini girin'
+        prefilled: "Email bu kullanıcı adı ile eşleşiyor"
+      locale:
+        title: "Arayüz dili"
+        instructions: "Kullanıcı arayüzünün dili. Sayfayı yenilediğiniz zaman değişecektir."
+        default: "(varsayılan)"
+      password_confirmation:
+        title: "Tekrar Şifre"
+      last_posted: "Son Gönderi"
+      last_emailed: "Son Email Atılan"
+      last_seen: "Bakılmış"
+      created: "Katıldı"
+      log_out: "Çıkış Yap"
+      location: "Yer"
+      card_badge:
+        title: "Kullanıcı Kartı Rozeti"
+      website: "Web Sayfası"
+      email_settings: "Email"
+      email_digests:
+        title: "Siteyi ziyaret etmediğiniz zamanlar, yeni olayların özetini içeren bir email yolla:"
+        daily: "günlük"
+        weekly: "haftalık"
+        bi_weekly: "her iki haftada bir"
+      email_direct: "Birisi gönderinize cevap verdiği, sizden alıntı yaptığı ya da sizden @username bahsettiği zaman email alın"
+      email_private_messages: "Biri size özel mesaj yolladığında email alın"
+      email_always: "Sayfada aktif olduğum anlarda da email bildirimleri yollamaya devam et"
+      other_settings: "Diğer"
+      categories_settings: "Kategoriler"
+      new_topic_duration:
+        label: "Seçili durumdaki konular yeni sayılsın"
+        not_viewed: "henüz görüntülemedikleriniz"
+        last_here: "son girişinizden beri oluşturulanlar"
+        after_n_days:
+          other: "son {{count}} günde oluşturulanlar"
+        after_n_weeks:
+          other: "son {{count}} haftada oluşturulanlar"
+      auto_track_topics: "Girdiğiniz konuları otomatik olarak takip edin"
+      auto_track_options:
+        never: "asla"
+        always: "her zaman"
+        after_n_seconds:
+          other: "{{count}} saniye sonra"
+        after_n_minutes:
+          other: "{{count}} dakika sonra"
+      invited:
+        search: "davetler arasında aramak için yazın..."
+        title: "Davetler"
+        user: "Davet Edilen Kullanıcı"
+        none: "Henüz buraya kimseyi davet etmediniz."
+        truncated: "İlk {{count}} davetler gösteriliyor."
+        redeemed: "Kabul Edilen Davetler"
+        redeemed_at: "Kabul Edildi"
+        pending: "Bekleyen Davetler"
+        topics_entered: "Görüntülenmiş Konular"
+        posts_read_count: "Okunmuş Yazılar"
+        expired: "Bu davetin süresi doldu."
+        rescind: "Kaldır"
+        rescinded: "Davet kaldırıldı"
+        reinvite: "Davetiyeyi Tekrar Yolla"
+        reinvited: "Davetiye tekrar yollandı"
+        time_read: "Okunma Zamanı"
+        days_visited: "Ziyaret Edilen Günler"
+        account_age_days: "Gün içinde Hesap yaş"
+        create: "Davet Gönderin"
+        bulk_invite:
+          none: "Henüz kimseyi buraya davet etmediniz. Tek tek davetiye gönderebilirsiniz, ya da <a href='https://meta.discourse.org/t/send-bulk-invites/16468'>toplu bir davetiye dosyası yükleyerek</a> birçok kişiyi aynı anda davet edebilirsiniz. "
+          text: "Dosyadan Toplu Davet Gönder"
+          uploading: "Yükleniyor..."
+          success: "Dosya yüklemesi başarılı, kısa bir süre içerisinde işlem durumuyla ilgili bir bildirim alacaksınız."
+          error: "'{{filename}}' yüklenirken bir hata oluştu: {{message}}"
+      password:
+        title: "Şifre"
+        too_short: "Şifreniz çok kısa."
+        common: "Bu şifre çok yaygın."
+        ok: "Şifreniz uygun gözüküyor."
+        instructions: "En az %{count} karakter."
+      associated_accounts: "İlgili hesaplar"
+      ip_address:
+        title: "Son IP Adresi"
+      registration_ip_address:
+        title: "Kayıt Anındaki IP Adresi"
+      avatar:
+        title: "Avatar"
+      title:
+        title: "Başlık"
+      filters:
+        all: "Hepsi"
+      stream:
+        posted_by: "Gönderen"
+        sent_by: "Yollayan"
+        private_message: "özel mesaj"
+        the_topic: "konu"
+    loading: "Yükleniyor..."
+    errors:
+      prev_page: "yüklemeye çalışırken"
+      reasons:
+        network: "Network Hatası"
+        server: "Sunucu Hatası"
+        forbidden: "Erişim Reddedildi"
+        unknown: "Hata"
+      desc:
+        network: "Lütfen bağlantınızı kontrol edin."
+        network_fixed: "Geri döndü gibi gözüküyor."
+        server: "Hata kodu : {{status}}"
+        forbidden: "Bunu görüntülemeye izniniz yok."
+        unknown: "Bir şeyler ters gitti."
+      buttons:
+        back: "Geri Dönün"
+        again: "Tekrar Deneyin"
+        fixed: "Sayfayı Yükle"
+    close: "Kapat"
+    assets_changed_confirm: "Bu site yeni güncellendi. Son hali için sayfayı yenileyin?"
+    logout: "Oturumunuz kapatılmış."
+    refresh: "Yenile"
+    read_only_mode:
+      enabled: "Bir admin salt-okunur modunu etkinleştirdi. Siteyi gezmeye devam edebilirsiniz fakat etkileşimler çalışmayabilir."
+      login_disabled: "Sitesi salt okunur modda iken Giriş devre dışı bırakılır ."
+    too_few_topics_notice: "Tartışmayı başlatmak için herkese açık en az 5 konu ve %{posts} gönderi oluşturun. Yeni kullanıcıların güven seviyelerini artırabilmeleri için okuyabilecekleri içerik olması gerekli. Bu mesaj sadece görevlilere görünür."
+    learn_more: "daha fazlasını öğren..."
+    year: 'yıl'
+    year_desc: 'son 365 günde oluşturulan konular'
+    month: 'ay'
+    month_desc: 'son 30 günde oluşturulan konular'
+    week: 'hafta'
+    week_desc: 'son 7 günde oluşturulan konular'
+    day: 'gün'
+    first_post: İlk gönderi
+    mute: Sustur
+    unmute: Susturma
+    last_post: Son gönderi
+    last_post_lowercase: son gönderi
+    summary:
+      enabled_description: "Bu konunun özetini görüntülemektesiniz: topluluğun en çok ilgisini çeken gönderiler"
+      description: "<b>{{count}}</b> sayıdacevap var."
+      description_time: "Tahmini okunma süresi <b>{{readingTime}} minutes</b> olan <b>{{count}}</b> sayıda cevap var."
+      enable: 'Bu Konuyu Özetle.'
+      disable: 'Tüm Gönderileri Göster'
+    deleted_filter:
+      enabled_description: "Bu konu gizlenen silinmiş gönderiler içeriyor."
+      disabled_description: "Bu konuda silinen gönderiler gösteriliyor."
+      enable: "Silinen Gönderileri Gizle"
+      disable: "Silinen Gönderileri Göster"
+    private_message_info:
+      title: "Özel Mesaj"
+      invite: "Diğerlerini Davet Et..."
+      remove_allowed_user: "Bu özel mesajdan {{name}} isimli kullanıcıyı çıkarmak istediğinize emin misiniz?"
+    email: 'Email'
+    username: 'Kullanıcı Adı'
+    last_seen: 'Bakılmış'
+    created: 'Oluşturuldu'
+    created_lowercase: 'oluşturuldu'
+    trust_level: 'Güven Seviyesi'
+    search_hint: 'kullanıcı adı, email veya IP adresi'
+    create_account:
+      title: "Yeni Hesap Oluştur"
+      failed: "Bir şeyler ters gitti. Bu email adına daha önce bir kayıt oluşturulmuş olabilir, şifremi unuttum bağlantısını dene."
+    forgot_password:
+      title: "Şifremi Unuttum"
+      action: "Şifremi unuttum"
+      invite: "Kullanıcı adınızı ya da email adresinizi girin, size şifre sıfırlama emaili yollayalım."
+      reset: "Şifre Sıfırla"
+      complete_username: " <b>%{username}</b> kullanıcı adı ile eşleşen bir hesap bulunması durumunda, kısa bir süre içerisinde şifrenizi nasıl sıfırlayacağınızı açıklayan bir email alacaksınız."
+      complete_email: " <b>%{email}</b> adresi ile eşleşen bir hesap bulunması durumunda, kısa bir süre içerisinde şifrenizi nasıl sıfırlayacağınızı açıklayan bir email alacaksınız."
+      complete_username_found: "<b>%{username}</b> kullanıcı adı ile eşleşen bir hesap bulduk, kısa bir süre içerisinde şifrenizi nasıl sıfırlayacağınızı açıklayan bir email alacaksınız."
+      complete_email_found: "<b>%{email}</b> adresi ile eşleşen bir hesap bulduk, kısa bir süre içerisinde şifrenizi nasıl sıfırlayacağınızı açıklayan bir email alacaksınız."
+      complete_username_not_found: "Hiçbir hesap kullanıcı adı <b>%{username}</b> ile eşleşmiyor"
+      complete_email_not_found: "Hiçbir hesap <b>%{email}</b> adresi ile eşleşmiyor"
+    login:
+      title: "Giriş Yap"
+      username: "Kullanıcı"
+      password: "Şifre"
+      email_placeholder: "email veya kullanıcı adı"
+      caps_lock_warning: "Caps Lock açık"
+      error: "Bilinmeyen hata"
+      blank_username_or_password: "Lütfen email adresinizi ya da kullanıcı adınızı, ve şifrenizi girin."
+      reset_password: 'Şifre Sıfırlama'
+      logging_in: "Giriş yapılıyor..."
+      or: "Veya"
+      authenticating: "Kimlik doğrulanıyor ..."
+      awaiting_confirmation: "Hesabınız aktive edilmemiş. Yeni bir aktivasyon emaili almak için şifremi unuttum bağlantısını kullanabilirsiniz. "
+      awaiting_approval: "Hesabınız henüz bir görevli tarafından onaylanmadı. Onaylandığında email ile haberdar edileceksiniz."
+      requires_invite: "Üzgünüz, bu foruma sadece davetliler erişebilir."
+      not_activated: "Henüz giriş yapamazsınız. Hesabınızı aktive etmek için lütfen daha önceden <b>{{sentTo}}</b> adresine yollanan aktivasyon emailindeki açıklamaları okuyun."
+      not_allowed_from_ip_address: "Bu IP adresiyle giriş yapamazsınız."
+      resend_activation_email: "Aktivasyon emailini tekrar yollamak için buraya tıklayın. "
+      sent_activation_email_again: "<b>{{currentEmail}}</b> adresine yeni bir aktivasyon emaili yolladık. Bu emailin size ulaşması bir kaç dakika sürebilir; spam klasörüzü kontrol etmeyi unutmayın."
+      google:
+        title: "Google ile"
+        message: "Google ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+      google_oauth2:
+        title: "Google ile"
+        message: "Google ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+      twitter:
+        title: "Twitter ile"
+        message: "Twitter ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+      facebook:
+        title: "Facebook ile"
+        message: "Facebook ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+      yahoo:
+        title: "Yahoo ile"
+        message: "Yahoo ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+      github:
+        title: "GitHub ile"
+        message: "GitHub ile kimlik doğrulaması yapılıyor (pop-up engelleyicilerin etkinleştirilmediğinden emin olun)"
+    composer:
+      add_warning: "Bu resmi bir uyarıdır."
+      posting_not_on_topic: "Hangi konuyu cevaplamak istiyorsun?"
+      saving_draft_tip: "kaydediliyor"
+      saved_draft_tip: "kaydedildi"
+      saved_local_draft_tip: "yerele kaydedildi"
+      similar_topics: "Konunuz bu konuya benziyor..."
+      drafts_offline: "çevrimdışı taslaklar"
+      min_length:
+        need_more_for_title: "başlığa gitmek için {{n}}"
+        need_more_for_reply: "{{n}} adet kaldı"
+      error:
+        title_missing: "Başlık gerekli"
+        title_too_short: "Başlık en az {{min}} karakter olmalı"
+        title_too_long: "Başlık {{max}} karakterden daha uzun olamaz"
+        post_missing: "Gönderiler boş olamaz"
+        post_length: "Gönderi en az {{min}} karakter olmalı"
+        category_missing: "Bir kategori seçmelisiniz"
+      save_edit: "Değişikliği Kaydet"
+      reply_original: "Ana Konuyu Cevapla"
+      reply_here: "Buradan Cevapla"
+      reply: "Cevapla"
+      cancel: "İptal et"
+      create_topic: "Yeni Konu"
+      create_pm: "Özel Mesaj"
+      title: "Ya da Ctrl+Enter'a bas"
+      users_placeholder: "Kullanıcı ekle"
+      title_placeholder: "Tek kısa bir cümlede açılamak gerekirse bu tartışmanın konusu nedir?"
+      edit_reason_placeholder: "neden düzenleme yapıyorsunuz?"
+      show_edit_reason: "(düzenleme sebebi ekle)"
+      reply_placeholder: "Buraya yazın. Markdown veya BBCode kullanarak biçimlendirin. Resmi yüklemek için sürükleyip bırakın ya da yapıştırın."
+      view_new_post: "Yeni gönderinizi görüntüleyin."
+      saving: "Kaydediliyor..."
+      saved: "Kaydedildi!"
+      saved_draft: "Gönderi taslağı işleniyor. Geri almak için seçin. "
+      uploading: "Yükleniyor..."
+      show_preview: 'önizlemeyi göster &raquo;'
+      hide_preview: '&laquo; önizlemeyi gizle'
+      quote_post_title: "Tüm gönderiyi alıntıla"
+      bold_title: "Kalın"
+      bold_text: "kalın yazı"
+      italic_title: "Vurgular"
+      italic_text: "vurgulanan yazı"
+      link_title: "Bağlantı"
+      link_description: "buraya bağlantı açıklamasını girin"
+      link_dialog_title: "Bağlantı ekle"
+      link_optional_text: "opsiyonel başlık"
+      quote_title: "Blok-alıntı"
+      quote_text: "Blok-alıntı"
+      code_title: "Önceden biçimlendirilmiş yazı"
+      code_text: "paragraf girintisi 4 boşluktan oluşan, önceden biçimlendirilen yazı"
+      upload_title: "Yükle"
+      upload_description: "yükleme açıklamasını buraya girin"
+      olist_title: "Numaralandırılmış Liste"
+      ulist_title: "Madde İşaretli Liste"
+      list_item: "Liste öğesi"
+      heading_title: "Başlık"
+      heading_text: "Başlık"
+      hr_title: "Yatay Çizgi"
+      undo_title: "Geri Al"
+      redo_title: "Tekrarla"
+      help: "Markdown Düzenleme Yardımı"
+      toggler: "yazım alanını gizle veya göster"
+      admin_options_title: "Bu konu için opsiyonel görevli ayarları"
+      auto_close:
+        label: "Başlığı otomatik kapatma zamanı:"
+        error: "Lütfen geçerli bir değer giriniz."
+        based_on_last_post: "Başlıktaki son gönderi de en az bu kadar eskiyinceye kadar kapatmayın."
+        all:
+          examples: 'Saat sayısı (24), kesin zaman (17:30) ya da zaman damgası (2013-11-22 14:00) girin.'
+        limited:
+          units: "(saat sayısı)"
+          examples: 'Saat sayısını giriniz (24).'
+    notifications:
+      title: "@isim bahsedilişleri, gönderileriniz ve konularınıza atılan cevaplar, özel mesajlarla vb. ilgili bildiriler"
+      none: "Şu an yeni bir bildiriminiz yok."
+      more: "daha eski bildirimleri görüntüle"
+      total_flagged: "tüm bayraklı gönderiler"
+      mentioned: "<i title='bahsetti' class='icon'>@</i><p><span>{{username}}</span> {{description}}</p>"
+      quoted: "<i title='alıntıladı' class='fa fa-quote-right'></i><p><span>{{username}}</span> {{description}}</p>"
+      replied: "<i title='cevapladı' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      posted: "<i title='cevapladı' class='fa fa-reply'></i><p><span>{{username}}</span> {{description}}</p>"
+      edited: "<i title='düzenledi' class='fa fa-pencil'></i><p><span>{{username}}</span> {{description}}</p>"
+      liked: "<i title='beğendi' class='fa fa-heart'></i><p><span>{{username}}</span> {{description}}</p>"
+      private_message: "<i title='özel mesaj' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
+      invited_to_private_message: "<i title='özel mesaj' class='fa fa-envelope-o'></i><p><span>{{username}}</span> {{description}}</p>"
+      invitee_accepted: "<i title='davetiyeni kabul etti' class='fa fa-user'></i><p><span>{{username}}</span> davetiyeni kabul etti</p>"
+      moved_post: "<i title='gönderiyi taşıdı' class='fa fa-sign-out'></i><p><span>{{username}}</span> taşıdı {{description}}</p>"
+      linked: "<i title='gönderiye bağlantı verdi' class='fa fa-arrow-left'></i><p><span>{{username}}</span> {{description}}</p>"
+      granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p>Kazanıldı'{{description}}'</p>"
+    upload_selector:
+      title: "Resim ekle"
+      title_with_attachments: "Resim ya da dosya ekle"
+      from_my_computer: "Kendi cihazımdan"
+      from_the_web: "Webden"
+      remote_tip: "resme bağlantı ver"
+      remote_tip_with_attachments: "resme ya da dosyaya ({{authorized_extensions}}) bağlantı ver"
+      local_tip: "cihazınızda bulunan bir resmi seçmek için tıklayın"
+      local_tip_with_attachments: "cihazınızdan resim ya da dosya seçmek için tıklayın ({{authorized_extensions}})"
+      hint: "(editöre sürekle & bırak yaparak da yükleyebilirsiniz)"
+      hint_for_supported_browsers: "(resimleri, editöre sürükle & bırak yaparak ya da yapıştırarak da yükleyebilirsiniz)"
+      uploading: "Yükleniyor"
+      image_link: "resminizin yönleneceği bağlantı"
+    search:
+      title: "konular, gönderiler, kullanıcılar, veya kategoriler arasında ara"
+      no_results: "Hiç bir sonuç bulunamadı."
+      searching: "Aranıyor..."
+      post_format: "{{username}} tarafından #{{post_number}}"
+      context:
+        user: "@{{username}} kullancısına ait gönderiler arasında ara"
+        category: "\"{{category}}\" kategorisinde ara"
+        topic: "Bu konuda ara"
+        private_messages: "Özel mesajlarda ara"
+    site_map: "başka bir konu listesine veya kategoriye git"
+    go_back: 'geri dön'
+    not_logged_in_user: 'güncel aktivitelerin ve tercihlerin özetinin bulunduğu kullanıcı sayfası'
+    current_user: 'kendi kullanıcı sayfana git'
+    starred:
+      title: 'Yıldız'
+      help:
+        star: 'bu konuyu yıldızlılar listenize ekleyin'
+        unstar: 'bu konuyu yıldızlılar listenizden çıkarın'
+    topics:
+      bulk:
+        reset_read: "Okunmuşları Sıfırla"
+        delete: "Konuları Sil"
+        dismiss_posts: "Gönderileri Yoksay"
+        dismiss_posts_tooltip: "Bu konulardaki okunmamışların sayısını sıfırla ama yeni gönderiler oluşturulduğunda okunmamışlar listemde göster"
+        dismiss_topics: "Konuları Yoksay"
+        dismiss_topics_tooltip: "Bu konularda yeni gönderiler oluşturulunca okunmamış listemde gösterme"
+        dismiss_new: "Yenileri Yoksay"
+        toggle: "konuların toplu seçimini aç/kapa"
+        actions: "Toplu Aksiyonlar"
+        change_category: "Kategoriyi Değiştir"
+        close_topics: "Konuları Kapat"
+        archive_topics: "Konuları Arşivle"
+        notification_level: "Bildirim Seviyesini Değiştir"
+        selected:
+          other: "<b>{{count}}</b> konu seçtiniz."
+      none:
+        starred: "Yıldızlı konunuz yok."
+        unread: "Okunmamış konunuz yok."
+        new: "Yeni konunuz yok"
+        read: "Henüz herhangi bir konu okumadınız."
+        posted: "Henüz herhangi bir konuda gönderi oluşturmadınız."
+        latest: "Son bir konu yok. Bu üzücü."
+        hot: "Sıcak bir konu yok."
+        category: "{{category}} konusu yok."
+        top: "Popüler bir konu yok."
+        educate:
+          new: '<p>Yeni konularınız burada belirir.</p><p>Varsayılan ayarlarda, son 2 gün içerisinde yaratılan konular yeni sayılır ve <span class="badge new-topic badge-notification" style="vertical-align:middle;line-height:inherit;">yeni</span> işaretiyle gösterilir.</p><p>Dilerseniz bu ayarları <a href="%{userPrefsUrl}">seçenekler</a>sayfanızdan düzenleyebilirsiniz.</p>'
+          unread: '<p> Okunmamış konularınız burada belirecek. </p><p> Varsayılan ayarlarda, şu durumlarda konular okunmamış sayılır ve okunmamışların sayısı <span class="badge new-posts badge-notification">1</span> gösterilir: </p><ul><li>Konuyu oluşturduysanız</li><li>Konuyu cevapladıysanız</li><li>Konuyu 4 dakikadan uzun bir süre okuduysanız</li></ul><p> Ya da, konunun altında bulunan bildirim kontrol bölümünden, konuyu Takip Edildi veya Gözlendi diye işaretlediyseniz.</p><p>Bu ayarları <a href="%{userPrefsUrl}">seçenekler</a> sayfasından değiştirebilirsiniz.</p>'
+          starred: '<p>Yıldızlanan konularınız burada belirir.</p><p>Konuları yıldızlamak ya da yıldızlarını kaldırmak için şunları kullanın:</p><ul><li>konu başlıklarının yanında bulunan <i class="fa fa-star"></i> butonunu</li><li>Her konunun en alt kısmında bulunan Yıldız butonunu</li></ul>'
+      bottom:
+        latest: "Daha fazla son bir konu yok."
+        hot: "Daha fazla sıcak bir konu yok."
+        posted: "Daha fazla konu yok."
+        read: "Daha fazla okunmuş konu yok."
+        new: "Daha fazla yeni konu yok."
+        unread: "Daha fazla okunmamış konu yok."
+        starred: "Daha fazla yıldızlı konu yok."
+        category: "Daha fazla {{category}} konusu yok."
+        top: "Daha fazla popüler konu yok"
+    topic:
+      filter_to: "Bu konuda {{post_count}} gönderi"
+      create: 'Yeni Konu'
+      create_long: 'Yeni bir konu oluştur'
+      private_message: 'Özel mesajlaşma başlat'
+      list: 'Konular'
+      new: 'yeni konu'
+      unread: 'okunmamış'
+      new_topics:
+        other: '{{count}} yeni konu'
+      unread_topics:
+        other: '{{count}} okunmamış konu'
+      title: 'Konu'
+      loading: 'Konu yükleniyor...'
+      invalid_access:
+        title: "Bu konu özel"
+        description: "Üzgünüz, bu konuya erişiminiz yok!"
+        login_required: "Bu konuya bakabilmek için giriş yapmanız gerekir."
+      server_error:
+        title: "Konu yüklenemedi."
+        description: "Üzgünüz, muhtemelen bir bağlantı sorunundan ötürü bu konuyu yükleyemedik. Lütfen tekrar deneyin. Eğer sorun devam ederse, bizimle iletişime geçin. "
+      not_found:
+        title: "Konu bulunamadı."
+        description: "Üzgünüz, bu konuyu bulamadık. Belki de moderatör tarafından kaldırıldı?"
+      total_unread_posts:
+        other: "bu konuda {{count}} okunmamış gönderi var"
+      unread_posts:
+        other: "bu konuda {{count}} tane okunmamış eski gönderi var"
+      new_posts:
+        other: "bu konuda, son okumanızdan bu yana {{count}} yeni gönderi var"
+      likes:
+        other: "bu konuda {{count}} beğeni var"
+      back_to_list: "Konu Listesine Geri Dön"
+      options: "Konu Seçenekleri"
+      show_links: "Bu konunun içindeki bağlantıları göster. "
+      toggle_information: "konu ayrıntılarını aç/kapa"
+      read_more_in_category: " Daha fazla okumak mı istiyorsunuz? {{catLink}} veya {{latestLink}} categorilerindeki diğer konulara göz atabilirsiniz."
+      read_more: "Daha fazla okumak mı istiyorsunuz? {{catLink}} ya da {{latestLink}}."
+      read_more_MF: "Kalan { UNREAD, plural, =0 {} one { <a href='/unread'>1 okunmamış</a> } other { <a href='/unread'># okunmamış</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ve} false {} other{}} <a href='/new'>1 yeni</a> konu} other { {BOTH, select, true{and } false {} other{}} <a href='/new'># yeni</a> konu} } var, veya {CATEGORY, select, true { {catLink}} false {{latestLink}} kategorilerindeki diğer {} konulara göz atabilirsiniz }."
+      browse_all_categories: Bütün kategorilere göz at
+      view_latest_topics: en son konuları görüntüle
+      suggest_create_topic: Konu oluşturmaya ne dersiniz?
+      jump_reply_up: Daha önceki cevaba geç
+      jump_reply_down: Daha sonraki cevaba geç
+      deleted: "Konu silindi "
+      auto_close_notice: "Bu konu otomatik olarak kapanacak %{timeLeft}."
+      auto_close_notice_based_on_last_post: "Bu konu son cevaptan %{duration} sonra kapanacak."
+      auto_close_title: 'Otomatik-Kapatma Ayarları'
+      auto_close_save: "Kaydet"
+      auto_close_remove: "Bu Konuyu Otomatik Olarak Kapatma"
+      progress:
+        title: konu gidişatı
+        go_top: "en üst"
+        go_bottom: "en alt"
+        go: "git"
+        jump_bottom_with_number: "%{post_number} numaralı gönderiye geç"
+        total: tüm gönderiler
+        current: şu anki gönderi
+        position: "%{total} gönderi arasından %{current}."
+      notifications:
+        reasons:
+          '3_6': 'Bu kategoriyi gözlediğiniz için bildirimlerini alacaksınız.'
+          '3_5': 'Bu konuyu otomatik olarak gözlemeye başladığınız için bildirimlerini alacaksınız.'
+          '3_2': 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
+          '3_1': 'Bu konuyu siz oluşturduğunuz için bildirimlerini alacaksınız.'
+          '3': 'Bu konuyu gözlediğiniz için bildirimlerini alacaksınız.'
+          '2_8': 'Be kategoriyi takip ettiğiniz için bildirimlerini alacaksınız.'
+          '2_4': 'Bu konuya cevap yazdığınız için bildirimlerini alacaksınız.'
+          '2_2': 'Bu konuyu takip ettiğiniz için bildirimlerini alacaksınız.'
+          '2': '<a href="/users/{{username}}/preferences">Bu konuyu okuduğunuz için</a> bildirimlerini alacaksınız.'
+          '1_2': 'Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.'
+          '1': 'Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız.'
+          '0_7': 'Bu kategoriye ait tüm bildirimleri görmezden geliyorsunuz.'
+          '0_2': 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
+          '0': 'Bu konuya ait tüm bildirimleri görmezden geliyorsunuz.'
+        watching_pm:
+          title: "Gözleniyor"
+          description: "Bu özel mesajlaşmadaki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek."
+        watching:
+          title: "Gözleniyor"
+          description: "Bu konudaki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek."
+        tracking_pm:
+          title: "Takip Ediliyor"
+          description: "Okunmamış ve yeni gönderi sayısı özel mesaj bölümünün yanında belirecek. Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız."
+        tracking:
+          title: "Takip Ediliyor"
+          description: "Okunmamış ve yeni gönderi sayısı başlığın yanında belirecek. Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız."
+        regular:
+          title: "Standart"
+          description: "Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız."
+        regular_pm:
+          title: "Standart"
+          description: "Biri @isim şeklinde sizden bahsederse ya da gönderinize özel mesajdan cevap verirse bildirim alacaksınız."
+        muted_pm:
+          title: "Susturuldu"
+          description: "Bu özel mesajlaşmayla ilgili hiç bir bildirim almayacaksınız."
+        muted:
+          title: "Susturuldu"
+          description: "Bu konu okunmamışlar sekmenizde belirmeyecek, ve hakkında hiç bir bildirim almayacaksınız."
+      actions:
+        recover: "Konuyu Geri Getir"
+        delete: "Konuyu Sil"
+        open: "Konuyu Aç"
+        close: "Konuyu Kapat"
+        auto_close: "Otomatik Kapatma"
+        make_banner: "Manşet Konusu"
+        remove_banner: "Manşet Konusunu Kaldır"
+        unpin: "Konuyu Başa Tutturma"
+        pin: "Konuyu Başa Tuttur"
+        pin_globally: "Konuyu Her Yerde Başa Tuttur"
+        unarchive: "Konuyu Arşivden Kaldır"
+        archive: "Konuyu Arşivle"
+        invisible: "Listelenmemiş Yap"
+        visible: "Listelenmiş Yap"
+        reset_read: "Görüntüleme Verilerini Sıfırla"
+        multi_select: "Gönderileri Seç"
+      reply:
+        title: 'Cevapla'
+        help: 'bu konuya bir cevap oluşturmaya başlayın'
+      clear_pin:
+        title: "Başa tutturmayı iptal et"
+        help: "Bu konunun başa tutturulması iptal edilsin ki artık konu listenizin en üstünde gözükmesin"
+      share:
+        title: 'Paylaş'
+        help: 'bu konunun bağlantısını paylaşın'
+      flag_topic:
+        title: 'Bayrakla'
+        help: 'bu gönderiyi kontrol edilmesi için özel olarak bayraklayın ya da bununla ilgili özel bir bildirim yollayın'
+        success_message: 'Bu konuyu başarıyla bayrakladınız.'
+      inviting: "Davet Ediliyor..."
+      automatically_add_to_groups_optional: "Bu davet şu gruplara erişimi de içerir: (opsiyonel, sadece adminler için)"
+      automatically_add_to_groups_required: "Bu davet şu gruplara erişimi de içerir: (<b>Gerekli</b>, sadece adminler için)"
+      invite_private:
+        title: 'Özel Mesajlaşmaya Davet Et'
+        email_or_username: "Davet edilenin Emaili veya Kullanıcı Adı"
+        email_or_username_placeholder: "email veya kullanıcı adı"
+        action: "Davet et"
+        success: "O kullanıcıyı bu özel mesajlaşmaya katılması için davet ettik. "
+        error: "Üzgünüz, kullanıcı davet edilirken bir hata oluştu."
+        group_name: "grup adı"
+      invite_reply:
+        title: 'Davet et'
+        action: 'E-Posta ile davet et'
+        help: 'arkadaşlarınıza davet gönderin ki tek bir tık ile bu konuyu cevaplayabilsinler'
+        to_topic: "Arkadaşınıza, giriş yapması gerekmeden, bir linke tıklayarak hemen konuya katılıp cevap yazabilmesi için kısa bir email göndereceğiz."
+        to_forum: "Arkadaşınıza, giriş yapması gerekmeden, bir linke tıklayarak katılabilmesi için kısa bir email göndereceğiz. "
+        email_placeholder: 'isim@örnek.com'
+        success: " <b>{{email}}</b> adresine bir davet emaili attık. Davetiniz kabul edildiğinde size bir bildirim göndereceğiz. Kullanıcı sayfanızdaki davetiyeler sekmesinden davetlerinizi takip edebilirsiniz."
+        error: "Üzgünüz, o kişiyi davet edemedik. Zaten kullanıcı olabilir mi?"
+      login_reply: 'Cevaplamak için Giriş Yap'
+      filters:
+        n_posts:
+          other: "{{count}} gönderi"
+        cancel: "Filteri kaldır"
+      split_topic:
+        title: "Yeni Konuya Geç"
+        action: "yeni konuya geç"
+        topic_name: "Yeni Konu Adı"
+        error: "Gönderiler yeni konuya taşınırken bir hata oluştu."
+        instructions:
+          other: "Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz <b>{{count}}</b> gönderi ile doldurmak üzeresiniz."
+      merge_topic:
+        title: "Var Olan Bir Konuya Taşı"
+        action: "var olan bir konuya taşı"
+        error: "Gönderiler o konuya taşınırken bir hata oluştu."
+        instructions:
+          other: "Lütfen bu <b>{{count}}</b> gönderiyi taşımak istediğiniz konuyu seçin. "
+      change_owner:
+        title: "Gönderilerin Sahibini Değiştir"
+        action: "sahipliğini değiştir"
+        error: "Gönderilerin sahipliği değiştirilirken bir hata oluştu."
+        label: "Gönderilerin Yeni Sahibi"
+        placeholder: "yeni sahibin kullanıcı adı"
+        instructions:
+          other: "Lütfen <b>{{old_user}}</b> kullanıcısına ait {{count}} gönderinin yeni sahibini seçin."
+        instructions_warn: "Bu gönderi ile ilgili geriye dönük biriken bildirimler yeni kullanıcıya aktarılmayacak.<br>Uyarı: Şu an, yeni kullanıcıya hiç bir gönderi-tabanlı ek bilgi aktarılmıyor. Dikkatli olun."
+      multi_select:
+        select: 'seç'
+        selected: '({{count}}) seçildi'
+        select_replies: 'cevaplarıyla seç'
+        delete: seçilenleri sil
+        cancel: seçimi iptal et
+        select_all: hepsini seç
+        deselect_all: tüm seçimi kaldır
+        description:
+          other: <b>{{count}}</b> gönderi seçtiniz.
+    post:
+      reply: "{{replyAvatar}} {{username}} kullanıcısına ait {{link}} cevaplanıyor"
+      reply_topic: "Cevapla {{link}}"
+      quote_reply: "alıntıyla cevapla"
+      edit: "{{replyAvatar}} {{username}} ait {{link}} düzenleniyor"
+      edit_reason: "Neden: "
+      post_number: "gönderi {{number}}"
+      in_reply_to: "cevapla"
+      last_edited_on: "gönderinin en son düzenlenme tarihi"
+      reply_as_new_topic: "Bağlantılı Konu oluşturarak Cevapla"
+      continue_discussion: "{{postLink}} Gönderisinden tartışmaya devam ediliyor:"
+      follow_quote: "alıntılanan mesaja git"
+      show_full: "Gönderinin Tamamını Göster"
+      show_hidden: 'Gizlenmiş içeriği görüntüle.'
+      deleted_by_author:
+        other: "(yazarı tarafından geri alınan gönderi,  %{count} saat içinde otomatik olarak silinecek.)"
+      expand_collapse: "aç/kapat"
+      gap:
+        other: "{{count}} gizlenmiş gönderi"
+      more_links: "{{count}} daha..."
+      unread: "Gönderi okunmamış"
+      has_replies:
+        other: "Cevaplar"
+      errors:
+        create: "Üzgünüz, gönderiniz oluşturulurken bir hata oluştu. Lütfen tekrar deneyin."
+        edit: "Üzgünüz, gönderiniz düzenlenirken bir hata oluştu. Lütfen tekrar deneyin. "
+        upload: "Üzgünüz, dosya yüklenirken bir hata oluştu. Lütfen tekrar deneyin."
+        attachment_too_large: "Üzgünüz, yükleyeme çalıştığınız dosya çok büyük (maksimum {{max_size_kb}}kb olabilir)"
+        file_too_large: "Üzgünüz, yüklemeye çalıştığınız dosya çok büyük. (maksimum boyut {{max_size_kb}}kb)"
+        too_many_uploads: "Üzgünüz, aynı anda birden fazla dosya yükleyemezsiniz."
+        upload_not_authorized: "Üzgünüz, yüklemeye çalıştığınız dosya tipine izin verilmiyor. (izin verilen uzantılar: {{authorized_extensions}})."
+        image_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar resim yükleyemiyorlar."
+        attachment_upload_not_allowed_for_new_user: "Üzgünüz, yeni kullanıcılar dosya ekleyemiyorlar."
+        attachment_download_requires_login: "Üzgünüz, eklentileri indirebilmek için sisteme giriş yapmış olmanız gerekiyor."
+      abandon:
+        confirm: "Gönderinizden vazgeçtiğinize emin misiniz?"
+        no_value: "Hayır, kalsın"
+        yes_value: "Evet, vazgeç"
+      via_email: "bu gönderi email ile iletildi"
+      wiki:
+        about: "bu gönderi bir wiki; acemi kullanıcılar düzenleyebilir"
+      archetypes:
+        save: 'Seçenekleri Kaydet'
+      controls:
+        reply: "bu gönderiye bir cevap oluşturmaya başlayın"
+        like: "bu gönderiyi beğen"
+        has_liked: "bu gönderiyi beğendiniz"
+        undo_like: "beğenmekten vazgeç"
+        edit: "bu gönderiyi düzenle"
+        edit_anonymous: "Üzgünüz, ama bu gönderiyi düzenleyebilmek için sisteme giriş yapmalısınız."
+        flag: "bu gönderiyi kontrol edilmesi için özel olarak bayraklayın ya da bununla ilgili özel bir bildirim yollayın"
+        delete: "bu gönderiyi sil"
+        undelete: "bu gönderinin silinmesini geri al"
+        share: "bu gönderinin bağlantısını paylaşın"
+        more: "Daha fazla"
+        delete_replies:
+          confirm:
+            other: "Bu gönderiye verilen {{count}} direk cevabı da silmek istiyor musunuz?"
+          yes_value: "Evet, cevapları da sil"
+          no_value: "Hayır, sadece bu gönderiyi"
+        admin: "gönderiyle alakalı admin aksiyonları"
+        wiki: "Wiki Yap"
+        unwiki: "Wiki'yi Kaldır"
+        convert_to_moderator: "Görevli Rengi Ekle"
+        revert_to_regular: "Görevli Rengini Kaldır"
+        rebake: "HTML'i yeniden kur"
+        unhide: "Gizleme"
+      actions:
+        flag: 'Bayrakla'
+        defer_flags:
+          other: "Bayrağı ertele"
+        it_too:
+          off_topic: "Bir de bayrakla"
+          spam: "Bir de bayrakla"
+          inappropriate: "Bir de bayrakla"
+          custom_flag: "Bir de bayrakla"
+          bookmark: "Bir de işaretle"
+          like: "Bir de beğen"
+          vote: "Bir de oyla"
+        undo:
+          off_topic: "Bayrağı geri al"
+          spam: "Bayrağı geri al"
+          inappropriate: "Bayrağı geri al"
+          bookmark: "İşareti geri al"
+          like: "Beğenini geri al"
+          vote: "Oyunu geri al"
+        people:
+          off_topic: "{{icons}} konu dışı olarak bayraklandı"
+          spam: "{{icons}} spam olarak bayraklandı"
+          inappropriate: "{{icons}} uygunsuz olarak bayraklandı"
+          notify_moderators: "{{icons}} bildirim gönderilen moderatörler"
+          notify_moderators_with_url: "{{icons}} <a href='{{postUrl}}'>bildirim gönderilen moderatörler</a>"
+          notify_user: "{{icons}} özel mesaj gönderdi"
+          notify_user_with_url: "{{icons}} <a href='{{postUrl}}'>özel mesaj</a> gönderdi"
+          bookmark: "{{icons}} bunu işaretledi"
+          like: "{{icons}} bunu beğendi"
+          vote: "{{icons}} bunun için oyladı"
+        by_you:
+          off_topic: "Bunu konu dışı olarak bayrakladınız"
+          spam: "Bunu spam olarak bayrakladınız"
+          inappropriate: "Bunu uygunsuz olarak bayrakladınız"
+          notify_moderators: "Bunu moderasyon için bayrakladınız"
+          notify_user: "Bu kullanıcıya özel mesaj gönderdiniz"
+          bookmark: "Bu gönderiyi işaretlediniz"
+          like: "Bunu beğendiniz"
+          vote: "Bu gönderiyi oyladınız"
+        by_you_and_others:
+          off_topic:
+            other: "Siz ve {{count}} diğer kişi bunu konu dışı olarak bayrakladı"
+          spam:
+            other: "Siz ve {{count}} diğer kişi bunu spam olarak bayrakladı"
+          inappropriate:
+            other: "Siz ve {{count}} diğer kişi bunu uygunsuz olarak bayrakladı"
+          notify_moderators:
+            other: "Siz ve {{count}} diğer kişi bunu denetlenmesi için bayrakladı"
+          notify_user:
+            other: "Siz ve {{count}} diğer kişi bu kullanıcıya özel mesaj gönderdi"
+          bookmark:
+            other: "Siz ve {{count}} diğer kişi bu gönderiyi işaretledi"
+          like:
+            other: "Siz ve {{count}} diğer kişi bunu beğendi"
+          vote:
+            other: "Siz ve {{count}} kişi bu gönderiyi oyladı"
+        by_others:
+          off_topic:
+            other: "{{count}} kişi bunu konu dışı olarak bayrakladı"
+          spam:
+            other: "{{count}} kişi bunu spam olarak bayrakladı"
+          inappropriate:
+            other: "{{count}} kişi bunu uygunsuz olarak bayrakladı"
+          notify_moderators:
+            other: "{{count}} kişi bunu moderasyon için bayrakladı"
+          notify_user:
+            other: "{{count}} kişi bu kullanıcıya özel mesaj gönderdi"
+          bookmark:
+            other: "{{count}} kişi bu gönderiyi işaretledi"
+          like:
+            other: "{{count}} kişi bunu beğendi"
+          vote:
+            other: "{{count}} kişi bu gönderiyi oyladı"
+      edits:
+        one: 1 düzenleme
+        other: "{{count}} düzenleme"
+        zero: hiç bir düzenleme
+      delete:
+        confirm:
+          other: "Tüm bu gönderileri silmek istediğinize emin misiniz?"
+      revisions:
+        controls:
+          first: "İlk revizyon"
+          previous: "Önceki revizyon"
+          next: "Sonraki revizyon"
+          last: "Son revizyon"
+          hide: "Düzenlemeyi gizle"
+          show: "Düzenlemeyi göster"
+          comparing_previous_to_current_out_of_total: "<strong>{{previous}}</strong> vs <strong>{{current}}</strong> / {{total}}"
+        displays:
+          inline:
+            title: "İşlenmiş çıktıyı ekleme ve çıkarmalarla birlikte göster"
+            button: '<i class="fa fa-square-o"></i> HTML'
+          side_by_side:
+            title: "İşlenmiş diff çıktılarını yan yana göster"
+            button: '<i class="fa fa-columns"></i> HTML'
+          side_by_side_markdown:
+            title: "İşlenmemiş diff kaynaklarını yan yana göster"
+            button: '<i class="fa fa-columns"></i> Raw'
+        details:
+          edited_by: "Düzenleyen"
+    category:
+      can: 'yapabilir&hellip;'
+      none: '(kategori yok)'
+      choose: 'Kategori seç&hellip;'
+      edit: 'düzenle'
+      edit_long: "Düzenle"
+      view: 'Bu Kategorideki Konuları Görüntüle'
+      general: 'Genel'
+      settings: 'Ayarlar'
+      delete: 'Kategoriyi Sil'
+      create: 'Yeni Kategori'
+      save: 'Kategoriyi Kaydet'
+      creation_error: Kategori oluşturulurken hata oluştu.
+      save_error: Kategori kaydedilirken hata oluştu.
+      name: "Kategori Adı"
+      description: "Açıklama"
+      topic: "kategori konusu"
+      logo: "Kategori Logosu Resmi"
+      background_image: "Kategori Arka Planı Görseli"
+      badge_colors: "Rozet renkleri"
+      background_color: "Arka plan rengi"
+      foreground_color: "Ön plan rengi"
+      name_placeholder: "Maksimum bir ya da iki kelime"
+      color_placeholder: "Herhangi bir web rengi"
+      delete_confirm: "Bu kategoriyi silmek istediğinize emin misiniz?"
+      delete_error: "Kategoriyi silinirken bir hata oluştu."
+      list: "Kategorileri Listele"
+      no_description: "Lütfen bu kategori için bir açıklama girin."
+      change_in_category_topic: "Açıklamayı Düzenle"
+      already_used: 'Bu renk başka bir kategori için kullanıldı'
+      security: "Güvenlik"
+      images: "Resimler"
+      auto_close_label: "Şu kadar süreden sonra konuları otomatik olarak kapat: "
+      auto_close_units: "saat"
+      email_in: "Özel gelen-email adresi:"
+      email_in_allow_strangers: "Hesabı olmayan, anonim kullanıcılardan email kabul et"
+      email_in_disabled: "Email üzerinden yeni konu oluşturma özelliği Site Ayarları'nda devre dışı bırakılmış. Email üzerinden yeni konu oluşturma özelliğini etkinleştirmek için,"
+      email_in_disabled_click: '"emailla" ayarını etkinleştir'
+      allow_badges_label: "Bu kategoride rozet verilmesine izin ver"
+      edit_permissions: "İzinleri Düzenle"
+      add_permission: "İzin Ekle"
+      this_year: "bu yıl"
+      position: "pozisyon"
+      default_position: "Varsayılan Pozisyon"
+      position_disabled: "Kategoriler aktiflik sıralarına göre görünecekler. Listelerdeki kategorilerin sıralamalarını kontrol edebilmek için,"
+      position_disabled_click: '"sabitlenmiş kategori pozisyonları" ayarını etklinleştirin.'
+      parent: "Üst Kategori"
+      notifications:
+        watching:
+          title: "Gözleniyor"
+          description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konularla ilgili bildiri alacaksınız, ayrıca okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek. "
+        tracking:
+          title: "Takip Ediliyor"
+          description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksiniz. Okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek."
+        regular:
+          title: "Standart"
+          description: "Biri @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız."
+        muted:
+          title: "Susturuldu"
+          description: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksınız ve okunmamışlar sekmenizde belirmeyecek. "
+    flagging:
+      title: 'Topluluğumuzun medeni kalmasına yardımcı olduğunuz için teşekkürler!'
+      private_reminder: 'bayraklar özeldir, <b>sadece</b> görevlilere gözükür'
+      action: 'Gönderiyi Bayrakla'
+      take_action: "Aksiyon Al"
+      notify_action: 'Özel mesaj'
+      delete_spammer: "Spamciyi Sil"
+      delete_confirm: "Bu kullanıcının <b>%{posts}</b> gönderisini ve <b>%{topics}</b> konusunu silmek, hesabını kapatmak, kullandığı IP Adresi <b>%{ip_address}</b> üzerinden hesap açılmasını engellemek, ve  <b>%{email}</b> email adresini kalıcı engellenenler listesine eklemek üzeresiniz. Bu kullanıcının gerçekten spamci olduğuna emin misiniz?"
+      yes_delete_spammer: "Evet, Spamciyi Sil"
+      ip_address_missing: "(uygulanamaz)"
+      hidden_email_address: "(gizli)"
+      submit_tooltip: "Bayrağı gönder"
+      take_action_tooltip: "Topluluktan daha fazla bayrak beklemek yerine hızlıca bayrak eşiğine erişin"
+      cant: "Üzgünüz, şu an bu gönderiyi bayraklayamazsınız."
+      formatted_name:
+        off_topic: "Konu Dışı"
+        inappropriate: "Uygunsuz"
+        spam: "Spam"
+      custom_placeholder_notify_user: "Açıklayıcı, yapıcı, ve her zaman nazik olun."
+      custom_placeholder_notify_moderators: "Sizi neyin endişelendirdiğini açıklayıcı bir dille bize bildirin, ve mümkün olan yerlerde konu ile alakalı bağlantıları paylaşın."
+      custom_message:
+        at_least: "en az {{n}} karakter girin"
+        more: "{{n}} daha var.."
+        left: "{{n}} kaldı"
+    flagging_topic:
+      title: "Topluluğumuzun medeni kalmasına yardımcı olduğunuz için teşekkürler!"
+      action: "Konuyu Bayrakla"
+      notify_action: "Özel mesaj"
+    topic_map:
+      title: "Konu Özeti"
+      links_shown: "tüm {{totalLinks}} bağlantıları göster..."
+      clicks:
+        other: "%{count} tıklama"
+    topic_statuses:
+      warning:
+        help: "Bu resmi bir uyarıdır."
+      locked:
+        help: "Bu konu kapatıldı; artık yeni cevaplar kabul edilmiyor"
+      unpinned:
+        title: "Başa tutturma kaldırıldı"
+        help: "Bu konu artık başa tutturulmuyor; varsayılan sıralama içerisinde görünecek"
+      pinned_globally:
+        title: "Her Yerde Başa Tutturuldu"
+        help: "Bu konu her yerde başa tutturuldu; tüm listelerin başında görünecek"
+      pinned:
+        title: "Başa Tutturuldu"
+        help: "Bu konu başa tutturuldu; kendi kategorisinin en üstünde görünecek"
+      archived:
+        help: "Bu başlık arşive kaldırıldı; donduruldu ve değiştirilemez"
+      invisible:
+        help: "Bu konu listelenmemiş; konu listelerinde görünmeyecek, ve sadece doğrudan bağlantı aracılığıyla erişilebilecek"
+    posts: "Gönderiler"
+    posts_lowercase: "gönderiler"
+    posts_long: "bu konuda {{number}} gönderi var"
+    posts_likes_MF: |
+      Bu konuda {ratio, select,
+        low {beğeni/gönderi oranı yüksek}
+        med {beğeni/gönderi oranı çok yüksek}
+        high {beğeni/gönderi oranı aşırı yüksek}
+        other {}} {count, plural, one {1 gönderi} other {# gönderi}} var
+    original_post: "Ana Gönderi"
+    views: "Görüntülemeler"
+    views_lowercase: "görüntülemeler"
+    replies: "Cevaplar"
+    views_long: "bu konu {{number}} defa görüntülendi"
+    activity: "Aktivite"
+    likes: "Beğeniler"
+    likes_lowercase: "beğeniler"
+    likes_long: "bu konuda {{number}} beğeni var"
+    users: "Kullanıcılar"
+    users_lowercase: "kullanıcılar"
+    category_title: "Kategori"
+    history: "Geçmiş"
+    changed_by: "Yazan {{author}}"
+    raw_email:
+      title: "Ham Email"
+      not_available: "Müsait değil!"
+    categories_list: "Kategori Listesi"
+    filters:
+      with_topics: "%{filter} konular"
+      with_category: "%{filter} %{category} konular"
+      latest:
+        title: "En Son"
+        help: "yakın zamanda gönderi alan konular"
+      hot:
+        title: "Sıcak"
+        help: "en sıcak konulardan bir derleme"
+      starred:
+        title: "Yıldızlı"
+        help: "yıldızladığınız konular"
+      read:
+        title: "Okunmuş"
+        help: "okuduğunuz başlıklar, okunma sırasına göre"
+      categories:
+        title: "Kategoriler"
+        title_in: "Kategori - {{categoryName}}"
+        help: "kategori bazında tüm konular"
+      unread:
+        title:
+          zero: "Okunmamış"
+          one: "Okunmamış (1)"
+          other: "Okunmamış ({{count}})"
+        help: "okunmamış gönderiler bulunan gözlediğiniz ya da takip ettiğiniz konular"
+        lower_title_with_count:
+          one: "1 okunmamış"
+          other: "{{count}} okunmamış"
+      new:
+        lower_title_with_count:
+          one: "1 yeni"
+          other: "{{count}} yeni"
+        lower_title: "yeni"
+        title:
+          zero: "Yeni"
+          one: "Yeni (1)"
+          other: "Yeni ({{count}}) "
+        help: "son birkaç günde oluşturulmuş konular"
+      posted:
+        title: "Gönderilerim"
+        help: "gönderi oluşturduğunuz konular"
+      category:
+        title:
+          zero: "{{categoryName}}"
+          one: "{{categoryName}} (1)"
+          other: "{{categoryName}} ({{count}})"
+        help: "{{categoryName}} kategorisindeki en son konular"
+      top:
+        title: "En Popüler"
+        help: "geçtiğimiz yıl, ay, hafta veya gündeki en aktif başlıklar"
+        yearly:
+          title: "Yılın En Popülerleri"
+        monthly:
+          title: "Ayın En Popülerleri"
+        weekly:
+          title: "Haftanın En Popülerleri"
+        daily:
+          title: "Günün En Popülerleri"
+        this_year: "Bu yıl"
+        this_month: "Bu ay"
+        this_week: "Bu hafta"
+        today: "Bugün"
+        other_periods: "daha fazla popüler konuya bakın"
+    browser_update: 'Malesef,  <a href="http://www.discourse.org/faq/#browser">tarayıcınız bu site için çok eski</a>. Lütfen <a href="http://browsehappy.com">tarayıcınızı güncelleyin</a>.'
+    permission_types:
+      full: "Oluştur / Cevapla / Bak"
+      create_post: "Cevapla / Bak"
+      readonly: "Bak"
+  admin_js:
+    type_to_filter: "filtre girin..."
+    admin:
+      title: 'Discourse Admin'
+      moderator: 'Moderatör'
+      dashboard:
+        title: "Gösterge Paneli"
+        last_updated: "Gösterge panelinin son güncellenmesi:"
+        version: "Versiyon"
+        up_to_date: "Sistem güncel durumda!"
+        critical_available: "Önemli bir güncelleme var."
+        updates_available: "Yeni güncellemeler var."
+        please_upgrade: "Lütfen güncelle!"
+        no_check_performed: "Güncelleme kontrolü gerçekleşmedi, lütfen sidekiq'in çalışır durumda olduğundan emin olun."
+        stale_data: "Güncelleme kontrolü bir süredir gerçekleşmiyor, lütfen sidekiq'in çalışır durumda olduğundan emin olun."
+        version_check_pending: "Görünüşe daha yeni güncelleme yaptınız. Harika!"
+        installed_version: "Yüklendi"
+        latest_version: "En Son"
+        problems_found: "Discourse kurulumuyla ilgili bazı sorunlar bulundu: "
+        last_checked: "Son kontrol"
+        refresh_problems: "Yenile"
+        no_problems: "Herhangi bir sorun bulunamadı."
+        moderators: 'Moderatörler:'
+        admins: 'Adminler:'
+        blocked: 'Engellenmiş:'
+        suspended: 'Uzaklaştırılmışlar:'
+        private_messages_short: "Özel Mesajlar"
+        private_messages_title: "Özel Mesajlar"
+        reports:
+          today: "Bugün"
+          yesterday: "Dün"
+          last_7_days: "Son 7 Gün"
+          last_30_days: "Son 30 Gün"
+          all_time: "Tüm Zamanlar"
+          7_days_ago: "7 Gün Önce"
+          30_days_ago: "30 Gün Önce"
+          all: "Hepsi"
+          view_table: "tablo"
+          view_chart: "sütunlu grafik"
+          refresh_report: "Raporu Yenile"
+          start_date: "Başlangıç Tarihi"
+          end_date: "Bitiş Tarihi"
+      commits:
+        latest_changes: "En son değişiklikler: lütfen sık güncelleyin!"
+        by: "tarafından"
+      flags:
+        title: "Bayraklar"
+        old: "Eski"
+        active: "Aktif"
+        agree: "Onayla"
+        agree_title: "Bu bayrağı geçerli ve doğru olarak onayla"
+        agree_flag_modal_title: "Onayla ve..."
+        agree_flag_hide_post: "Onayla (gönderiyi gizle + özel mesaj yolla)"
+        agree_flag_hide_post_title: "Bu gönderiyi gizle ve kullanıcıya acilen düzenleme yapmasını belirten otomatik özel mesaj gönder"
+        agree_flag_restore_post: "Kabul ediyorum (gönderiyi geri al)"
+        agree_flag_restore_post_title: "Gönderiyi geri al"
+        agree_flag: "Bayrağı onayla"
+        agree_flag_title: "Bayrağı onayla ve gönderide değişiklik yapma"
+        defer_flag: "Ertele"
+        defer_flag_title: "Bu bayrağı kaldır; şu an için bir aksiyon almak gerekmiyor."
+        delete: "Sil"
+        delete_title: "Bu bayrağın ait olduğu gönderiyi sil."
+        delete_post_defer_flag: "Gönderiyi sil ve bayrağı Ertele"
+        delete_post_defer_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil."
+        delete_post_agree_flag: "Gönderiyi sil ve bayrağı Onayla"
+        delete_post_agree_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil."
+        delete_flag_modal_title: "Sil ve..."
+        delete_spammer: "Spamciyi Sil"
+        delete_spammer_title: "Kullanıcıyı ve kullanıcıya ait tüm konu ve gönderileri kaldır. "
+        disagree_flag_unhide_post: "Onaylama (gönderiyi gizleme)"
+        disagree_flag_unhide_post_title: "Bu gönderiye ait tüm bayrakları kaldır ve gönderiyi tekrar görünür hale getir"
+        disagree_flag: "Onaylama"
+        disagree_flag_title: "Bu bayrağı geçersiz ya da yanlış sayarak reddet"
+        clear_topic_flags: "Tamam"
+        clear_topic_flags_title: "Bu konu araştırıldı ve sorunlar çözüldü. Bayrakları kaldırmak için Tamam butonuna basın. "
+        more: "(daha fazla cevap...)"
+        dispositions:
+          agreed: "onaylandı"
+          disagreed: "onaylanmadı"
+          deferred: "ertelendi"
+        flagged_by: "Bayraklayan"
+        resolved_by: "Çözen"
+        took_action: "Aksiyon aldı"
+        system: "Sistem"
+        error: "Bir şeyler ters gitti"
+        reply_message: "Yanıtla"
+        no_results: "Bayrak yok. "
+        topic_flagged: "Bu <strong>konu</strong> bayraklandı."
+        visit_topic: "Aksiyon almak için konuyu ziyaret edin"
+        was_edited: "İlk bayraktan sonra gönderi düzenlendi"
+        previous_flags_count: "Bu gönderi daha önce {{count}} defa bayraklanmış."
+        summary:
+          action_type_3:
+            other: "konu dışı x{{count}}"
+          action_type_4:
+            other: "uygunsuz x{{count}}"
+          action_type_6:
+            other: "özel x{{count}}"
+          action_type_7:
+            other: "özel x{{count}}"
+          action_type_8:
+            other: "spam x{{count}}"
+      groups:
+        primary: "Ana Grup"
+        no_primary: "(ana grup yok)"
+        title: "Grup"
+        edit: "Grupları Düzenle"
+        refresh: "Yenile"
+        new: "Yeni"
+        selector_placeholder: "kullanıcıları ekle"
+        name_placeholder: "Grup adı, kullanıcı adındaki gibi boşluksuz olmalı"
+        about: "Grup üyeliğinizi ve isimleri burada düzenleyin"
+        group_members: "Grup üyeleri"
+        delete: "Sil"
+        delete_confirm: "Grup silinsin mi?"
+        delete_failed: "Grup silinemedi. Bu otomatik oluşturulmuş bir grup ise, yok edilemez."
+      api:
+        generate_master: "Master API Anahtarı üret"
+        none: "Şu aktif API anahtarı bulunmuyor."
+        user: "Kullanıcı"
+        title: "API"
+        key: "API Anahtarı"
+        generate: "Oluştur"
+        regenerate: "Tekrar Oluştur"
+        revoke: "İptal Et"
+        confirm_regen: "API Anahtarını yenisi ile değiştirmek istediğinize emin misiniz?"
+        confirm_revoke: "Anahtarı iptal etmek istediğinize emin misiniz?"
+        info_html: "API anahtarınız JSON çağrıları kullanarak konu oluşturup güncelleyebilmenize olanak sağlayacaktır."
+        all_users: "Tüm kullanıcılar"
+        note_html: "Bu anahtarı <strong>gizli</strong> tutun, anahtara sahip kullanıcılar her hangi bir kullanıcı adı altında istedikleri gönderiyi oluşturabilirler."
+      backups:
+        title: "Yedekler"
+        menu:
+          backups: "Yedekler"
+          logs: "Kayıtlar"
+        none: "Yedek bulunmuyor."
+        read_only:
+          enable:
+            title: "Salt-okunur modunu etkinleştir"
+            text: "Salt-okunur modunu etkinleştir"
+            confirm: "Salt-okunur modunu etkinleştirmek istediğinize emin misiniz?"
+          disable:
+            title: "Salt-okunur modunu etkisizleştir"
+            text: "Salt-okunur modunu etkisizleştir"
+        logs:
+          none: "Henüz kayıt bulunmuyor..."
+        columns:
+          filename: "Dosya adı"
+          size: "Boyut"
+        upload:
+          text: "Yükle"
+          uploading: "Yükleniyor..."
+          success: "'{{filename}}' başarıyla yüklendi."
+          error: "'{{filename}}': {{message}} yüklenirken bir hata oluştu"
+        operations:
+          is_running: "İşlem devam ediyor..."
+          failed: "{{operation}} gerçekleşemedi. Lütfen kayıtları kontrol edin."
+          cancel:
+            text: "İptal et"
+            title: "Devam eden işlemi iptal et"
+            confirm: "Devam eden işlemi iptal etmek istediğinize emin misiniz?"
+          backup:
+            text: "Yedek"
+            title: "Yedek oluştur"
+            confirm: "Yeni bir yedekleme başlatmak istiyor musunuz?"
+            without_uploads: "Evet (dosya eklemeyin)"
+          download:
+            text: "İndir"
+            title: "Yedeği indir"
+          destroy:
+            text: "Sil"
+            title: "Yedeği kaldır"
+            confirm: "Bu yedeği yok etmek istediğinize emin misiniz?"
+          restore:
+            is_disabled: "Geri getirme site ayarlarında devredışı bırakılmış."
+            text: "Geri Getir"
+            title: "Yedeği geri getir"
+            confirm: "Yedeği geri getirmek istediğinize emin misiniz?"
+          rollback:
+            text: "Geri Çağır"
+            title: "Veritabanını calışan son haline geri al."
+            confirm: "Veri tabanını  çalışan bir önceki versyonuna geri almak istediğinizden emin misiniz?"
+      export_csv:
+        success: "Dışa aktarım başlatıldı, kısa süre içinde gelişmelerden haberdar edileceksiniz."
+        failed: "Dışa aktarırken hata oluştu. Lütfen kayıtları kontrol edin."
+        button_text: "Dışa aktar"
+      customize:
+        title: "Özelleştir"
+        long_title: "Site Özelleştirmeleri"
+        css: "CSS"
+        header: "Başlık"
+        footer: "Altbilgi"
+        override_default: "Standart stil sayfasını eklemeyin"
+        enabled: "Etkinleştirildi mi?"
+        preview: "önizleme"
+        undo_preview: "önizlemeyi kaldır"
+        rescue_preview: "varsayılan stil"
+        explain_preview: "Websitesine bu özelleştirilmiş stil sayfası ile bak"
+        explain_undo_preview: "Şu an etkin olan özelleştirilmiş stil sayfasına geri dön"
+        explain_rescue_preview: "Websitesine varsayılan stil sayfası ile bak"
+        save: "Kaydet"
+        new: "Yeni"
+        new_style: "Yeni Stil"
+        delete: "Sil"
+        delete_confirm: "Bu özelleştirmeyi sil?"
+        about: "Websitesindeki CSS stil sayfalarını ve HTML başlıklarını değiştir. Özelleştirme ekleyerek başla."
+        color: "Renk"
+        opacity: "Opaklık"
+        copy: "Kopyala"
+        css_html:
+          title: "CSS/HTML"
+          long_title: "CSS ve HTML Özelleştirmeleri"
+        colors:
+          title: "Renkler"
+          long_title: "Renk Düzenleri"
+          about: "Websitesindeki renkleri CSS yazmadan değiştir. Renk düzeni ekleyerek başla."
+          new_name: "Yeni Renk Düzeni"
+          copy_name_prefix: "Kopyası"
+          delete_confirm: "Bu renk düzenini sil?"
+          undo: "geri al"
+          undo_title: " Son kayıt esnasında yapılan bu renkteki değişiklikleri geri al."
+          revert: "eski haline getir"
+          revert_title: "Bu rengi Discourse'un varsayılan renk düzenine sıfırla."
+          primary:
+            name: 'birincil'
+            description: 'Çoğu yazı, ikon ve kenarların rengi.'
+          secondary:
+            name: 'ikincil'
+            description: 'Ana arkaplan ve bazı butonların yazı rengi.'
+          tertiary:
+            name: 'üçüncül'
+            description: 'Bağlantı, bazı buton, bildiri ve vurguların rengi.'
+          quaternary:
+            name: "dördüncül"
+            description: "Navigasyon bağlantıları."
+          header_background:
+            name: "başlık arkaplanı"
+            description: "Websitesi'nin sayfa başlığının arkaplan rengi."
+          header_primary:
+            name: "birincil başlık"
+            description: "Websitesi'nin sayfa başlığındaki yazı ve ikonlar."
+          highlight:
+            name: 'vurgula'
+            description: 'Sayfada vurgulanmış ögelerin, gönderi ve konu gibi, arkaplan rengi.'
+          danger:
+            name: 'tehlike'
+            description: 'Gönderi ve konu silme gibi aksiyonlar için vurgulama rengi.'
+          success:
+            name: 'başarı'
+            description: 'Aksiyonun başarılı olduğunu göstermek için kullanılır.'
+          love:
+            name: 'sevgi'
+            description: "Beğen butonunun rengi."
+          wiki:
+            name: 'wiki'
+            description: "wiki gönderilerinin arka plan rengi."
+      email:
+        title: "Email"
+        settings: "Ayarlar"
+        all: "Hepsi"
+        sending_test: "Test emaili gönderiliyor..."
+        error: "<b>HATA</b> - %{server_error}"
+        test_error: "Test emailinin gönderilmesinde sorun yaşandı. Lütfen email ayarlarınızı tekrar kontrol edin, yer sağlayıcınızın email bağlantılarını bloke etmediğinden emin olun, ve tekrar deneyin."
+        sent: "Gönderildi"
+        skipped: "Atlandı"
+        sent_at: "Gönderildiği Zaman"
+        time: "Zaman"
+        user: "Kullanıcı"
+        email_type: "Email Tipi"
+        to_address: "Gönderi Adresi"
+        test_email_address: "test için email adresi"
+        send_test: "Test Emaili Gönder"
+        sent_test: "gönderildi!"
+        delivery_method: "Gönderme Metodu"
+        preview_digest: "Özeti Önizle"
+        preview_digest_desc: "Aktif olmayan kullanıcılara gönderilen haftalık özet emaillarının içeriğini özleyin"
+        refresh: "Yenile"
+        format: "Format"
+        html: "html"
+        text: "yazı"
+        last_seen_user: "Son Görülen Kullanıcı:"
+        reply_key: "Cevapla Tuşu"
+        skipped_reason: "Nedeni Atla"
+        logs:
+          none: "Hiç bir kayıt bulunamadı."
+          filters:
+            title: "Filtre"
+            user_placeholder: "kullanıcıadı"
+            address_placeholder: "isim@örnek.com"
+            type_placeholder: "özet, üye olma..."
+            reply_key_placeholder: "cevapla tuşu"
+            skipped_reason_placeholder: "neden"
+      logs:
+        title: "Kayıtlar"
+        action: "Aksiyon"
+        created_at: "Oluşturuldu"
+        last_match_at: "En Son Eşlenen"
+        match_count: "Eşleşmeler"
+        ip_address: "IP"
+        topic_id: "Konu IDsi"
+        post_id: "Gönderi IDsi"
+        delete: 'Sil'
+        edit: 'Düzenle'
+        save: 'Kaydet'
+        screened_actions:
+          block: "engelle"
+          do_nothing: "hiçbir şey yapma"
+        staff_actions:
+          title: "Görevli Aksiyonları"
+          instructions: "Kullanıcı adları ve aksiyonlara tıklayarak listeyi filtreleyin. Avatarlara tıklayarak kullanıcı sayfalarına gidin."
+          clear_filters: "Hepsini Göster"
+          staff_user: "Görevli Kullanıcı"
+          target_user: "Hedef Kullanıcı"
+          subject: "Konu"
+          when: "Ne zaman"
+          context: "Durum"
+          details: "Detaylar"
+          previous_value: "Önceki"
+          new_value: "Yeni"
+          diff: "Diff"
+          show: "Göster"
+          modal_title: "Detaylar"
+          no_previous: "Bir önceki değer yok."
+          deleted: "Yeni değer yok. Kayıt silindi."
+          actions:
+            delete_user: "kullanıcıyı sil"
+            change_trust_level: "güven seviyesini değiştir"
+            change_site_setting: "websitesi ayarlarını değiştir"
+            change_site_customization: "websitesinin özelleştirmesini değiştir"
+            delete_site_customization: "websitesinin özelleştirmesini sil"
+            suspend_user: "kullanıcıyı uzaklaştır"
+            unsuspend_user: "kullanıcıyı uzaklaştırma"
+            grant_badge: "rozet ver"
+            revoke_badge: "rozeti iptal et"
+            check_email: "emaili kontrol et"
+            delete_topic: "konuyu sil"
+            delete_post: "gönderiyi sil"
+            impersonate: "rolüne gir"
+        screened_emails:
+          title: "Taranmış Emaillar"
+          description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki email adresleri kontrol edilecek ve kayıt önlenecek veya başka bir aksiyon alınacak."
+          email: "Email Adresi"
+          actions:
+            allow: "İzin ver"
+        screened_urls:
+          title: "Taranmış URLler"
+          description: "Burada listenen URLler spamci olduğu tespit edilmiş kullanıcılar tarafından gönderilerde kullanılmış."
+          url: "URL"
+          domain: "Alan Adı"
+        screened_ips:
+          title: "Taranmış IPler"
+          description: 'İzlenen IP adresleri. IP adreslerini beyaz listeye aktarmak için "İzin ver"i kullan.'
+          delete_confirm: "%{ip_address} için konulan kuralı kaldırmak istediğinize emin misiniz?"
+          roll_up_confirm: "Tüm ortaklaşa taranmış IP adreslerini subnetlere toplamak istediğinize emin misiniz?"
+          rolled_up_some_subnets: "Bu subnetlere başarıyla toplanmış tüm engellenen IP girişleri: %{subnets}."
+          rolled_up_no_subnet: "Toplanacak bir şey bulunamadı."
+          actions:
+            block: "Engelle"
+            do_nothing: "İzin Ver"
+            allow_admin: "Admine izin ver"
+          form:
+            label: "Yeni:"
+            ip_address: "IP adresi"
+            add: "Ekle"
+          roll_up:
+            text: "Topla"
+            title: "En az 'min_ban_entries_for_roll_up' adet giriş olduğu takdirde yeni subnet engelleme girişleri yaratır."
+        logster:
+          title: "Hata Kayıtları"
+      impersonate:
+        title: "Rolüne gir"
+        help: "Hata bulma ve giderme amaçları için, bu aracı kullanarak kullanıcının rolüne girin. İşiniz bitince sistemdne çıkış yapmanız gerekecek."
+      users:
+        title: 'Kullanıcılar'
+        create: 'Admin Kullanıcısı Ekle'
+        last_emailed: "Son Email Gönderilen"
+        not_found: "Üzgünüz, o kullanıcıadı sistemde yok."
+        id_not_found: "Üzgünüz, o kullanıcı adı sistemimizde bulunmuyor."
+        active: "Aktif"
+        show_emails: "Emailleri Göster"
+        nav:
+          new: "Yeni"
+          active: "Aktif"
+          pending: "Bekleyen"
+          staff: 'Görevli'
+          suspended: 'Uzaklaştırılmış'
+          blocked: 'Engellenmiş'
+          suspect: 'Kuşkulan'
+        approved: "Onaylanmış?"
+        approved_selected:
+          other: "kullanıcıları ({{count}}) onayla "
+        reject_selected:
+          other: "kullanıcıları ({{count}}) reddet"
+        titles:
+          active: 'Aktif Kullanıcılar'
+          new: 'Yeni Kullanıcılar'
+          pending: 'Gözden Geçirilmeyi Bekleyen Kullanıcılar'
+          newuser: 'Güven Seviyesi 0 (Yeni Kullanıcı) olan Kullanıcılar'
+          basic: 'Güven Seviyesi 1 (Acemi Kullanıcı) olan Kullanıcılar'
+          regular: 'Güven Seviyesi 2 (Üye) olan Kullanıcılar'
+          leader: 'Güven Seviyesi 3 (Standart) olan Kullanıcılar'
+          elder: 'Güven Seviyesi 4 (Lider) olan Kullanıcılar'
+          staff: "Görevli"
+          admins: 'Admin Kullanıcılar'
+          moderators: 'Moderatörler'
+          blocked: 'Engellenen Kullanıcılar'
+          suspended: 'Uzaklaştırılmış Kullanıcılar'
+          suspect: 'Kuşkulanılan Kullanıcılar'
+        reject_successful:
+          other: "Başarıyla reddedilmiş %{count}  kullanıcılar."
+        reject_failures:
+          other: "Reddedilemeyen %{count}  kullanıcılar."
+        not_verified: "Onaylanmayan"
+        check_email:
+          title: "Bu kullanıcının email adresini ortaya çıkar"
+          text: "Göster"
+      user:
+        suspend_failed: "Bu kullanıcı uzaklaştırılırken bir şeyler ters gitti {{error}}"
+        unsuspend_failed: "Bu kullanıcının uzaklaştırması kaldırılırken bir şeyler ters gitti {{error}}"
+        suspend_duration: "Kullanıcı ne kadar uzun bir süre için uzaklaştırılacak?"
+        suspend_duration_units: "(günler)"
+        suspend_reason_label: "Neden uzaklaştırıyorsunuz? Buraya yazdıklarınız bu kullanıcının profil sayfasında <b>herkese gözükecek<b> ve sisteme giriş yaptığı anda kullanıcıya gösterilecek. Lütfen yazıyı kısa tutun."
+        suspend_reason: "Neden"
+        suspended_by: "Uzaklaştıran"
+        delete_all_posts: "Tüm gönderileri sil"
+        delete_all_posts_confirm: "%{posts} gönderi ve %{topics} konu silmek üzeresiniz. Emin misiniz?"
+        suspend: "Uzaklaştır"
+        unsuspend: "Uzaklaştırmayı geri al"
+        suspended: "Uzaklaştırıldı?"
+        moderator: "Moderatör?"
+        admin: "Admin?"
+        blocked: "Engellendi?"
+        show_admin_profile: "Admin"
+        edit_title: "Konuyu Düzenle"
+        save_title: "Konuyu Kaydet"
+        refresh_browsers: "Tarayıcıyı sayfa yenilemesine zorla"
+        refresh_browsers_message: "Mesaj tüm kullanıcılara gönderildi!"
+        show_public_profile: "Herkese Açık Profili Göster"
+        impersonate: 'Rolüne gir'
+        ip_lookup: "IP Arama"
+        log_out: "Çıkış Yap"
+        logged_out: "Kullanıcının tüm cihazlarda oturumu kapatılmış"
+        revoke_admin: 'Adminliğini İptal Et'
+        grant_admin: 'Adminlik Yetkisi Ver'
+        revoke_moderation: 'Moderasyonu İptal Et'
+        grant_moderation: 'Moderasyon Yetkisi Ver'
+        unblock: 'Engeli Kaldır'
+        block: 'Engelle'
+        reputation: İtibar
+        permissions: İzinler
+        activity: Aktivite
+        like_count: Alınan / Verilen Beğeniler
+        last_100_days: 'son 100 günde'
+        private_topics_count: Özel Konular
+        posts_read_count: Okunmuş Gönderiler
+        post_count: Oluşturulmuş Gönderiler
+        topics_entered: Görüntülenmiş Konular
+        flags_given_count: Verilen Bayraklar
+        flags_received_count: Alınan Bayraklar
+        warnings_received_count: Uyarılar Alındı
+        flags_given_received_count: 'Alınan / Verilen Bayraklar'
+        approve: 'Onayla'
+        approved_by: "onaylayan"
+        approve_success: "Kullanıcı onaylandı ve aktivasyon bilgilerini içeren bir email yollandı."
+        approve_bulk_success: "Tebrikler! Seçilen tüm kullanıcılar onaylandı ve bilgilendirildi."
+        time_read: "Okunma Zamanı"
+        delete: "Kullanıcıyı Sil"
+        delete_forbidden_because_staff: "Adminler ve moderatörler silinemez."
+        delete_forbidden:
+          other: "Gönderisi olan kullanıcılar silinemez. Kullanıcıyı silmeden önce tüm gönderilerini silin. (%{count} günden eski gönderiler silinemez.)"
+        cant_delete_all_posts:
+          other: "Tüm gönderileri silemezsiniz. Bazı gönderiler %{count} günden daha eski.  (delete_user_max_post_age ayarı.)"
+        cant_delete_all_too_many_posts:
+          other: "Tüm gönderileri silemezsiniz çünkü kullanıcının %{count} 'ten daha fazla gönderisi var. (delete_all_posts_max)"
+        delete_confirm: "Bu kullanıcıyı silmek istediğinize EMİN misiniz? İşlem geri alınamaz!"
+        delete_and_block: "Sil ve bu email ve IP adresini <b>engelle</b>"
+        delete_dont_block: "Sadece sil"
+        deleted: "Kullanıcı silinmiş."
+        delete_failed: "Kullanıcı silinirken bir hata oluştu. Kullanıcıyı silmeye çalışmadan önce tüm gönderilerin silindiğinden emin olun. "
+        send_activation_email: "Aktivasyon Emaili Yolla"
+        activation_email_sent: "Aktivasyon emaili yollandı."
+        send_activation_email_failed: "Tekrar aktivasyon emaili gönderilirken bir sorun yaşandı. %{error}"
+        activate: "Hesabı Aktifleştir"
+        activate_failed: "Kullanıcı aktifleştirilirken bir sorun yaşandı."
+        deactivate_account: "Hesabı Deaktive Et"
+        deactivate_failed: "Kullanıcı deaktive edilirken bir sorun yaşandı."
+        unblock_failed: 'Kullanıcının engeli kaldırılırken bir sorun yaşandı.'
+        block_failed: 'Kullanıcı engellenirken bir sorun yaşandı.'
+        deactivate_explanation: "Deaktive edilmiş bir kullanıcı emailini tekrar doğrulamalı."
+        suspended_explanation: "Uzaklaştırılmış kullanıcılar sisteme giriş yapamaz."
+        block_explanation: "Engellenmiş bir kullanıcı gönderi oluşturamaz veya konu başlatamaz."
+        trust_level_change_failed: "Kullanıcının güven seviyesi değiştirilirken bir sorun yaşandı."
+        suspend_modal_title: "Kullanıcıyı Uzaklaştır"
+        trust_level_2_users: "Güven Seviyesi 2 Olan Kullanıcılar"
+        trust_level_3_requirements: "Güven Seviyesi 3 Gereksinimleri"
+        trust_level_locked_tip: "güven seviyesi kitlendi, sistem kullanıcının seviyesini ne yükseltebilecek ne de düşürebilecek"
+        trust_level_unlocked_tip: "güven seviyesi kilidi çözüldü, sistem kullanıcının seviyesini yükseltebilir ya da düşürebilir"
+        lock_trust_level: "Güven Seviyesini Kilitle"
+        unlock_trust_level: "Güvenlik Seviyesi Kilidini Aç"
+        tl3_requirements:
+          title: "Güven Seviyesi 3 için Gerekenler"
+          table_title: "Son 100 günde:"
+          value_heading: "Değer"
+          requirement_heading: "Gereksinim"
+          visits: "Ziyaretler"
+          days: "gün"
+          topics_replied_to: "Cevaplanan Konular"
+          topics_viewed: "Görüntülenmiş Konular"
+          topics_viewed_all_time: "Görüntülenmiş Konular (tüm zamanlar)"
+          posts_read: "Okunmuş Gönderiler"
+          posts_read_all_time: "(Tüm Zamanlarda) Okunmuş Gönderiler"
+          flagged_posts: "Bayraklanan Gönderiler"
+          flagged_by_users: "Bayraklayan Kullanıcılar"
+          likes_given: "Verilen Beğeniler"
+          likes_received: "Alınan Beğeniler"
+          likes_received_days: "Alınan beğeniler: tekil günlük"
+          likes_received_users: "Alınan beğeniler: tekil kullanıcı"
+          qualifies: "Güven seviyesi 3 için yeterli."
+          does_not_qualify: "Güven seviyesi 3 için yeterli değil."
+          will_be_promoted: "Yakinda terfi ettirilecek."
+          will_be_demoted: "Yakında seviyesi düşürülecek"
+          on_grace_period: "Şu an terfisi hoşgörü süresinde, seviyesi düşürülmeyecek"
+          locked_will_not_be_promoted: "Güven seviyesi kilitlendi. Seviyesi hiç bir zaman yükseltilmeyecek."
+          locked_will_not_be_demoted: "Güven seviyesi kilitlendi. Seviyesi hiç bir zaman düşürülmeyecek."
+        sso:
+          title: "Tek Oturum Açma"
+          external_id: "Harici ID"
+          external_username: "Kullanıcı adı"
+          external_name: "İsim"
+          external_email: "Email"
+          external_avatar_url: "Avatar URL"
+      user_fields:
+        title: "Kullanıcı Alanları"
+        help: "Kullanıcıların doldurabileceği alanlar ekleyin."
+        create: "Kullanıcı Alanı Oluştur"
+        untitled: "İsimsiz"
+        name: "Alan Adı"
+        type: "Alan Türü"
+        description: "Alan Açıklaması"
+        save: "Kaydet"
+        edit: "Düzenle"
+        delete: "Sil"
+        cancel: "İptal et"
+        delete_confirm: "Bu kullanıcı alanını silmek istediğinize emin misiniz?"
+        required:
+          title: "Kayıt olurken zorunlu?"
+          enabled: "gerekli"
+          disabled: "isteğe bağlı"
+        editable:
+          title: "Üyelik sonrası düzenlenebilir?"
+          enabled: "düzenlenebilir"
+          disabled: "düzenlenemez"
+        field_types:
+          text: 'Yazı Alanı'
+          confirm: 'Onay'
+      site_text:
+        none: "Düzenlemeye başlamak için içerik tipi seçin."
+        title: 'Yazı İçeriği'
+      site_settings:
+        show_overriden: 'Sadece iptal edilenleri göster'
+        title: 'Ayarlar'
+        reset: 'sıfırla'
+        none: 'Hiçbiri'
+        no_results: "Hiç sonuç bulunamadı."
+        clear_filter: "Temizle"
+        categories:
+          all_results: 'Hepsi'
+          required: 'Gerekli'
+          basic: 'Basit Kurulum'
+          users: 'Kullanıcılar'
+          posting: 'Gönderiliyor'
+          email: 'Email'
+          files: 'Dosyalar'
+          trust: 'Güven Seviyeleri'
+          security: 'Güvenlik'
+          onebox: "Tek Kutu"
+          seo: 'SEO'
+          spam: 'Spam'
+          rate_limits: 'Oran Sınırları'
+          developer: 'Yazılımcı'
+          embedding: "Yerleştirme"
+          legal: "Yasal"
+          uncategorized: 'Diğer'
+          backups: "Yedekler"
+          login: "Giriş Yap"
+      badges:
+        title: Rozetler
+        new_badge: Yeni Rozet
+        new: Yeni
+        name: İsim
+        badge: Rozet
+        display_name: Görünen Ad
+        description: Açıklama
+        badge_type: Rozet Tipi
+        badge_grouping: Grup
+        badge_groupings:
+          modal_title: Rozet Gruplamaları
+        granted_by: Tarafından Verildi
+        granted_at: Tarihinde Verildi
+        save: Kaydet
+        delete: Sil
+        delete_confirm: Bu rozeti silmek istediğinize emin misiniz?
+        revoke: İptal Et
+        revoke_confirm: Bu rozeti iptal etmek istediğinize emin misiniz?
+        edit_badges: Rozetleri Düzenle
+        grant_badge: Rozet Ver
+        granted_badges: Verilen Rozetler
+        grant: Ver
+        no_user_badges: "%{name} hiç bir rozet almamış."
+        no_badges: Verilebilecek bir rozet yok.
+        none_selected: "Başlamak için bir rozet seçin"
+        allow_title: Rozetin ünvan olarak kullanılmasına izin ver
+        multiple_grant: Birden çok defa verilebilir
+        listable: Rozeti herkese gözüken rozetler sayfasında göster
+        enabled: Rozeti etkinleştir
+        icon: İkon
+        image: Resim
+        icon_help: "Font Awesome sınıfı veya görsel URL'i kullanın"
+        query: Rozet Sorgusu (SQL)
+        target_posts: Sorgu gönderileri hedefliyor
+        auto_revoke: Geri alma sorgusunu her gün çalıştır.
+        show_posts: Rozet alınmasına sebep olan gönderileri rozetler sayfasında göster
+        trigger: Tetikleme
+        trigger_type:
+          none: "Her gün güncelle"
+          post_action: "Bir kullanıcı gönderiyle etkileşime geçtiğinde"
+          post_revision: "Bir kullanıcı bir gönderiyi düzenlediğinde veya yeni bir gönderi oluşturduğunda"
+          trust_level_change: "Bir kullanıcı güven seviyesini değiştirdiğinde"
+          user_change: "Bir kullanıcı düzenlendiğinde veya oluşturduğunda"
+        preview:
+          link_text: "Verilen rozetleri önizle"
+          plan_text: "Sorgu planıyla önizle"
+          modal_title: "Rozet Sorgusunu Özizle"
+          sql_error_header: "Sorgu ile ilgili bir hata oluştu."
+          error_help: "Rozet sorgularıyla ilgili yardım için aşağıdaki bağlantılara bakın"
+          bad_count_warning:
+            header: "UYARI!"
+            text: "Bazı veriliş örnekleri bulunamıyor. Bu durum, rozet sorgusundan varolmayan kullanıcı IDsi veya gönderi IDsi dönünce gerçekleşir. İleride beklenmedik sonuçlara sebep olabilir - lütfen sorgunuzu tekrar kontrol edin."
+          grant_count:
+            zero: "Verilecek rozet bulunmuyor."
+            one: "<b>1</b> rozet verilecek."
+            other: "<b>%{count}</b> rozet verilecek."
+          sample: "Örnek:"
+          grant:
+            with: <span class="username">%{username}</span>
+            with_post: '<span class="username">%{username}</span> buradaki gönderi için %{link} '
+            with_post_time: <span class="username">%{username}</span> %{link} gönderisi için <span class="time">%{time}</span> zamanında
+            with_time: <span class="username">%{username}</span> at <span class="time">%{time}</span>
+    lightbox:
+      download: "indir"
+    search_help:
+      title: 'Yardımda Ara'
+    keyboard_shortcuts_help:
+      title: 'Klavye Kısayolları'
+      jump_to:
+        title: 'Şuraya Geç'
+        home: '<b>g</b>, <b>h</b> Anasayfa (En Son)'
+        latest: '<b>g</b>, <b>l</b> En Son'
+        new: 'Yeni'
+        unread: 'Okunmamış'
+        starred: '<b>g</b>, <b>f</b> Yıldızlı'
+        categories: 'Kategoriler'
+        top: '<b>g</b>, <b>t</b> En Popüler'
+      navigation:
+        title: 'Navigasyon'
+        jump: '<b>#</b> # numaralı gönderiye git'
+        back: 'Geri'
+        up_down: '<b>k</b>/<b>j</b> seçileni taşı &uarr; &darr;'
+        open: '<b>o</b> or <b>Enter</b> Seçili konuyu aç'
+        next_prev: '<b>shift j</b>/<b>shift k</b> Sonraki/önceki bölüm'
+      application:
+        title: 'Uygulama'
+        create: '<b>c</b> Yeni konu aç'
+        notifications: '<b>n</b> Bildirileri aç'
+        site_map_menu: '<b>=</b> Site menüsünü aç'
+        user_profile_menu: '<b>p</b> Kullanıcı menüsünü aç'
+        show_incoming_updated_topics: '<b>.</b> Güncellenmiş konuları göster'
+        search: 'Arama'
+        help: '<b>?</b> Klavye yardımını göster'
+        dismiss_new_posts: '<b>x</b>, <b>r</b> Yeni/Gönderleri Yoksay'
+        dismiss_topics: '<b>x</b>, <b>t</b> Konuları Yoksay'
+      actions:
+        title: 'Aksiyonlar'
+        star: '<b>f</b> Konuyu yıldızla'
+        pin_unpin_topic: '<b>shift p</b> Konuyu başa tuttur / tutturma'
+        share_topic: '<b>shift s</b> Konuyu paylaş'
+        share_post: '<b>s</b> Gönderiyi paylaş'
+        reply_as_new_topic: '<b>t</b> Bağlantılı konu olarak cevapla'
+        reply_topic: '<b>shift r</b> Konuya cevap yaz'
+        reply_post: '<b>r</b> Gönderiyi cevapla'
+        quote_post: '<b>q</b> Gönderiyi alıntıla'
+        like: '<b>l</b> Gönderiyi beğen'
+        flag: '<b>!</b> Gönderiyi bayrakla'
+        bookmark: '<b>b</b> Gönderiyi işaretle'
+        edit: '<b>e</b> Gönderiyi düzenle'
+        delete: '<b>d</b> Gönderiyi sil'
+        mark_muted: '<b>m</b>, <b>m</b> Konuyu sustur'
+        mark_regular: '<b>m</b>, <b>r</b> Standart (varsayılan) konu'
+        mark_tracking: '<b>m</b>, <b>t</b> Konuyu takip et'
+        mark_watching: '<b>m</b>, <b>w</b> Konuyu gözle'
+    badges:
+      title: Rozetler
+      allow_title: "rozet ünvan olarak kullanılabilsin?"
+      multiple_grant: "birden fazla kez verildi?"
+      badge_count:
+        other: "%{count} Rozet"
+      more_badges:
+        other: "+%{count} Daha"
+      granted:
+        other: "%{count} kez verildi"
+      select_badge_for_title: Ünvan olarak kullanmak için bir rozet seçin
+      none: "<none>"
+      badge_grouping:
+        getting_started:
+          name: Başlıyoruz
+        community:
+          name: Topluluk
+        trust_level:
+          name: Güven Seviyesi
+        other:
+          name: Diğer
+        posting:
+          name: Gönderiliyor
+      badge:
+        editor:
+          name: Editör
+          description: İlk gönderi düzenleme
+        basic_user:
+          name: Basit
+          description: Tüm temel topluluk işlevleri için <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/4">hak verildi</a>
+        member:
+          name: Üye
+          description: Davetiye gönderebilme <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/5">hakkı verildi</a>
+        regular:
+          name: Standart
+          description: Konuların isimlerini ve kategorilerini değiştirebilme, follow'lu bağlantı paylaşabilme ve lobiye girebilme <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/6">hakları verildi</a>
+        leader:
+          name: Lider
+          description: 'Tüm gönderileri düzenleyebilme, konuları başa tutturabilme, kapatabilme, arşivleyebilme, bölebilme ve birleştirebilme <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">hakları verildi</a> '
+        welcome:
+          name: Hoşgeldiniz
+          description: Bir beğeni aldı
+        autobiographer:
+          name: Otobiyografi Yazarı
+          description: Kullanıcı <a href="/my/preferences">profil</a> bilgilerini doldurmuş
+        nice_post:
+          name: İyi Gönderi
+          description: Bir gönderiden 10 beğeni alındı. Bu rozet birden fazla defa verilebilir
+        good_post:
+          name: Çok İyi Gönderi
+          description: Bir gönderiden 25 beğeni alındı. Bu rozet birden fazla defa verilebilir
+        great_post:
+          name: Çok Çok İyi Gönderi
+          description: Bir gönderiden 50 beğeni alındı. Bu rozet birden fazla defa verilebilir
+        nice_topic:
+          name: İyi Konu
+          description: Bir konuda 10 beğeni almış. Bu rozet birden çok kez kazanılabilir
+        good_topic:
+          name: Çok İyi Konu
+          description: Bir konuda 25 beğeni almış. Bu rozet birden çok kez kazanılabilir
+        great_topic:
+          name: Çok Çok İyi Konu
+          description: Bir konuda 50 beğeni almış. Bu rozet birden çok kez kazanılabilir
+        nice_share:
+          name: İyi Paylaşım
+          description: 25 tekil kullanıcı ile bir gönderiyi paylaşmış
+        good_share:
+          name: Çok İyi Paylaşım
+          description: 300 tekil kullanıcı ile bir gönderiyi paylaşmış
+        great_share:
+          name: Çok Çok İyi Paylaşım
+          description: 1000 tekil kullanıcı ile bir gönderiyi paylaşmış
+        first_like:
+          name: İlk beğeni
+          description: Bir gönderi beğendi
+        first_flag:
+          name: İlk Bayrak
+          description: Bır gönderiyi bayrakladı
+        first_share:
+          name: İlk paylaşım
+          description: Bir gönderi paylaştı
+        first_link:
+          name: İlk bağlantı
+          description: Başka bir konuya iç bağlantı eklendi
+        first_quote:
+          name: İlk alıntı
+          description: Bir kullanıcıyı alıntıladı
+        read_guidelines:
+          name: Yönergeleri oku
+          description: <a href="/guidelines">Topluluk yönergelerini</a> oku
+        reader:
+          name: Okuyucu
+          description: 100'den fazla gönderiye sahip bir konudaki tüm gönderileri oku
+    google_search: |
+      <h2>Google ile ara</h2>
+      <p>
+      <form action='//google.com/search' id='google-search' onsubmit="document.getElementById('google-query').value = 'site:' + window.location.host + ' ' + document.getElementById('user-query').value; return true;">
+      <input type="text" id='user-query' value="">
+      <input type='hidden' id='google-query' name="q">
+      <button class="btn btn-primary">Google</button>
+      </form>
+      </p>
diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml
index 41b1504912..2ccd656803 100644
--- a/config/locales/client.uk.yml
+++ b/config/locales/client.uk.yml
@@ -243,7 +243,6 @@ uk:
         title: "Фон Профіля"
       email:
         title: "Електронна пошта"
-        frequency: "Ми будемо надсилати Вам листи тільки якщо ми Вас останнім часом не бачили і Ви ще не бачили те, про що ми Вам пишемо."
       name:
         title: "Ім'я"
       username:
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 8bff1bc089..7f3fdaeb89 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -224,6 +224,7 @@ zh_CN:
       organisation: 组织
       phone: 电话
       other_accounts: "其他使用该 IP 地址的账户："
+      delete_other_accounts: "删除 %{count}"
       username: "用户名"
       trust_level: "信任等级"
       read_time: "阅读时间"
@@ -236,6 +237,7 @@ zh_CN:
       mute: "防打扰"
       edit: "修改设置"
       download_archive: "下载我的帖子的存档"
+      new_private_message: "新私信"
       private_message: "私信"
       private_messages: "消息"
       activity_stream: "活动"
@@ -324,7 +326,10 @@ zh_CN:
         ok: "我们将邮件跟您确认"
         invalid: "请填写正确的电子邮箱地址"
         authenticated: "你的电子邮箱已经被 {{provider}} 验证了。"
-        frequency: "只有当您最近一段时间没有访问时，我们才会把您未读过的内容发送到您的电子邮箱。"
+        frequency:
+          zero: "如果您没有阅读过我们想寄给您的内容，我们会立即发送电子邮件给您。"
+          one: "如果您没有阅读过我们想寄给您的内容，我们只会在您没有访问时才会发送电子邮件给您。"
+          other: "如果您没有阅读过我们想寄给您的内容，我们只会在您最近 {{count}} 分钟内没有访问时才会发送电子邮件给您。"
       name:
         title: "名字"
         instructions: "您的全名（可选）"
@@ -657,6 +662,7 @@ zh_CN:
         user: "搜索 @{{username}} 的帖子"
         category: "搜索“{{category}}”分类"
         topic: "搜索本主题"
+        private_messages: "搜索私信"
     site_map: "去另一个主题列表或分类"
     go_back: '返回'
     not_logged_in_user: '显示当前活动和设置的用户页面'
@@ -970,7 +976,7 @@ zh_CN:
           inappropriate: "同时报告"
           custom_flag: "同时报告"
           bookmark: "同时添加书签"
-          like: "同时赞它"
+          like: "赞"
           vote: "同时投票支持"
         undo:
           off_topic: "撤销报告"
@@ -1450,7 +1456,9 @@ zh_CN:
             title: "将数据库回滚到之前的工作状态"
             confirm: "您确定要将数据库回滚到之前的工作状态吗？"
       export_csv:
+        success: "导出开始，您将马上看到进度提示。"
         failed: "导出失败。请检查日志。"
+        button_text: "导出"
       customize:
         title: "定制"
         long_title: "站点定制"
@@ -1618,6 +1626,9 @@ zh_CN:
           title: "被屏蔽的 IP"
           description: '受监视的 IP 地址，使用“放行”可将 IP 地址加入白名单。'
           delete_confirm: "确定要撤销对 IP 地址为 %{ip_address} 的规则？"
+          roll_up_confirm: "您确定要将常用的 IP 地址归类为子网地址吗？"
+          rolled_up_some_subnets: "成功地折叠了 IP 封禁记录至这些子网： %{subnets}。"
+          rolled_up_no_subnet: "无法折叠。"
           actions:
             block: "封禁"
             do_nothing: "放行"
@@ -1626,6 +1637,9 @@ zh_CN:
             label: "新："
             ip_address: "IP地址"
             add: "添加"
+          roll_up:
+            text: "折叠"
+            title: "如果有至少 'min_ban_entries_for_roll_up' 个记录，创建一个子网封禁记录"
         logster:
           title: "错误日志"
       impersonate:
@@ -1636,14 +1650,17 @@ zh_CN:
         create: '添加管理员用户'
         last_emailed: "最后一次邮寄"
         not_found: "抱歉，在我们的系统中此用户名不存在。"
+        id_not_found: "抱歉，在我们的系统中此用户 id 不存在。"
         active: "活跃"
         show_emails: "显示邮件"
         nav:
           new: "新建"
           active: "活跃"
           pending: "待定"
+          staff: '职员'
           suspended: '禁止登录'
           blocked: '禁止参与讨论'
+          suspect: '怀疑'
         approved: "已批准？"
         approved_selected:
           other: "批准用户（{{count）"
@@ -1658,10 +1675,12 @@ zh_CN:
           regular: '信用等级为2的用户（成员）'
           leader: '信用等级为3的用户（常规）'
           elder: '信用等级为4的用户（领导）'
+          staff: "职员"
           admins: '管理员'
           moderators: '版主'
           blocked: '被封用户'
           suspended: '被禁用户'
+          suspect: '嫌疑用户'
         reject_successful:
           other: "成功拒绝 %{count} 个用户。"
         reject_failures:
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index 5decf3294d..7d625dbbaf 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -312,7 +312,6 @@ zh_TW:
         instructions: "背景會被置中，且默認寬度為850px。"
       email:
         title: "電子郵件"
-        frequency: "我們只會在一段時間未看到你及你尚未看過我們通知你的事物時才會寄信給你。"
       name:
         title: "名稱"
       username:
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
new file mode 100644
index 0000000000..027d72f94b
--- /dev/null
+++ b/config/locales/server.ar.yml
@@ -0,0 +1,73 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ar:
+  stringex:
+    characters:
+      number: "-"
+  dates:
+    short_date_no_year: "يوم شهر"
+    short_date: "يوم شهر سنة"
+  title: "ديسكورس"
+  topics: "عناوين"
+  posts: "منشورات"
+  loading: "تحميل"
+  log_in: "تسجيل الدخول"
+  via: "%{username} من موقع %{site_name}"
+  is_reserved: "محجوز"
+  disable_remote_images_download_reason: "لقد تم تعطيل تحميل الصور عن بعد بسبب عدم وجود مساحة كافية"
+  errors:
+    messages:
+      too_long_validation: "إنها محددة بعدد حروف %{max} حرف; لقد أدخلت %{length}."
+      invalid_boolean: "قيمة منطقية غير صحيحة"
+      taken: "تم إختياره من قبل"
+    embed:
+      load_from_remote: "هناك خطأ في تحميل هذا المنشور."
+  bulk_invite:
+    file_should_be_csv: "الملف المرفوع يجب أن يكون بنسق وامتداد txt أو csv"
+  backup:
+    backup_file_should_be_tar_gz: "ملف الاحتياط يجب أن يكون أرشيف .tar.gz."
+  not_logged_in: "يجب عليك تسجيل الدخول لفعل هذا."
+  embed:
+    start_discussion: "إبدأ نقاش"
+    continue: "الاستمرار في هذا النقاش"
+    loading: "تحميل النقاش"
+  too_many_mentions:
+    zero: "عذراً، لا يمكنكم تنويه مستخدمين آخرين."
+    one: "عذراً، يمكنكم فقط تنويه مستخدم واحد في هذا المنشور."
+  has_already_been_used: "هو مستخدم بالفعل"
+  next_page: "الصفحة التالية ←"
+  prev_page: "→ الصفحة السابقة "
+  num_participants: "المشاركين"
+  read_full_topic: "قراءة العنوان كامل"
+  rss_description:
+    hot: "عناوين ساخنة"
+  groups:
+    default_names:
+      everyone: "الجميع"
+      admins: "المسؤولين"
+      staff: "العاملين"
+  activerecord:
+    errors:
+      models:
+        user:
+          attributes:
+            ip_address:
+              signup_not_allowed: "التسجيل غير مسموح من هذا الحساب."
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "هذا لون غير صالح"
+  trust_levels:
+    basic:
+      title: "مستخدم أساسي"
+    regular:
+      title: "عضو"
+    leader:
+      title: "منتظم"
+    elder:
+      title: "قائد"
diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml
index 7085343663..ad39de8d10 100644
--- a/config/locales/server.cs.yml
+++ b/config/locales/server.cs.yml
@@ -33,7 +33,6 @@ cs:
   log_in: "Přihlásit se"
   via: "%{username} přes %{site_name}"
   is_reserved: "je rezervováno"
-  purge_reason: "Automaticky smazáno: staré a neověřené"
   disable_remote_images_download_reason: "Stahování obrázků z cizích serverů bylo vypnuto protože na disku není dostatek místa."
   errors:
     messages:
@@ -551,6 +550,8 @@ cs:
     education_new_topic:
       title: "Školení nového uživatele: První témata"
       description: "Návod, který se automaticky zobrazí ve vyskakovacím okně nad editorem zpráv, když uživatelé zakládají první dvě nová témata."
+    usage_tips:
+      title: "Příručka pro nové uživatele"
     welcome_user:
       title: "Uvítání: Nový uživatel"
       description: "Soukromá zpráva, která je automaticky zaslaná novým uživatelům, když se zaregistrují."
@@ -786,6 +787,14 @@ cs:
         Noví uživatelé mají z bezpečnostních důvodů trochu omezená práva. Čím víc se do komunity zapojíte, tím větší důvěryhodnost získáte a všechny omezení se automaticky odstraní. Na dostatečně vysoké [důvěryhodnosti](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) můžete získat i moderátorská oprávnění.
     welcome_user:
       subject_template: "Vítejte na %{site_name}!"
+      text_body_template: |
+        Děkujeme, že jste se připojili na %{site_name} a vítáme vám na našem diskuzním fóru!
+
+        %{new_user_tips}
+
+        Věříme v [civilizované komunitní chování](%{base_url}/guidelines) za všech okolností.
+
+        Užijte si naše fórum!
     welcome_invite:
       subject_template: "Vítejte na %{site_name}!"
       text_body_template: |
diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml
index 16b22bf917..71f7ebcc2b 100644
--- a/config/locales/server.da.yml
+++ b/config/locales/server.da.yml
@@ -23,7 +23,6 @@ da:
   log_in: "Log ind"
   via: "%{username} via %{site_name}"
   is_reserved: "er reservet"
-  purge_reason: "Slettet automatisk eftersom dette var gammelt og ikke verificeret"
   disable_remote_images_download_reason: "Fjerndownload af billeder deaktiveret grundet utilstrækkelig diskplads"
   errors:
     messages:
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index c2e4033be9..e2a8015527 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -33,7 +33,6 @@ de:
   log_in: "Anmelden"
   via: "%{username} via %{site_name}"
   is_reserved: "ist reserviert"
-  purge_reason: "Automatisch gelöscht, da alt und ungeprüft"
   disable_remote_images_download_reason: "Da nicht mehr genug Plattenplatz vorhanden ist, wurde der Download von Bildern deaktiviert."
   errors:
     messages:
@@ -570,9 +569,6 @@ de:
     title: "Kurzer Titel dieser Seite, der im Title-Tag verwendet wird."
     site_description: "Beschreibe diese Seite in einem Satz. Diese Beschreibung wird im \"description\" Meta-Tag verwendet."
     contact_email: "E-Mail-Adresse eines zentralen Ansprechpartners der Webseite. Wichtige Benachrichtigungen von discourse.org bezüglich kritischer Updates werden an diese Adresse gesendet."
-    company_full_name: "VERALTET. Ist nicht mehr benutzt und wird entfernt. Voller Name des Unternehmens, das diese Seite betreibt. Wird in rechtlich relevanten Dokumenten wie /tos und /privacy verwendet."
-    company_short_name: "VERALTET. Ist nicht mehr benutzt und wird entfernt. Kurzname des Unternehmens, das diese Seite betreibt. Wird in rechtlich relevanten Dokumenten wie /tos und /privacy verwendet."
-    company_domain: "VERALTET. Ist nicht mehr benutzt und wird entfernt. Domainname des Unternehmens, das diese Seite betreibt. Wird in rechtlich relevanten Dokumenten wie /tos und /privacy verwendet."
     queue_jobs: "NUR FÜR ENTWICKLER! ACHTUNG! Benutze Sidekiq zur Ausführung von Jobs. Wenn dies abgeschaltet wird, dann wird die Seite nicht mehr richtig funktionieren!"
     crawl_images: "Lade Bilder von fremden URLs herunter, um ihre Höhe und Breite zu bestimmen."
     download_remote_images_to_local: "Lade eine Kopie von extern gehosteten Bildern herunter und ersetze Links in Beiträgen entsprechend; dies verhindert defekte Bilder."
@@ -616,7 +612,7 @@ de:
     num_users_to_block_new_user: "Verstecke alle Beiträge eines neuen Nutzers und erlaube keine neuen Beiträge mehr, wenn der neue Nutzer num_flags_to_block_new_user Meldungen bezüglich Werbung von der hier angegebenen Zahl verschiedener anderer Nutzer erhalten hat. 0 deaktiviert diese Funktion."
     notify_mods_when_user_blocked: "Wenn ein Benutzer automatisch gesperrt wird, sende eine Mail an alle Moderatoren."
     flag_sockpuppets: "Wenn ein neuer Nutzer auf ein Thema antwortet, das von einem anderen neuen Nutzer aber mit der gleichen IP-Adresse begonnen wurde, markiere beide Beiträge als Werbung."
-    traditional_markdown_linebreaks: "Traditionelle Zeilenumbrüche in Markdown, anstatt zwei nachfolgende Leerzeichen als Zeilenumbruch zu verwenden."
+    traditional_markdown_linebreaks: "Traditionelle Zeilenumbrüche in Markdown, welche zwei nachfolgende Leerzeichen für einen Zeilenumbruch benötigen."
     post_undo_action_window_mins: "Sekunden, die ein Nutzer hat, um Aktionen auf Beiträgen rückgängig zu machen (Like, Meldung, etc.)."
     must_approve_users: "Alle neuen Benutzerkonten müssen von Mitarbeitern freigeschaltet werden, bevor sie Zugriff auf die Seite erhalten."
     ga_tracking_code: "Google Analytics Trackingcode, zum Beispiel: UA-12345678-9; siehe http://google.com/analytics"
@@ -938,6 +934,11 @@ de:
       Die Einladung ist von einem vertrautem Benutzer, du musst dich daher nicht einloggen.
   invite_password_instructions:
     subject_template: "Legen Sie ein Passwort für Ihr %{site_name}-Konto fest"
+    text_body_template: |
+      Danke, dass du der Einladung zu %{site_name} gefolgt bist - herzlich willkommen!
+
+      Klicke auf den folgenden Link und wähle ein passwort um dich wieder anzumelden:
+      %{base_url}/users/password-reset/%{email_token}
   test_mailer:
     subject_template: "[%{site_name}] Test der Mailzustellbarkeit"
   new_version_mailer:
@@ -1003,6 +1004,24 @@ de:
         Viel Vergnügen!
     welcome_invite:
       subject_template: "Willkommen bei %{site_name}!"
+      text_body_template: |
+        Danke, dass du der Einladung zu %{site_name} gefolgt bist - herzlich willkommen!
+
+        Wir haben automatisch einen Benutzernamen generiert: **%{username}**, aber du kannst diesen in [deinem Profil][prefs] ändern.
+
+        Um dich wieder anzumelden:
+
+        1. Melde dich entweder mit eine beliebigen Methode an, die der **gleichen E-Mail-Addresse** mit welcher du die Einladung erhalten hast zugeordnet ist. Ansonsten wissen wir nicht dass du es bist!
+
+        2. Oder wähle ein Passwort für [dein Benutzerkonto][prefs] und benutze dieses zum Anmelden.
+
+        %{new_user_tips}
+
+        Wir glauben an [zivilisiertes Verhalten in Online-Communities](%{base_url}/guidelines).
+
+        Viel Spaß!
+
+        [prefs]: %{user_preferences_url}
     backup_succeeded:
       subject_template: "Sicherung erfolgreich abgeschlossen"
     backup_failed:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 233d0a0739..64c6e6ab4d 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -47,7 +47,7 @@ en:
   via: "%{username} via %{site_name}"
   is_reserved: "is reserved"
 
-  purge_reason: "Automatically deleted due to being old and unverified"
+  purge_reason: "Automatically deleted as abandoned, unactivated account"
   disable_remote_images_download_reason: "Remote images download was disabled because there wasn't enough disk space available."
 
   errors:
@@ -660,9 +660,6 @@ en:
     title: "Brief title of this site, used in the title tag."
     site_description: "Describe this site in one sentence, used in the meta description tag."
     contact_email: "Email address of key contact for site. Important notices from discourse.org regarding critical updates may be sent to this address."
-    company_full_name: "DEPRECATED. Not used anymore and will be removed. The full name of the company that runs this site, used in legal documents like /tos and /privacy"
-    company_short_name: "DEPRECATED. Not used anymore and will be removed. The short name of the company that runs this site, used in legal documents like /tos and /privacy"
-    company_domain: "DEPRECATED. Not used anymore and will be removed. The domain name owned by the company that runs this site, used in legal documents like /tos and /privacy"
     queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions."
     download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images."
@@ -742,6 +739,7 @@ en:
     track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs"
     topics_per_page: "How many topics are loaded by default on the topic list, and when scrolling down to load more topics"
     posts_chunksize: "How many posts are loaded by default on a topic, and when scrolling down to load more posts"
+    posts_slow_chunksize: "Like `posts_chunksize` but for slow platforms (such as Android)"
     site_contact_username: "All automated private messages will be from this user; if left blank the default System account will be used."
     send_welcome_message: "Send all new users a welcome private message with a quick start guide."
     suppress_reply_directly_below: "Don't show the expandable reply count on a post when there is only a single reply directly below this post."
@@ -845,7 +843,7 @@ en:
     clean_up_uploads: "Remove orphan unreferenced uploads to prevent illegal hosting. WARNING: you may want to back up of your /uploads directory before enabling this setting."
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
-    purge_inactive_users_grace_period_days: "Grace period (in days) before a user who has not activated their account is deleted."
+    purge_unactivated_users_grace_period_days: "Grace period (in days) before a user who has not activated their account is deleted."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
     s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
@@ -948,6 +946,9 @@ en:
     max_age_unmatched_emails: "Delete unmatched screened email entries after (N) days."
     max_age_unmatched_ips: "Delete unmatched screened IP entries after (N) days."
 
+    num_flaggers_to_close_topic: "Minimum number of unique flaggers that is required to automatically pause a topic for intervention"
+    num_flags_to_close_topic: "Minimum number of active flags that is required to automatically pause a topic for intervention"
+
     reply_by_email_enabled: "Enable replying to topics via email."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
 
@@ -1305,6 +1306,8 @@ en:
     deferred: "Thanks for letting us know. We're looking into it."
     deferred_and_deleted: "Thanks for letting us know. We've removed the post."
 
+  temporarily_closed_due_to_flags: "This topic is temporarily closed due to a large number of community flags"
+
   system_messages:
     post_hidden:
       subject_template: "Post hidden due to community flagging"
@@ -2181,7 +2184,7 @@ en:
         <tr><td><code>order:views</code></td><td><code>order:latest</code></td><td colspan=3></td></tr>
         <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:singleuser</code></td></tr>
         <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td colspan=3></td></tr>
-        <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td></td></tr>
+        <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
         </table>
       </p>
       <p>
diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml
index 44121790b5..d337564871 100644
--- a/config/locales/server.es.yml
+++ b/config/locales/server.es.yml
@@ -33,7 +33,7 @@ es:
   log_in: "Iniciar sesión"
   via: "%{username} vía %{site_name}"
   is_reserved: "está reservado"
-  purge_reason: "Borrado automáticamente dado que es antiguo y no está verificado"
+  purge_reason: "Eliminada automáticamente como cuenta abandonada, sin activar"
   disable_remote_images_download_reason: "La descarga de imágenes remotas se desactivó porque no había suficiente espacio disponible en disco."
   errors:
     messages:
@@ -600,9 +600,6 @@ es:
     title: "Título breve de este sitio, utilizado en la etiqueta title."
     site_description: "Describe este sitio en una frase, se utiliza en la etiqueta meta description."
     contact_email: "Dirección de correo electrónico del contacto principal para el sitio. Las noticias de importancia desde discourse.org con actualizaciones críticas se enviarán a esta dirección."
-    company_full_name: "OBSOLETO PRÓXIMAMENTE. No se usará más, será eliminado. El nombre completo de la compañía que administra el sitio, usado en documentos legales como las Condiciones de Servicio y la Privacidad"
-    company_short_name: "OBSOLETO PRÓXIMAMENTE. No se usará más, será eliminado. El nombre en versión reducida de la compañía que administra el sitio, usado en documentos legales como las Condiciones de Servicio y la Privacidad"
-    company_domain: "OBSOLETO PRÓXIMAMENTE. No se usará más, será eliminado. El nombre de dominio propiedad de la compañía que administra el sitio, usado en documentos legales como las Condiciones de Servicio y la Privacidad"
     queue_jobs: "¡SOLO DESARROLLADORES! ¡ADVERTENCIA! Poner varios trabajos en la cola de Sidekiq. Si se desactiva, el sitio dejará de funcionar."
     crawl_images: "Recuperar imágenes desde URLs remotas para insertarlas con las dimensiones correctas de ancho y de largo."
     download_remote_images_to_local: "Convertir imágenes remotas a imágenes locales descargándolas; esto previene imágenes rotas."
@@ -703,6 +700,7 @@ es:
     min_password_length: "Longitud mínima de contraseña."
     block_common_passwords: "No permitir contraseñas que están entre las 10.000 más comunes."
     enable_sso: "Habilitar el single sign on a través de un sitio externo (Nota: deshabilita las invitaciones)"
+    enable_sso_provider: "Implementar el protocolo de SSO de Discourse en el endpoint /session/sso_provider requiere establecer un sso_secret"
     sso_url: "URL del endpoint para el single sign on"
     sso_secret: "Cadena secreta utilizada para cifrar/descifrar la información del SSO, asegúrate de que es de 10 caracteres o más"
     sso_overrides_email: "Reemplaza el email local con el email del sitio externo desde el payload del SSO (AVISO: pueden ocurrir discrepancias debido a la normalización de los correos electrónicos locales)"
@@ -749,7 +747,7 @@ es:
     clean_up_uploads: "Eliminar subidas huérfanas sin referencia para prevenir hosting ilegal. AVISO: antes de habilitar esta opción quizá quieres hacer un backup de tu directorio de /uploads"
     clean_orphan_uploads_grace_period_hours: "Período de gracia (en horas) antes de que una subida huérfana sea eliminada."
     purge_deleted_uploads_grace_period_days: "Período de gracia (en días) antes de que una subida eliminada sea borrada totalmente."
-    purge_inactive_users_grace_period_days: "Periodo de gracia (en días) durante los cuales un usuario que no haya activado su cuenta no será aún eliminado."
+    purge_unactivated_users_grace_period_days: "Período de gracia (en días) que se concede a un usuario que no haya activado su cuenta antes de eliminarla."
     enable_s3_uploads: "Coloca los archivos subidos en el almacén Amazon S3. IMPORTANTE: requiere de credenciales de S3 validas. (ambas clave de acceso y clave de acceso secreta)."
     s3_use_iam_profile: 'Usar el rol de AWS EC2 IAM para descargar las llaves. NOTA: habilitando esta opción ignorará la "llave de acceso s3" y "la llave de acceso secreta s3".'
     s3_upload_bucket: "El nombre del bucket Amazon S3 donde se subirán los archivos. AVISO: debe ser en minúsculas, sin puntos ni guiones bajos."
@@ -824,6 +822,11 @@ es:
     staff_like_weight: "Qué ponderación extra otorgan los me gusta provenientes de los miembros del Staff."
     levenshtein_distance_spammer_emails: "Al revisar coincidencias por correos electrónicos de spammers, qué número de caracteres permiten una coincidencia parcial."
     max_new_accounts_per_registration_ip: "Si ya hay (n) cuentas con nivel de confianza 0 desde esta IP (y ninguna es de un miembro del staff o de nivel de confianza 2 o más), prohibir nuevos registros desde esa IP."
+    min_ban_entries_for_roll_up: "Al hacer clic en el botón Agrupar, se crea un nuevo rango de entradas para banear si hay al menos (N) entradas."
+    max_age_unmatched_emails: "Eliminar entradas de email que no coincidan después de (N) días."
+    max_age_unmatched_ips: "Eliminar entradas de IP que no coincidan después de (N) días."
+    num_flaggers_to_close_topic: "Número mínimo de denunciantes únicos requerido para pausar un tema automáticamente para intervención"
+    num_flags_to_close_topic: "Valor mínimo de reportes activos requerido para pausar un tema automáticamente para intervención"
     reply_by_email_enabled: "Habilitar la respuesta a temas por email."
     reply_by_email_address: "Plantilla para la dirección de email que aparecerá al recibir correos con la función de respuesta por email: %{reply_key}@respuesta.ejemplo.com o respuestas+%{reply_key}@ejemplo.com"
     disable_emails: "Impedir que Discourse envié cualquier tipo de e-mail."
@@ -919,6 +922,11 @@ es:
       category: 'Categorías'
       topic: 'Resultados'
       user: 'Usuarios'
+  sso:
+    not_found: "No se puede buscar o crear cuenta, contacta al administrador del sitio"
+    account_not_approved: "La cuenta está pendiente de aprobación, recibirás una notificación por email cuando se apruebe"
+    unknown_error: "Error al actualizar la información, contacta al administrador del sitio"
+    timeout_expired: "Se agotó el tiempo de espera para el inicio de sesión, por favor, intenta iniciar sesión de nuevo"
   original_poster: "Autor original"
   most_posts: "Con más posts"
   most_recent_poster: "Autor más reciente"
@@ -1126,6 +1134,7 @@ es:
     disagreed: "Gracias por hacérnoslo saber. Estamos revisándolo."
     deferred: "Gracias por hacérnoslo saber. Estamos revisándolo."
     deferred_and_deleted: "Gracias por hacérnoslo saber. Hemos eliminado el post."
+  temporarily_closed_due_to_flags: "Este tema está cerrado temporalmente por un elevado número de denuncias por parte de la comunidad"
   system_messages:
     post_hidden:
       subject_template: "Post oculto al haber sido reportado por la comunidad"
@@ -1646,7 +1655,7 @@ es:
         <tr><td><code>order:views</code></td><td><code>order:latest</code></td><td colspan=3></td></tr>
         <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:singleuser</code></td></tr>
         <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td colspan=3></td></tr>
-        <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td></td></tr>
+        <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
         </table>
       </p>
       <p>
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index d603543278..d296e3956a 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -6,6 +6,9 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 fi:
+  stringex:
+    characters:
+      number: "-"
   i18n:
     transliterate:
       rule:
@@ -30,7 +33,7 @@ fi:
   log_in: "Kirjaudu sisään"
   via: "%{username} sivustolta %{site_name}"
   is_reserved: "on varattu"
-  purge_reason: "Poistettiin automaattisesti, koska tiliä ei oltu aktivoitu riittävässä ajassa"
+  purge_reason: "Poistettu automaattisesti hylättynä, aktivoimattomana tilinä"
   disable_remote_images_download_reason: "Linkattujen kuvien lataaminen poistettiin käytöstä vähäisen tallennustilan vuoksi."
   errors:
     messages:
@@ -365,12 +368,14 @@ fi:
   activation:
     action: "Vahvista käyttäjätilisi"
     already_done: "Pahoittelut, tämän tilin varmennuslinkki ei ole enää voimassa. Ehkäpä tili on jo varmennettu?"
+    please_continue: "Tilisi on nyt varmennettu; sivu ohjautuu palstan etusivulle."
     continue_button: "Jatka sivustolle %{site_name}"
     welcome_to: "Tervetuloa sivustolle %{site_name}!"
     approval_required: "Valvojan täytyy käsin hyväksyä uusi tilisi ennen kuin pääset palstalle. Saat sähköpostin, kun tilisi on hyväksytty."
   post_action_types:
     off_topic:
       title: 'Asiaankuulumaton'
+      description: 'Tämä viesti ei ole relevantti tässä ketjussa, jonka määrittelee ketjun otsikko ja aloitusviesti, ja pitäisi todennäköisesti siirtää toiselle alueelle.'
       long_form: 'liputti tämän asiaankuulumattomaksi'
     spam:
       title: 'Roskaposti'
@@ -381,10 +386,15 @@ fi:
       description: 'Tämän viestin sisältö on loukkaava, herjaava tai ristiriidassa <a href="/guidelines">palstan sääntöjen</a> kanssa.'
       long_form: 'liputti tämän asiattomaksi'
     notify_user:
+      title: 'Lähetä yksityisviesti käyttäjälle @{{username}}'
       description: 'Tämä viesti sisältää jotain, mistä haluan keskustellä tämän henkilön kanssa suoraan ja yksityisesti. Tämä ei aiheuta liputusta.'
+      long_form: 'lähetä käyttäjälle yksityisviesti'
       email_title: 'Viestisi ketjussa "%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
+      title: "Jotain muuta"
+      description: 'Valvojan tulee huomioida tämä viesti muusta, kuin yllä listatusta syystä.'
+      long_form: 'liputit tämän valvojille tiedoksi'
       email_title: 'Viesti ketjussa "%{title}" kaipaa valvojan huomiota'
       email_body: "%{link}\n\n%{message}"
     bookmark:
@@ -409,7 +419,9 @@ fi:
       description: 'Tämän ketjun sisältö on loukkaava, herjaava tai ristiriidassa <a href="/guidelines">palstan sääntöjen</a> kanssa.'
       long_form: 'liputti tämän asiattomaksi'
     notify_moderators:
+      title: "Jotain muuta"
       description: 'Valvojan tulee huomioida tämä ketju <a href="/guidelines">palstan sääntöjen</a>, <a href="%{tos_url}">palveluehtojen</a>, tai muun syyn vuoksi.'
+      long_form: 'liputit tämän valvojille tiedoksi'
       email_title: 'Viestiketju"%{title}" kaipaa valvojan huomiota'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -567,6 +579,7 @@ fi:
       description: "HTML joka lisätään jokaisen sivun ylälaitaan (headerin jälkeen, ennen navigaatiota tai ketjun otsikkoa)."
     bottom:
       title: "Sivun alaosa"
+      description: "HTML, joka lisätään ennen </body> elementtiä."
   site_settings:
     censored_words: "Sanat, jotka korvataan automaattisesti merkeillä &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Poista automaattisesti kaikki yli 30 päivää piilotettuna olleet viestit."
@@ -733,9 +746,10 @@ fi:
     clean_up_uploads: "Poista orpoutuneet liitetiedostot, joita ei käytetä viesteissä, laittoman hostauksen estämiseksi. VAROITUS: kannattaa varmuuskopioida /uploads kansio ennen tämän asetuksen ottamista käyttöön."
     clean_orphan_uploads_grace_period_hours: "Varoaika (tunteina) kunnes orpoutuneet liitetiedostot poistetaan"
     purge_deleted_uploads_grace_period_days: "Varoaika (päivinä) kunnes poistettu liitetiedosto tuhotaan."
-    purge_inactive_users_grace_period_days: "Varoaika (päivinä) kunnes aktivoimaton käyttäjätili tuhotaan."
+    purge_unactivated_users_grace_period_days: "Varoaika (päivinä) kunnes aktivoimaton käyttäjätili tuhotaan."
     enable_s3_uploads: "Lataa liitetiedostot Amazon S3:een. Tärkeää: edellyttää toimivat S3 kirjautumistiedot (access key id ja secret access key)."
     s3_use_iam_profile: 'Käytä AWS EC2 IAM roolia avainten hakuun. HUOM: käyttöönotto korvaa "s3 access key id" ja "s3 secret access key" asetukset.'
+    s3_upload_bucket: "Amazon S3 bucket, jonne lataukset sijoitetaan. VAROITUS: täytyy olla pienillä kirjaimilla, ei pisteitä, ei alaviivoja."
     s3_access_key_id: "Amazon S3 access key id, jota käytetään kuvien sijoittamisessa."
     s3_secret_access_key: "Amazon S3 secret access key, jota käytetään kuvien sijoittamisessa."
     s3_region: "Amazon S3 region, jota käytetään kuvien sijoittamisessa."
@@ -806,6 +820,10 @@ fi:
     white_listed_spam_host_domains: "Lista verkkotunnuksista, joita ei oteta huomioon roskapostin tunnistamisessa. Uusilla käyttäjillä ei ole rajoituksia linkkaamisessa näihin tunnuksiin."
     staff_like_weight: "Kuinka suuri ylimääräinen arvo on henkilökunnan tykkäyksillä."
     levenshtein_distance_spammer_emails: "Verrattaessa sähköpostiosoitteita tunnettuihin roskapostittajiin, näin monen merkin ero saa vielä aikaan löydöksen."
+    max_new_accounts_per_registration_ip: "Jos samasta IP osoitteesta on jo (n) luottamustason 0 käyttäjätiliä (eikä yhtään henkilökunnan tai vähintään LT2), lakkaa hyväksymästä uusia rekisteröitymisiä tästä IP:stä."
+    min_ban_entries_for_roll_up: "Kun Kääri-painiketta painetaan, luodaan IP-porttikielloista aliverkon kattavia kieltoja jos kieltoja on asettu vähintään (N) määrä."
+    max_age_unmatched_emails: "Poista osumattomat seulotut sähköpostiosoitteet (N) päivän jälkeen."
+    max_age_unmatched_ips: "Poista osumattomat seulotut IP-osoitteet (N) päivän jälkeen."
     reply_by_email_enabled: "Ota käyttöön vastaukset sähköpostin avulla."
     reply_by_email_address: "Saapuvan sähköpostin sapluuna sähköpostivastauksiin, esimerkiksi: %{reply_key}@reply.example.com tai replies+%{reply_key}@example.com"
     disable_emails: "Estä Discoursea lähettämästä mitään sähköpostia"
@@ -832,6 +850,7 @@ fi:
     logout_redirect: "Sivu, jonne selain ohjataan uloskirjautumisen jälkeen, esim: (http://sivusto.com/logout)"
     allow_uploaded_avatars: "Salli käyttäjien ladata oma avatar."
     allow_animated_avatars: "Salli käyttäjien valita animoituja gif-avatareja. VAROITUS: aja avatars:refresh rake task tämän asetuksen muuttamisen jälkeen."
+    allow_animated_thumbnails: "Luo animoidut esikatselukuvat animoiduista gif-tiedostoista."
     automatically_download_gravatars: "Lataa käyttäjille Gravatarit automaattisesti tilin luonnin ja sähköpostin vaihdon yhteydessä."
     digest_topics: "Sähköpostitiivistelmässä näytettävien ketjujen maksimimäärä."
     digest_min_excerpt_length: "Viestin katkelman vähimmäispituus sähköpostitiivistelmässä, merkeissä"
@@ -900,6 +919,11 @@ fi:
       category: 'Alueet'
       topic: 'Tulokset'
       user: 'Käyttäjät'
+  sso:
+    not_found: "Käyttäjätilin hakeminen tai luominen ei onnistunut, ota yhteys järjestelmävalvojaan."
+    account_not_approved: "Tili odottaa hyväksyntää, saat sähköpostiin ilmoituksen kun hyväksyntä on valmis"
+    unknown_error: "Virhe tietojen päivittämisessä, ota yhteyttä järjestelmävalvojaan"
+    timeout_expired: "Kirjautuminen on vanhentunut, ole hyvä ja kirjaudu uudestaan"
   original_poster: "Alkuperäinen kirjoittaja"
   most_posts: "Eniten viestejä"
   most_recent_poster: "Uusin kirjoittaja"
@@ -933,6 +957,9 @@ fi:
     autoclosed_enabled_lastpost_days:
       one: "Tämä ketju suljettiin automaattisesti 1 päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
       other: "Tämä ketju suljettiin automaattisesti %{count} päivän kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
+    autoclosed_enabled_lastpost_hours:
+      one: "Tämä ketju suljettiin automaattisesti 1 tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
+      other: "Tämä ketju suljettiin automaattisesti %{count} tunnin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
     autoclosed_enabled_lastpost_minutes:
       one: "Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
       other: "Tämä ketju suljettiin automaattisesti %{count} minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa."
@@ -1103,6 +1130,7 @@ fi:
       other: "Nämä liput annettiin yli %{count} tuntia sitten."
     please_review: "Ole hyvä ja tarkasta ne."
     post_number: "viesti"
+    how_to_disable: 'Voit muuttaa tämän sähköpostimuistutuksen tiheyttä tai ottaa sen pois käytöstä muuttamalla "notify about flags after"-asetusta.'
     subject_template:
       one: "Yksi liputus odottaa käsittelyä"
       other: "%{count} liputusta odottaa käsittelyä"
@@ -1120,6 +1148,20 @@ fi:
   system_messages:
     post_hidden:
       subject_template: "Viesti on piilotettu liputuksen johdosta"
+      text_body_template: |
+        Hei,
+
+        Tämä on automaattinen viesti sivustolta %{site_name}, koska viestisi on piilotettu.
+
+        %{base_url}%{url}
+
+        %{flag_reason}
+
+        Usea käyttäjä on liputtanut tämän viestien ennen sen piilottamista, joten harkitse miten voisit muokata viestiäsi tämän palautteen pohjalta. **Voit muokata viestiäsi %{edit_delay} minuutin kuluttua, jolloin se tuodaan taas näkyviin.** Tämä kasvattaa luottamustasoasi.
+
+        Kuitenkin, jos viesti piilotettiin toista kertaa, se pysyy piilotettuna kunnes henkilökunta tutkii tilanteen – jonka jälkeen voi seurata muita seuraamuksia, mukaan lukien tilisi hyllyttäminen.
+
+        Saadaksesi lisätietoja, lue [yhteisön säännöt](%{base_url}/guidelines).
     usage_tips:
       text_body_template: |
         Tässä yksityisviestissä on muutama pikaohje, joiden avulla pääset alkuun:
@@ -1460,13 +1502,17 @@ fi:
         ---
         %{respond_instructions}
     digest:
+      why: "Lyhyt tiivistelmä siitä mitä on tapahtunut sivustolla %{site_link} viimeisimmän vierailusi jälkeen %{last_seen_at}."
       subject_template: "[%{site_name}] Tiivistelmä ajalta %{date}"
       new_activity: "Uusi toiminta omissa ketjuissasi ja viesteissäsi:"
       top_topics: "Suosittuja viestejä"
       other_new_topics: "Suosittuja ketjuja"
+      unsubscribe: "Tämä tiivistelmä lähetetään sivustolta %{site_link}, kun emme ole nähneet sinua vähään aikaan. Jos et halua vastaanottaa näitä viestejä, %{unsubscribe_link}."
       click_here: "klikkaa tästä"
       from: "%{site_name} tiivistelmä"
       read_more: "Lue lisää"
+      more_topics: "Muita uusia ketjuja on luotu %{new_topics_since_seen}."
+      more_topics_category: "Lisää uusia ketjuja:"
       posts:
         one: "1 viesti"
         other: "%{count} viestiä"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index 25928ab069..3ec53bb181 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -33,7 +33,7 @@ fr:
   log_in: "Se connecter"
   via: "%{username} via %{site_name}"
   is_reserved: "est réservé"
-  purge_reason: "Supprimer automatiquement car devenue trop ancien et non verifier"
+  purge_reason: "Supprimé automatiquement comme compte abandonné, non activé"
   disable_remote_images_download_reason: "Le téléchargement des images externes a été désactivé faute de place suffisante sur le disque."
   errors:
     messages:
@@ -595,9 +595,6 @@ fr:
     title: "Bref titre du site, utilisé dans la balise title."
     site_description: "Décrivez ce site en une seule phrase. utilisée dans la balise meta description."
     contact_email: "Courriel de la personne responsable techniquement du site. Les notifications importantes de siscourse.org concernant les mises à jour critiques seront envoyées à cette adresse."
-    company_full_name: "OBSOLÈTE. N'est plus utilisé ou a été supprimé. Le nom complet de la société qui gère ce site, utilisé dans les documents légaux, tels que /tos et /privacy"
-    company_short_name: "OBSOLÈTE. N'est plus utilisé ou a été supprimé. Le nom de la société qui gère ce site, utilisé dans les documents légaux, tels que /tos et /privacy"
-    company_domain: "OBSOLÈTE. N'est plus utilisé ou a été supprimé. Le nom de domaine de la société qui gère ce site, utilisé dans les documents légaux, tels que /tos et /privacy"
     queue_jobs: "SEULEMENT POUR LES DÉVELOPPEURS ! ATTENTION ! Par défaut, empiler les travaux dans sidekiq. Si désactivé, votre site sera cassé."
     crawl_images: "Récupère les images provenant de sources tierces pour y insérer les dimensions corrects (hauteur et largeur)"
     download_remote_images_to_local: "Transformer les images distantes en images locales en les téléchargeant; cela permet d'éviter les liens morts."
@@ -744,7 +741,7 @@ fr:
     clean_up_uploads: "Retirer les fichiers téléchargés orphelins pour prévenir les hébergements illégaux. ATTENTION: vous devriez faire une sauvegarde de votre répertoire /uploads avant d'activer ce paramètre."
     clean_orphan_uploads_grace_period_hours: "La période de grâce (en heures) avant qu'un fichier envoyé orphelin soit retiré."
     purge_deleted_uploads_grace_period_days: "La période de grâce (en jours) avant qu'un fichier envoyé et supprimé soit effacé."
-    purge_inactive_users_grace_period_days: "Période de grâce (en jours) avant qu'un utilisateur qui n'a pas activé son compte soit supprimé."
+    purge_unactivated_users_grace_period_days: "Période de grâce (en jours) avant qu'un utilisateur qui n'a pas activé son compte soit supprimé."
     enable_s3_uploads: "Placez les fichiers envoyés sur un stockage Amazon S3. IMPORTANT: nécessite un accès valide à S3  (l'identifiant et la clé secrète)."
     s3_use_iam_profile: 'Utiliser un role AWS EC2 IAM pour la récupération des clés. NOTE: si activé, surcharge les paramètres "s3 access key id" et "s3 secret access key".'
     s3_upload_bucket: "Le nom du bucket Amazon S3 qui contiendra les fichiers téléchargés. ATTENTION : doit être en minuscule, sans points et sans caractères de soulignement."
@@ -819,6 +816,7 @@ fr:
     staff_like_weight: "Quel poids supplémentaire donner aux J'aime de l'équipe."
     levenshtein_distance_spammer_emails: "Lorsque des courriels correspondent à des spammer, la différence du nombre de caractère permettra toujours une correspondance floue."
     max_new_accounts_per_registration_ip: "S'il y a déjà (n) Niveau de confiance 0 comptes à partir de cette adresse IP ( et aucun n'est un membre du personnel ou au NC2 ou ultérieure), ne plus accepter de nouvelles inscriptions de cette IP."
+    min_ban_entries_for_roll_up: "En cliquant sur le bouton Consolider, une liste d'au moins (N) adresses interdites sera remplacée par une plage de sous réseau."
     reply_by_email_enabled: "Activer les réponses aux sujets via courriel."
     reply_by_email_address: "Modèle pour la réponse par courriel entrant; exemple : %{reply_key}@reply.example.com ou replies+%{reply_key}@example.com"
     disable_emails: "Désactiver l'envoi de les courriels depuis Discourse."
@@ -914,6 +912,11 @@ fr:
       category: 'Catégories'
       topic: 'Résultats'
       user: 'Utilisateurs'
+  sso:
+    not_found: "Impossible de rechercher ou de créer un compte, contacter l'administrateur du site"
+    account_not_approved: "Le compte est en attente d'approbation. Vous recevrez un avis par courriel une fois approuvé."
+    unknown_error: "Erreur de mise à jour des informations, contacter l'administrateur du site"
+    timeout_expired: "La connexion au compte a été interrompue, veuillez vous connecter à nouveau"
   original_poster: "Créateur du sujet"
   most_posts: "Le plus de messages"
   most_recent_poster: "Auteur le plus récent"
@@ -1803,25 +1806,3 @@ fr:
       \ ?](#cookies)\n\nOui. Les cookies sont de petits fichiers qu'un site ou son prestataire de services transfert sur le disque dur de votre ordinateur via votre navigateur Web (si vous permettez). Ces cookies permettent au site de reconnaître votre navigateur et, si vous avez un compte enregistré, l'associer à votre compte enregistré.\n\nNous utilisons des cookies pour comprendre et sauvegarder vos préférences pour de futures visites et compiler des données globales sur le trafic du site et les interactions avec le site afin que nous puissions offrir de meilleures expériences de navigation et de meilleurs outils à l'avenir. Nous pouvons conclure des contrats avec des fournisseurs de services tiers pour nous aider à mieux comprendre les visiteurs du site. Ces fournisseurs de services ne sont pas autorisés à utiliser les renseignements recueillis en notre nom, sauf pour nous aider à mener et à améliorer notre entreprise.\n\n<a name=\"disclose\"></a>\n\n## [Divulguons-nous des informations à des tiers?](#disclose)\n\nNous ne vendons pas, ni échangeons, ou même transférerons vos renseignements personnelles à des tiers. Ceci n'inclut pas les tiers de confiance qui nous aident à exploiter notre site, la conduite de nos affaires, ou vous servir, tant que ces parties conviennent à garder ces informations\
       \ confidentiels. Nous pouvons également divulguer vos informations lorsque nous croyons nécessaire de se conformer à la loi, appliquer nos politiques de site, ou la nôtre ou d'autres droits, la propriété ou la sécurité. Toutefois, des informations non personnelles des visiteurs peuvent être fournis à d'autres parties pour le marketing, la publicité, ou d'autres utilisations.\n\n<a name=\"third-party\"></a>\n\n## [Liens vers des tiers](#third-party)\n\nParfois, à notre discrétion, nous pouvons inclure ou offrir des produits ou services de tiers sur notre site. Ces sites tiers ont des politiques de confidentialité distinctes et indépendantes. Nous n'avons donc aucune responsabilité pour le contenu et les activités de ces sites. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes disposés à accueillir tous les commentaires au sujet de ces sites. \n\n<a name=\"coppa\"></a>\n\n## [Protection des mineurs](#coppa)\n\nNotre site, produits et services sont dirigés vers les personnes qui ont au moins 13 ans ou plus. Si ce serveur est aux Etats-Unis, et que vous êtes sous l'âge de 13 ans, conformément aux exigences de la COPPA ([Children's Online Privacy Protection Act](http://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), n'utiliser pas ce site. <a name=\"\
       online\"></a> ## [Politique de confidentialité en ligne](#online) Cette politique de confidentialité en ligne s'applique uniquement aux informations collectées sur notre site et non aux informations recueillies hors connexion. <a name=\"consent\"></a> ## [Votre consentement](#consent) En utilisant notre site, vous consentez à la Politique de confidentialité de notre site web.\n\n<a name=\"changes\"></a>\n\n## [Changements à notre politique de confidentialité](#changes)\n\nSi nous décidons de changer notre politique de confidentialité, nous afficherons ces modifications sur cette page.\n\nCe document est soumis à la licence creative commons CC-BY-SA.\n"
-  static:
-    search_help: |
-      <h2>Astuces</h2>
-      <p>
-      <ul>
-        <li>Les résultats dont le titre correspond à la recherche sont retournés en priorité. Donc, en cas de doutes, recherchez dans les titres</li>
-        <li>Pour obtenir de meilleurs résultats, utilisez toujours des mots rares ou peu fréquents</li>
-        <li>Dès que possible, limitez vos recherches à une catégorie en particulier, à un utilisateur ou à un sujet</li>
-      </ul>
-      </p>
-      <h2>Paramètres</h2>
-      <p>
-        <table>
-        <tr><td><code>order:views</code></td><td><code>order:latest</code></td><td colspan=3></td></tr>
-        <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:singleuser</code></td></tr>
-        <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td colspan=3></td></tr>
-        <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td></td></tr>
-        </table>
-      </p>
-      <p>
-        <code>rainbows category:parks status:open order:latest</code> recherchera les sujets qui contiennent le mot "rainbows", qui sont dans la catégorie "parks" et qui ne sont ni fermés ni archivé. Les résultats seront triés par la date du dernier message publié.
-      </p>
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index bd08cd1378..bc63db4dfe 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -6,6 +6,9 @@
 # https://www.transifex.com/projects/p/discourse-org/
 
 he:
+  stringex:
+    characters:
+      number: "-"
   i18n:
     transliterate:
       rule:
@@ -30,7 +33,7 @@ he:
   log_in: "התחברות"
   via: "%{username} עם %{site_name}"
   is_reserved: "שמור"
-  purge_reason: "נמחק באופן אוטומטי מכיוון שהיה ישן וללא שינוי"
+  purge_reason: "נמחק באופן אוטומטי כחשבון נטוש ולא פעיל"
   disable_remote_images_download_reason: "הורדת תמונות מרחוק נחסמה בשל היעדר מספיק שטח אכסון פנוי."
   errors:
     messages:
@@ -355,12 +358,14 @@ he:
   activation:
     action: "הפעל/י את חשבונך"
     already_done: "סליחה, כתובת אישור החשבון הזו אינה זמינה יותר. אולי החשבון שלך כבר פעיל?"
+    please_continue: "חשבונך החדש אושר; הנכם מועברים לעמוד הבית."
     continue_button: "המשך ל-%{site_name}"
     welcome_to: "ברוכים הבאים ל-%{site_name}!"
     approval_required: "מנהל צריך לאשר את החשבון שלך ידנית לפני שתוכל להיכנס לפורום הזה. יישלח אליך דואר אלקטרוני כשהחשבון שלך יאושר!"
   post_action_types:
     off_topic:
       title: 'אוף-טופיק'
+      description: 'פרסום זה אינו רלוונטי לדיון הנוכחי כפי שהוגדר בכותרת ובפרסום הראשון, ולכן כנראה שעליו לעבור למקום אחר.'
       long_form: 'דוגלל כאוף-טופיק'
     spam:
       title: 'ספאם'
@@ -371,10 +376,15 @@ he:
       description: 'פרסום זה מכיל תוכן שאדם סביר היה רואה כפוגעני, מתעלל או הפרה של <a href="/guidelines"> כללי הקהילה </a>.'
       long_form: 'דוגלל כלא ראוי'
     notify_user:
+      title: 'מסר פרטי @{{username}}'
       description: 'פרסום זה מכיל משהו שארצה לשוחח עליו עם האדם הזה באופן ישיר ופרטי. אין צורך בסימון.'
+      long_form: 'הועבר מסר פרטי למשתמש/ת'
       email_title: 'הפרסום שלךב"%{title}"'
       email_body: "%{link}\n\n%{message}"
     notify_moderators:
+      title: "משהו אחר"
+      description: 'פרסום זה דורש את תשומת ליבו של מנחה מסיבה שאינה מצויינת למעלה.'
+      long_form: 'זה סומן לתשומת הלב של מנחה'
       email_title: 'הודעה ב-"%{title}" דורשת תשומת לב של מנהל'
       email_body: "%{link}\n\n%{message}"
     bookmark:
@@ -399,7 +409,9 @@ he:
       description: 'נושא זה מכיל תוכן שהאדם הסביר היה מחשיב פוגעני, מתעלל או הפרה של  <a href="/guidelines"> כללי ההתנהלות בקהילה שלנו </a>.'
       long_form: 'דוגלל כלא ראוי'
     notify_moderators:
+      title: "משהו אחר"
       description: 'נושא זה דורש התייחסות של מנחה (moderator) כללי, על פי  <a href="/guidelines"> הכללים המנחים </a>, <a href="%{tos_url}">TOS</a>, או סיבה אחרת שאינה מופיעה כאן.'
+      long_form: 'זה סומן לתשומת הלב של מנחה'
       email_title: 'הנושא "%{title}" דורש תשומת לב של מנהל'
       email_body: "%{link}\n\n%{message}"
   flagging:
@@ -557,6 +569,7 @@ he:
       description: "HTML that will be added at the top of every page (after the header, before the navigation or the topic title)."
     bottom:
       title: "Bottom of the pages"
+      description: "קוד HTML שיתווסף לפני התגית <body/>."
   site_settings:
     censored_words: "מלים שיוחלפו באופן אוטומטי ב- &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "מחיקת אוטומטית של פרסומים מוסתרים שנותרים מוסתרים במשך יותר מ-30 יום."
@@ -577,9 +590,6 @@ he:
     title: "כותרת קצרה של אתר זה, תשמש בתיוג הכותרת (title tag)."
     site_description: "תארו אתר זה בעזרת משפט אחד, ישמש בתגית התיאור (meta description tag)."
     contact_email: "כתובת הדוא\"ל של דמות מפתח באתר. הודעות חשובות מטעם discourse.org בנוגע לעדכונים חשובים ישלחו לכתובת זו."
-    company_full_name: "מיושן. אינו בשימוש יותר ויוסר. השם המלא של החברה שמריצה אתר זה, משמש במסמכים משפטיים, כמו /tos ו-/privacy"
-    company_short_name: "מיושן. אינו בשימוש יותר ויוסר. השם הקצר של החברה שמריצה אתר זה, משמש במסמכים משפטיים כמו /tos ו-/privacy"
-    company_domain: "מיושן. אינו בשימוש יותר ויוסר. שם המתחם שבבעלות החברה שמריצה אתר זה, משמש במסמכים משפטיים כמו /tos ו- /privacy"
     queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "אחזור תמונות מכתובת URL רחוקה כדי להכניס את מימדי האורך והרוחב הנכונים."
     download_remote_images_to_local: "המרת תמונות מרחוק לתמונות מקומיות באמצעות הורדות; למניעת שגיאות של תמונות חסרות"
@@ -680,6 +690,7 @@ he:
     min_password_length: "Minimum password length."
     block_common_passwords: "אל תאפשרו סיסמאות מתוך 10,000 הסיסמאות הנפוצות ביותר."
     enable_sso: "אפשרו התחברות יחידה באמצעות אתר חיצוני (הערה: מבטל אפשרות להזמנות)"
+    enable_sso_provider: "ליישם את פרוטוקול SSO של Discourse בנקודת הסיום /session/sso, זה דורש כיוון של sso_secret."
     sso_url: "URL of single sign on endpoint"
     sso_secret: "Secret string used to encrypt/decrypt SSO information, be sure it is 10 chars or longer"
     sso_overrides_email: "Overrides local email with external site email from SSO payload (WARNING: discrepancies can occur due to normalization of local emails)"
@@ -726,9 +737,10 @@ he:
     clean_up_uploads: "הסירו העלאות יתומות וללא הפניה כדי למנוע אירוח בלתי חוקי של חומר. אזהרה: אתם עלולי לרצות לגבות את תיקיית ה-/uploads שלכם לפנו שתאפשרו הגדרה זו."
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
-    purge_inactive_users_grace_period_days: "תקופת המתנה (בימים) לפני שמשתמש שלא הפעיל את החשבון שלו יימחק."
+    purge_unactivated_users_grace_period_days: "תקופת חסד (בימים) לפני שמשתמש/ת שלא הפעילו את חשבונם ימחקו."
     enable_s3_uploads: "אחסן העלאות (uploads) על תשתית של Amazon S3. חשוב: מצריך מפתח גישה + מפתח גישה סודי שיהיו חוקיים."
     s3_use_iam_profile: 'השתמש ב-AWS EC2 IAM role על מנת לאחזר מפתחות. שימו לב: איפשור של זה ידרוס את ההגדרות "S3 access key id" וכן את "s3 secret access key".'
+    s3_upload_bucket: "השם של Amazon S3 bucket אליו יועלו קבצים. אזהרה: שם זה חייב להיות באותיות קטנות, ללא נקודות וללא קווים תחתונים."
     s3_access_key_id: "מפתח הגישה (access key id) של Amazon S3 שישמש להעלאת התמונות."
     s3_secret_access_key: "מפתח הגישה הסודי (secret access key) של Amazon S3 שישמש להעלאת תמונות."
     s3_region: "שם האזור (region name) של Amazon S3 שישמש להעלאת תמונות."
@@ -799,6 +811,10 @@ he:
     white_listed_spam_host_domains: "רשימה של מתחמים (domain) שיוחרגו מבדיקת הספאם. משתמשים חדשים לעולם לא יוגבלו ביצירת פרסומים חדשים עם קישורים למתחמים אלו."
     staff_like_weight: "כמה משקל עודף יש להעניק ללייקים של הצוות."
     levenshtein_distance_spammer_emails: "כאשר מתאימים דוא\"ל של ספאמרים, מספר ההבדלים בתווים שעדיין מאפשרים התאמה מטושטשת."
+    max_new_accounts_per_registration_ip: "אם ישנם כבר (n) חשבונות עם רמת אמון 0 מכתובת IP זו (ואף אחד מהם אינו חבר צוות, או בעל/ת רמת אמון 2 ומעלה), הפסיקו קצת הרשמות מכתובת IP זו."
+    min_ban_entries_for_roll_up: "בעת לחיצה על לחצן הגלילה למעלה, ייוצר איסור כניסת משנה (subnet ben entry) חדשה אם יש לפחות (N) ערכים."
+    max_age_unmatched_emails: "מחק ערכי דוא\"ל לא תואמים שמוצגים לאחר (N) ימים."
+    max_age_unmatched_ips: "מחק ערכי IP לא תואמים שמוצגים לאחר (N) ימים."
     reply_by_email_enabled: "אפשרו  תגובה לנושאים באמצעות הדוא\"ל."
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
     disable_emails: "מנעו מ-Discourse ממשלו דוא\"ל כלשהו."
@@ -825,6 +841,7 @@ he:
     logout_redirect: "מיקום להכוונת הדפדפן לאחר ההתנתקות לדוגמא: (http://somesite.com/logout)"
     allow_uploaded_avatars: "אפשרו למשתמשים להעלות אווטרים מותאמים אישית."
     allow_animated_avatars: "אפשרו למשתמשים להשתמש באווטרים מסוג GIF אנימציה. אזהרה: הריצו את האווטרים: רעננו לאחר שינוי הגדרה זו."
+    allow_animated_thumbnails: "יצירת תמונות אנימציה מוקטנות קטנות של קבצי אנימציית gif."
     automatically_download_gravatars: "הורדת גראווטרים למשתמשים בעת יצירת החשבון או שינוי כתובת הדוא\"ל."
     digest_topics: "מספר הנושאים המקסימלי להצגה במייל סיכום."
     digest_min_excerpt_length: "מספר התווים המינימלי למובאות מתוך הפרסום במייל הסיכום."
@@ -893,6 +910,11 @@ he:
       category: 'קטגוריות'
       topic: 'תוצאות'
       user: 'משתמשים'
+  sso:
+    not_found: "לא ניתן לאתר או ליצור חשבון, צרו קשר עם אדמין."
+    account_not_approved: "החשבון ממתין לאישור, תקבל/י הודעת דוא\"ל ברגע שיאושר."
+    unknown_error: "שגיאה בעדכון המידע, צרו קשר עם האדמין"
+    timeout_expired: "תם זמן החיבור לחשבון, אנא נסו להתחבר שוב"
   original_poster: "מפרסם מקורים"
   most_posts: "מירב ההודעות"
   most_recent_poster: "המפרסם האחרון"
@@ -926,6 +948,9 @@ he:
     autoclosed_enabled_lastpost_days:
       one: "נושא זה ננעל אוטומטית לאחר יום אחד מהתגובה האחרונה. תגובות חדשות לא מתקבלות."
       other: "נושא זה ננעל אוטומטית לאחר %{count} ימים מהתגובה האחרונה. תגובות חדשות לא מתקבלות."
+    autoclosed_enabled_lastpost_hours:
+      one: "נושא זה נסגר שעה לאחר התגובה האחרונה. תגובות נוספות אינן מותרות יותר."
+      other: "נושא זה נסגר אוטומטית  %{count} שעות לאחר התגובה האחרונה. תגובות נוספות אינן מותרות יותר."
     autoclosed_enabled_lastpost_minutes:
       one: "נושא זה ננעל אוטומטית לאחר דקה מהתגובה האחרונה. תגובות חדשות לא מתקבלות."
       other: "נושא זה ננעל אוטומטית לאחר %{count} דקות מהתגובה האחרונה. תגובות חדשות לא מתקבלות."
@@ -1028,12 +1053,30 @@ he:
       - ביקור ב[meta.discourse.org](http://meta.discourse.org) לחדשות, דיונים ותמיכה ב-Discourse.
   new_version_mailer_with_notes:
     subject_template: "[%{site_name}] update available"
+    text_body_template: |
+      גרסה חדש של [Discourse](http://www.discourse.org) זמינה.
+
+      הגרסה שלכם:  %{installed_version}
+      הגרסה החדשה:  **%{new_version}**
+
+      ייתכן ותרצו:
+
+      - לראות מה חדש ב- [GitHub changelog](https://github.com/discourse/discourse/commits/master).
+
+      - לעדכן באמצעות ביקור ב- [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade), ולחיצה על כפתור ה-"Upgrade".
+
+      - ביקור ב-[meta.discourse.org](http://meta.discourse.org) לחדשות, דיונים ותמיכה ב-Discourse.
+
+      ### פרטי הגרסה המשוחררת
+
+      %{notes}
   flags_reminder:
     flags_were_submitted:
       one: "סימונים אלו נשלחו לפני כשעה."
       other: "סימונים אלה נשלחו לפני %{count} שעות."
     please_review: "Please review them."
     post_number: "post"
+    how_to_disable: 'תוכל/י לבטל או לשנות את תדירות תזכורת דוא"ל באמצעות ההגדרה "הודעה על סימונים אחרי...".'
     subject_template:
       one: "סימון אחד ממתין לטיפול"
       other: "%{count} סימונים ממתינים לטיפול"
@@ -1303,13 +1346,17 @@ he:
         ---
         %{respond_instructions}
     digest:
+      why: "סיכום קצר של %{site_link} מאז ביקורך האחרון ב-%{last_seen_at}"
       subject_template: "[%{site_name}] Forum Activity for %{date}"
       new_activity: "New activity on your topics and posts:"
       top_topics: "Recent posts the community enjoyed:"
       other_new_topics: "Other New Topics:"
+      unsubscribe: "תקציר זה נשלח אליך מ-%{site_link} מכיוון שלא ראינו אותך מזה זמן מה. קישור לביטול ההרשמה %{unsubscribe_link}."
       click_here: "click here"
       from: "%{site_name} digest"
       read_more: "Read More"
+      more_topics: "ישנם %{new_topics_since_seen} נושאים חדשים נוספים."
+      more_topics_category: "עוד נושאים חדשים:"
       posts:
         one: "1 post"
         other: "%{count} posts"
@@ -1524,5 +1571,3 @@ he:
       א0 נחליט לשנות את מדיניות הפרטיות שלנו, נפרסם שינויים אלו בעמוד זה.
 
       מסמך זה מפורסם תחת רשיון CC-BY-SA. הוא עודכן לאחרונה ב-31 למאי, 2013.
-  static:
-    search_help: "<h2>טיפים</h2>\n<p>\n<ul>\n  <li>כותרות מוצגות על פי סדר עדיפות, כך שכשיש ספק, חפשו: titles</li>\n  <li>מלים ייחודיות ולא מקובלות יציגו תמיד את התוצאות הטובות ביותר</li>\n  <li>כאשר זה אפשרי, צמצמו את החיפוש שלכם לקטגוריה, משתמש או נושא</li>\n</ul>\n</p>\n<h2>אפשרויות</h2>\n<p>\n  <table>\n  <tr><td><code>order:views</code></td><td><code>order:latest</code></td><td colspan=3></td></tr>\n  <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:singleuser</code></td></tr>\n  <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td colspan=3></td></tr>\n  <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td></td></tr>\n  </table>\n</p>\n<p>\n  <code>rainbows category:parks status:open order:latest</code> \nיחפש נושאים הכוללים את המילה \"rainbows\" בקטגוריה \"parks\" שאינם סגורים או מאורכבים, על פי סדר תאריך הפרסום האחרון.</p>\n"
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index e5e2e771ed..22392cf9e4 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -33,7 +33,7 @@ it:
   log_in: "Accedi"
   via: "%{username} via %{site_name}"
   is_reserved: "è riservato"
-  purge_reason: "Cancellato automaticamente poiché vecchio e non verificato"
+  purge_reason: "Cancellato automaticamente come account abbandonato e mai attivato"
   disable_remote_images_download_reason: "Lo scaricamento delle immagini remote è stato disabilitato perché non c'è abbastanza spazio disco disponibile."
   errors:
     messages:
@@ -262,17 +262,17 @@ it:
         one: "1m"
         other: "%{count}m"
       about_x_hours:
-        one: "1h"
-        other: "%{count}h"
+        one: "1o"
+        other: "%{count}o"
       x_days:
-        one: "1d"
-        other: "%{count}d"
+        one: "1g"
+        other: "%{count}gg"
       about_x_months:
-        one: "1mes"
-        other: "%{count}mes"
+        one: "1mese"
+        other: "%{count}mesi"
       x_months:
-        one: "1mes"
-        other: "%{count}mes"
+        one: "1mese"
+        other: "%{count}mesi"
       about_x_years:
         one: "1a"
         other: "%{count}a"
@@ -508,7 +508,7 @@ it:
     failing_emails_warning: 'Ci sono %{num_failed_jobs} job di email falliti. Controlla il tuo file config/environments/production.rb e accertati che le impostazioni config.action_mailer siano corrette. <a href="/sidekiq/retries" target="_blank">Guarda i job falliti in Sidekiq</a>.'
     default_logo_warning: "Non hai personalizzato le immagini dei logo per il tuo sito. Aggiorna logo_url, logo_small_url, e favicon_url nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
     contact_email_missing: "Non hai fornito una email di contatto per il tuo sito. Per favore aggiorna il campo contact_email nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
-    contact_email_invalid: "Il contatto email non è valido. Per favore aggiorna contact_email nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
+    contact_email_invalid: "La email di contatto non è valida. Per favore aggiorna contact_email nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
     title_nag: "Il titolo del sito è ancora impostato al valore di default. Per favore aggiornalo con il titolo del tuo sito, dalle <a href='/admin/site_settings'>Impostazioni Sito</a>."
     site_description_missing: "L'impostazione site_description è vuota. Scrivi una breve descrizione del forum nelle <a href='/admin/site_settings'>Impostazioni del sito</a>."
     consumer_email_warning: "Il tuo sito è configurato per usare Gmail (o un altro servizio email consumer) per inviare le email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limita il numero di email che puoi inviare</a>. Considera l'utilizzo di un provider come mandrill.com per l'invio delle tue email."
@@ -584,10 +584,14 @@ it:
     exclude_rel_nofollow_domains: "Una lista di domini separati da pipe | in cui il nofollow non viene aggiunto (tld.com autorizzerà automaticamente sub.tld.com)"
     post_excerpt_maxlength: "Lunghezza massima dell'estratto / riassunto di un messaggio."
     post_onebox_maxlength: "Lunghezza massima in caratteri di un messaggio Discourse in Onebox."
+    onebox_domains_whitelist: "Lista di domini per i quali consentire la funzione di onebox; questi domini devono supportare OpenGraph o oEmbed. Controllali con http://iframely.com/debug"
     logo_url: "Il logo mostrato in alto a sinistra del tuo sito, es: http://example.com/logo.png"
     digest_logo_url: "Il logo alternativo usato in cima alla email di riepilogo. Se lasciato vuoto, sarà utilizzato il campo `logo_url`. es: http://example.com/logo.png"
+    logo_small_url: "Il logo piccolo che si vede in alto a sinistra del tuo sito, compare quando scorri in basso. es. http://example.com/logo-small.png"
     favicon_url: "La favicon del tuo sito, vedi http://it.wikipedia.org/wiki/Favicon"
+    mobile_logo_url: "Il logo a posizione fissata che si vede in alto a sinistra del tuo sito mobile. Se lasciato vuoto verrà usato `logo_url`. es: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Icona usata per dispositivi touch Apple. La dimensione consigliata è 144 x 144 pixel."
+    notification_email: "L'indirizzo presente nel campo from: usato per inviare tutte le email essenziali di sistema. Il dominio indicato deve avere i record SPF, DKIM e reverse PTR impostati correttamente perché l'email arrivi."
     email_custom_headers: "Una lista di intestazioni email personalizzate delimitata da una barra verticale (pipe |)"
     use_https: "La URL completa del sito (Discourse.base_url) deve essere http o https? NON ATTIVARE SE HTTPS NON E' GIA' CONFIGURATO E FUNZIONANTE!"
     summary_score_threshold: "Il punteggio minimo richiesto affinché un messaggio sia incluso in 'Riassumi Questo Argomento'"
@@ -708,11 +712,13 @@ it:
     newuser_max_attachments: "Quanti allegati un nuovo utente può aggiungere ad un post."
     newuser_max_replies_per_topic: "Numero massimo di risposte, che un utente può inoltrare in un singolo topic, prima che qualcuno risponda."
     title_fancy_entities: "Converti caratteri ASCII comuni in HTML nei titoli dell'argomento, tipo SmartyPants http://daringfireball.net/projects/smartypants/"
+    category_colors: "Un elenco di valori di colori esadecimali permessi per le categorie."
     title_prettify: "Previeni refusi ed errori comuni nei titoli, inclusi Tutto maiuscolo, Primo carattere minuscolo, ! e ? ripetuti, . aggiuntivi alla fine, etc etc."
     faq_url: "Se hai un documento sulle FAQ ospitato da qualche altra parte che vuoi usare, fornisci l'URL qui."
     tos_url: "Se hai un documento dei Termini di Servizio ospitato da qualche altra parte che vuoi usare, fornisci l'URL qui."
     privacy_policy_url: "Se hai un documento sulle Politiche di Privacy ospitato da qualche altra parte che vuoi usare, fornisci l'URL qui."
     newuser_spam_host_threshold: "Il numero delle volte che un nuovo utente può postare un link verso lo stesso host compreso nel `newuser_spam_host_posts` post prima che venga considerato spam."
+    reply_by_email_enabled: "Abilita la possibilità di rispondere ai messaggi tramite e-mail."
     reply_by_email_address: "Template di risposta via email, per esempio: %{reply_key}@risposta.esempio.com o risposte+%{reply_key}@esempio.com"
     pop3_polling_port: "La porta dell'account POP3."
     delete_user_max_post_age: "Non permettere di cancellare utenti il cui primo messaggio è più vecchio di (x) giorni."
@@ -727,6 +733,7 @@ it:
     enable_mobile_theme: "I dispositivi mobile usano un tema apposito, con possibilità di passare alla visualizzazione desktop. Disabilita questa opzione se vuoi usare un foglio di stile custom e completamente responsive."
     suppress_uncategorized_badge: "Non mostrare la targhetta per gli argomenti senza categoria nell'elenco degli argomenti."
     global_notice: "Mostra a tutti i visitatori un avviso con striscione globale URGENTE, EMERGENZA, lascia vuoto per nasconderlo (HTML consentito)."
+    invites_per_page: "Inviti predefiniti mostrati nella pagina utente."
     short_progress_text_threshold: "Quando il numero di messaggi di un argomento supera questo valore, la barra di avanzamento mostrerà solo il numero attuale di messaggi. Se modifichi la lunghezza della barra di avanzamento, potresti dover cambiare questo valore."
     default_code_lang: "Ai blocchi di codice GitHub viene applicata l'evidenziazione della sintassi del linguaggio di programmazione di default (lang-auto, ruby, python ecc.)"
     embed_truncate: "Tronca i messaggi incorporati."
@@ -798,6 +805,9 @@ it:
     autoclosed_enabled_lastpost_days:
       one: "Questo argomento è stato automaticamente chiuso un giorno dopo l'ultima risposta. Non sono permesse altre risposte."
       other: "Questo argomento è stato automaticamente chiuso %{count} giorni dopo l'ultima risposta. Non sono permesse altre risposte."
+    autoclosed_enabled_lastpost_hours:
+      one: "Questo argomento è stato automaticamente chiuso un'ora dopo l'ultima risposta. Non sono permesse altre risposte."
+      other: "Questo argomento è stato automaticamente chiuso %{count} ore dopo l'ultima risposta. Non sono permesse altre risposte."
     autoclosed_enabled_lastpost_minutes:
       one: "Questo argomento è stato automaticamente chiuso un minuto dopo l'ultima risposta. Non sono permesse altre risposte."
       other: "Questo argomento è stato automaticamente chiuso %{count} minuti dopo l'ultima risposta. Non sono permesse altre risposte."
@@ -937,6 +947,8 @@ it:
         Ci dispiace, ma il tuo messaggio email per %{destination} (con il titolo %{former_title}) non è stato processato.
 
         Il tuo utente non ha il livello di esperienza richiesto per inviare nuovi argomenti a questo indirizzo email. Se credi che ciò sia un errore, contatta un membro dello staff.
+    email_reject_no_account:
+      subject_template: "Problema relativo all'e-mail -- Account sconosciuto"
     email_reject_empty:
       subject_template: "Problema email -- Nessun contenuto"
     email_reject_parsing:
@@ -945,6 +957,8 @@ it:
       subject_template: "Problema email -- Errore di invio"
     email_reject_post_error_specified:
       subject_template: "Problema email -- Errore di invio"
+    email_reject_topic_not_found:
+      subject_template: "Problema relativo all'e-mail -- Argomento non trovato"
     too_many_spam_flags:
       subject_template: "Nuovo account bloccato"
       text_body_template: "Ciao, \n\nil presente è un messaggio automatico da %{site_name} per informarti che i tuoi messaggi sono stati automaticamente nascosti perché segnalati dalla comunità. \n\nCome misura precauzionale, il tuo nuovo account non può creare altre risposte o argomenti finché il tuo account non verrà revisionato da un membro dello staff. \n\nPer ulteriori informazioni, ti rimandiamo alle [Linee guida della comunità](%{base_url}/guidelines).\n"
@@ -984,16 +998,16 @@ it:
     download_remote_images_disabled:
       subject_template: "Lo scaricamento delle immagini remote è disabilitato"
       text_body_template: "L'impostazione `download_remote_images_to_local` è stata disabilitata perché il limite di spazio sul disco definito in `download_remote_images_threshold` è stato raggiunto."
-  unsubscribe_link: "Se vuoi cancellarti per non ricevere più queste email, visita le tue [preferenze utente](%{user_preferences_url})."
+  unsubscribe_link: "Se vuoi annullare l'iscrizione a queste email, visita le tue [preferenze utente](%{user_preferences_url})."
   subject_re: "R:"
   subject_pm: "[MP]"
   user_notifications:
     previous_discussion: "Risposte Precedenti"
     unsubscribe:
-      title: "Cancella iscrizione"
-      description: "Non sei interessato a ricevere queste email? Nessun problema! Clicca qui sotto per cancellarti istantaneamente:"
+      title: "Annulla iscrizione"
+      description: "Non vuoi ricevere queste email? Nessun problema! Clicca qui sotto per annullare l'iscrizione:"
     reply_by_email: "Per intervenire, rispondi a questa email o visita %{base_url}%{url}."
-    visit_link_to_respond: "Per intervenire, visita %{base_url}%{url}"
+    visit_link_to_respond: "Per rispondere, visita %{base_url}%{url}"
     posted_by: "Pubblicato da %{username} il %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} ti invita alla conversazione privata '%{topic_title}'"
@@ -1047,18 +1061,19 @@ it:
         ---
         %{respond_instructions}
     digest:
-      subject_template: "[%{site_name}] Riepilogo per %{date}"
+      subject_template: "[%{site_name}] Riepilogo del %{date}"
       new_activity: "Nuove attività nei tuoi argomenti e messaggi:"
-      top_topics: "Post Popolari"
+      top_topics: "Messaggi di successo"
       other_new_topics: "Argomenti più attivi"
       click_here: "clicca qui"
       from: "%{site_name} riepilogo"
-      read_more: "Leggi altro"
+      read_more: "Leggi Altro"
+      more_topics_category: "Ulteriori nuovi argomenti:"
       posts:
-        one: "1 post"
-        other: "%{count} post"
+        one: "1 messaggio"
+        other: "%{count} messaggi"
     forgot_password:
-      subject_template: "[%{site_name}] Reset Password"
+      subject_template: "[%{site_name}] Reimposta password"
       text_body_template: |
         Qualcuno ha richiesto il reset della password per questo account su [%{site_name}](%{base_url}).
 
@@ -1067,7 +1082,7 @@ it:
         Clicca il link qui sotto per scegliere una nuova password:
         %{base_url}/users/password-reset/%{email_token}
     set_password:
-      subject_template: "[%{site_name}] Imposta una password"
+      subject_template: "[%{site_name}] Imposta Password"
       text_body_template: "Qualcuno ha richiesto di aggiungere una password al tuo account su [%{site_name}](%{base_url}). In alternativa, puoi collegarti usando uno dei servizi online supportati (Google, Facebook ecc.) associato con questo indirizzo email validato. \n\nSe non hai fatto tu questa richiesta, ignora tranquillamente questa email.\n\nClicca sul seguente collegamento per scegliere una password:\n%{base_url}/users/password-reset/%{email_token}\n"
     account_created:
       subject_template: "[%{site_name}] Il Tuo Nuovo Account "
@@ -1078,7 +1093,7 @@ it:
 
         %{base_url}/users/authorize-email/%{email_token}
     signup_after_approval:
-      subject_template: "Puoi partecipare a %{site_name}!"
+      subject_template: "Sei stato ammesso su %{site_name}!"
       text_body_template: |+
         Benvenuto su %{site_name}!
 
@@ -1106,7 +1121,7 @@ it:
         Se il link non è cliccabile, copialo ed incollalo manualmente nella barra degli indirizzi del browser.
   page_not_found:
     title: "La pagina richiesta non esiste oppure è privata."
-    popular_topics: "Popolari"
+    popular_topics: "Di successo"
     recent_topics: "Recenti"
     see_more: "Altro"
     search_title: "Cerca nel sito"
@@ -1118,7 +1133,7 @@ it:
   terms_of_service:
     title: "Termini di Servizio"
     signup_form_message: 'Ho letto e accetto i <a href="/tos" target="_blank">Termini del Servizio</a>.'
-  deleted: 'cancellato'
+  deleted: 'cancellati'
   upload:
     edit_reason: "copie locali delle immagini scaricate"
     unauthorized: "Spiacenti, il file che stai cercando di caricare non è autorizzato (estensioni autorizzate: %{authorized_extensions})."
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 69d6d6f599..8f094c4933 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -33,7 +33,6 @@ ja:
   log_in: "ログイン"
   via: "%{username} via %{site_name}"
   is_reserved: "is reserved"
-  purge_reason: "古い、もしくは未検証の為、自動的に削除された"
   disable_remote_images_download_reason: "ディスク容量が不足しているため、リモートでの画像ダウンロードは無効になっています。"
   errors:
     messages:
diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml
index 01a1c6b9c6..cae44c3692 100644
--- a/config/locales/server.ko.yml
+++ b/config/locales/server.ko.yml
@@ -33,7 +33,6 @@ ko:
   log_in: "로그인"
   via: "%{site_name}의 %{username}"
   is_reserved: "예약됨"
-  purge_reason: "오래되고 검수되지 않은 글은 자동 삭제"
   disable_remote_images_download_reason: "서버에 저장공간이 부족해서  원격 이미지 저장이 비활성화됨. "
   errors:
     messages:
@@ -557,9 +556,6 @@ ko:
     title: "title 태그에 쓰일, 이 싸이트의 짧은 제목"
     site_description: "이 사이트를 한 문장으로 설명해 주세요. meta description 태그에 사용됩니다."
     contact_email: "이 사이트에 대한 주 이메일 주소. discourse.org로부터 중요한 업데이트에 대한 정보가 이 메일 주소로 보내질 것입니다."
-    company_full_name: "DEPRECATED. Not used anymore and will be removed. The full name of the company that runs this site, used in legal documents like /tos and /privacy"
-    company_short_name: "DEPRECATED. Not used anymore and will be removed. The full name of the company that runs this site, used in legal documents like /tos and /privacy"
-    company_domain: "DEPRECATED. Not used anymore and will be removed. The full name of the company that runs this site, used in legal documents like /tos and /privacy"
     queue_jobs: "오직 개발자만!! 주의!! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "제대로된 넓이와 높이를 추가하기 위해, 원격 URL로 부터 이미지를 회수해온다."
     download_remote_images_to_local: "이미지를 다운로드하면 원격 이미지를 로컬이미지로 변경한다. 이미지가 깨지는 것을 막을 수 있다."
@@ -691,7 +687,6 @@ ko:
     clean_up_uploads: "불법 호스팅을 막기 위해서 참조되지 않은 업로드 파일은 제거한다. 주의 : 이 설정을 활성화 하기 전에 `/uploads` 디렉토리를 백업하는 것이 좋다."
     clean_orphan_uploads_grace_period_hours: "참조되지 않은 업로드 파일을 제거하기 전 기간(시간)"
     purge_deleted_uploads_grace_period_days: "참조되지 않은 업로드 파일을 완전 삭제하지 전 기간(일)"
-    purge_inactive_users_grace_period_days: "활성화 되지 않은 사용자를 삭제하기 까지의 기간(일)"
     s3_access_key_id: "이미지를 업로드 할 때 사용할 Amazon S3의 access key id"
     s3_secret_access_key: "이미지를 업로드 할 때 사용할 Amazon S3의 secret access key"
     s3_region: "이미지를 업로드 할 때 사용할 Amazon S3 region"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index f38aa59ec2..17825cca34 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -30,7 +30,6 @@ nl:
   log_in: "Inloggen"
   via: "%{username} via %{site_name}"
   is_reserved: "is gereserveerd"
-  purge_reason: "Automatisch verwijderd omdat het oud en niet geverifieerd is"
   errors:
     messages:
       too_long_validation: "is beperkt tot %{max} tekens; je gebruikt %{length}."
@@ -550,9 +549,6 @@ nl:
     title: "Korte titel van deze website, wordt gebruikt in de titeltag"
     site_description: "Omschrijf dit forum in een zin. Deze wordt getoond in de meta omschrijvingstag."
     contact_email: "E-mailadres van een contactpersoon van deze site. Belangrijke updates van Discourse.org worden naar dit adres gestuurd."
-    company_full_name: "ACHTERHAALD. Wordt niet meer gebruikt en zal verwijderd worden. De volledige naam van het bedrijf dat deze site draait. Wordt gebruikt in juridische delen van de site, zoals /tos en /privacy"
-    company_short_name: "ACHTERHAALD. Wordt niet meer gebruikt en zal verwijderd worden. De korte naam van het bedrijf dat deze site draait. Wordt gebruikt in juridische delen van de site, zoals /tos en /privacy"
-    company_domain: "ACHTERHAALD. Wordt niet meer gebruikt en zal verwijderd worden. De domeinnaam van het bedrijf dat deze site draait. Wordt gebruikt in juridische delen van de site, zoals /tos en /privacy"
     queue_jobs: "DEVELOPERS ONLY! WARNING! Zet verschillende taken in een queue binnen sidekiq, bij 'false' worden taken ineens uitgevoerd"
     crawl_images: "Haal afbeeldingen van externe URLs om de correcte breedte- en hoogtedimensies in te voegen"
     download_remote_images_to_local: "Download externe afbeeldingen en sla ze lokaal op. Dit voorkomt dat afbeeldingen niet meer beschikbaar zouden kunnen worden."
diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml
index 0b4b22bbf6..b1388bc4d2 100644
--- a/config/locales/server.pl_PL.yml
+++ b/config/locales/server.pl_PL.yml
@@ -33,7 +33,6 @@ pl_PL:
   log_in: "Logowanie"
   via: "%{username} z %{site_name}"
   is_reserved: "jest zarezerwowana"
-  purge_reason: "Automatycznie usunięto z uwagi na wiek i brak weryfikacji"
   disable_remote_images_download_reason: "Pobieranie zewnętrznych grafik zostało wyłączone z uwagi na niską ilość wolnego miejsca na dysku."
   errors:
     messages:
@@ -613,11 +612,16 @@ pl_PL:
     max_image_width: "Maksymalna szerokość miniaturki grafiki we wpisie. "
     max_image_height: "Maksymalna wysokość miniaturki grafiki we wpisie. "
     category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update."
-    show_subcategory_list: "Po wejściu do kategorii zamiast listy tematów wyświetlaj listę podkategorii."
+    show_subcategory_list: "Po wejściu do kategorii, zamiast listy tematów wyświetlaj listę podkategorii."
     fixed_category_positions: "Zaznacz, aby ręcznie ustawiać kolejność kategorii. Odznacz, aby kategorie były sortowane na podstawie aktywności. "
     exclude_rel_nofollow_domains: "A pipe-delimited list of domains where nofollow is not added (tld.com will automatically allow sub.tld.com as well)"
-    favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon"
-    apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px."
+    logo_url: "Logo widoczne w górnym lewym rogu serwisu, np: http://example.com/logo.png"
+    digest_logo_url: "Alternatywne logo używane w biuletynie email. Jeśli puste, zostanie użyta wartość z pola `logo_url`, np: http://example.com/logo.png"
+    logo_small_url: "Małe logo widoczne w górnym lewym rogu serwisu, widoczne po przewinięciu strony, np: http://example.com/logo-small.png"
+    favicon_url: "Favicon serwisu. Więcej informacji: http://pl.wikipedia.org/wiki/Favicon"
+    mobile_logo_url: "Statyczne logo widoczne w górnym lewym rogu mobilnej wersji serwisu, np: http://example.com/uploads/default/logo.png Jeśli puste, zostanie użyta grafika z pola `logo_url`. "
+    apple_touch_icon_url: "Ikona używana przez urządzenia Apple. Rekomendowany wymiar to 144px na 144px."
+    notification_email: "Adres z którego wysyłane będą wszystkie istotne emaile systemowe.\nKonieczna jest poprawna konfiguracja rekordów SPF, DKIM oraz zwrotnego PTR użytej domeny."
     email_custom_headers: "A pipe-delimited list of custom email headers"
     enable_long_polling: "Message bus used for notification can use long polling"
     anon_polling_interval: "How often should anonymous clients poll in milliseconds"
@@ -629,10 +633,18 @@ pl_PL:
     ga_tracking_code: "Identyfikator Google analytics (ga.js), np: UA-12345678-9; zobacz http://google.com/analytics"
     ga_domain_name: "Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics"
     ga_universal_tracking_code: "Identyfikator Google Universal Analytics (analytics.js), np: UA-12345678-9; zobacz http://google.com/analytics"
+    ga_universal_domain_name: "Domena dla Google Universal Analytics (analytics.js), np: mysite.com; zobacz http://google.com/analytics"
     enable_noscript_support: "Enable standard webcrawler search engine support via the noscript tag"
     allow_moderators_to_create_categories: "Zezwól moderatorom na tworzenie nowych kategorii"
-    top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|new|unread|starred|categories|top|read|posted"
+    top_menu: "Określ które elementy nawigacyjne serwisu powinny być widoczne i w jakiej kolejności. Przykład latest|new|unread|starred|categories|top|read|posted"
+    post_menu: "Określ które elementy menu wpisu powinny być widoczne i w jakiej kolejności. Przykład like|edit|flag|delete|share|bookmark|reply"
+    share_links: "Określ które elementy menu udostępniania powinny być widoczne i w jakiej kolejności. "
     track_external_right_clicks: "Śledź zewnętrzne linki kliknięte prawym klawiszem (np. otwierane w nowej zakładce). Domyślnie wyłączone, gdyż wymaga nadpisywania URLi."
+    topics_per_page: "Liczba tematów ładowanych domyślnie na liście wątków oraz przy doładowaniu wywołanym przewijaniem strony."
+    site_contact_username: "Wszystkie automatycznie wysyłane wiadomości prywatne będą pochodzić od wskazanego tu użytkownika. Jeśli puste, zostanie użyte konto System. "
+    topics_per_period_in_top_summary: "Liczba tematów wyświetlanych w domyślnym podsumowaniu najbardziej popularnych wątków"
+    topics_per_period_in_top_page: "Liczba tematów wyświetlanych w widoku 'Pokaż więcej'  na ekranie popularnych wątków."
+    enable_badges: "Włącz system odznak"
     port: "DEVELOPER ONLY! WARNING! Use this HTTP port rather than the default of port 80. Leave blank for default of 80."
     force_hostname: "DEVELOPER ONLY! WARNING! Specify a hostname in the URL. Leave blank for default."
     invite_only: "Publiczna rejestracja jest wyłączona: wszyscy nowi użytkownicy muszą zostać zaproszeni przez innych użytkowników lub zespół."
@@ -649,10 +661,13 @@ pl_PL:
     github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications"
     active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds"
     previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours"
+    suggested_topics: "Liczba sugerowanych tematów widocznych na końcu aktualnego tematu."
+    limit_suggested_to_category: "Sugeruj tematy jedynie z tej samej kategorii."
     min_trust_to_create_topic: "The minimum trust level required to create a new topic."
     newuser_max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla nowych użytkowników)."
     max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla wszystkich)."
     title_fancy_entities: "Convert common ASCII characters to fancy HTML entities in topic titles, ala SmartyPants http://daringfireball.net/projects/smartypants/"
+    category_colors: "Lista kolorów w formacie hex do użycia w etykietach kategorii."
     title_prettify: "Prevent common title typos and errors, including all caps, lowercase first character, multiple ! and ?, extra . at end, etc."
     faq_url: "If you have a FAQ hosted elsewhere that you want to use, provide the full URL here."
     tos_url: "If you have a Terms of Service document hosted elsewhere that you want to use, provide the full URL here."
@@ -660,10 +675,12 @@ pl_PL:
     newuser_spam_host_threshold: "How many times a new user can post a link to the same host within their `newuser_spam_host_posts` posts before being considered spam."
     staff_like_weight: "O ile większą wagę mają mieć polubienia przyznawane przez członków zespołu?"
     reply_by_email_address: "Template for reply by email incoming email address, for example: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
+    relative_date_duration: "Liczba dni od wysłania wpisu gdy wyświetlana jest data relatywna (7d) zamiast absolutnej (20 Lut)."
     delete_all_posts_max: "The maximum number of posts that can be deleted at once with the Delete All Posts button. If a user has more than this many posts, the posts cannot all be deleted at once and the user can't be deleted."
     email_editable: "Allow users to change their e-mail address after registration."
     default_digest_email_frequency: "How often users receive digest emails by default. They can change this setting in their preferences."
-    enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive."
+    default_external_links_in_new_tab: "Otwieraj zewnętrzne odnośniki w nowej karcie. Użytkownicy mogą zmienić to ustawienie w swoich preferencjach."
+    enable_mobile_theme: "Urządzenia mobilne używają dedykowanego mobilnego szablonu. Wyłącz to, jeśli chcesz użyć własnego, pojedynczego i responsywnego szablonu stylów. "
     suppress_uncategorized_badge: "Nie pokazuj etykiety z nazwą kategorii Inne na listach tematów."
   notification_types:
     mentioned: "%{display_username} wspomina o Tobie w %{link}"
diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml
index 5bfc1b8f90..85f89497b6 100644
--- a/config/locales/server.pt.yml
+++ b/config/locales/server.pt.yml
@@ -23,7 +23,6 @@ pt:
   log_in: "Entrar"
   via: "%{username} via %{site_name}"
   is_reserved: "está reservado"
-  purge_reason: "Apagar automaticamente devido à antiguidade e por não ser verificado"
   errors:
     messages:
       too_long_validation: "está limitado a %{max} caracteres; inseriu %{length}."
diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml
index f7d4538dc2..f654dacc8d 100644
--- a/config/locales/server.pt_BR.yml
+++ b/config/locales/server.pt_BR.yml
@@ -33,7 +33,7 @@ pt_BR:
   log_in: "Entrar"
   via: "%{username} via %{site_name}"
   is_reserved: "está reservado"
-  purge_reason: "Automaticamente excluído devido a ser velho e não verificado"
+  purge_reason: "A conta não verificada, foi excluída."
   disable_remote_images_download_reason: "Download de imagens remotas foi desativado porque não havia espaço suficiente em disco disponível."
   errors:
     messages:
@@ -160,7 +160,7 @@ pt_BR:
       ⏎
       Tem certeza de que você está fornecendo o tempo adequado para outras pessoas também poderem compartilhar seus pontos de vista?⏎
     too_many_replies: "# # # Você está no limite de resposta para este tópico \n \nLamentamos, mas novos usuários estão temporariamente limitados a %{newuser_max_replies_per_topic} respostas no mesmo tópico. \n \nEm vez de adicionar outra resposta, por favor, considere editar suas respostas anteriores ou visitar outros tópicos. \n"
-    reviving_old_topic: "# # # Reviver este tópico?\n \nA última resposta a este tópico foi a %{dias} atrás. Sua resposta vai levar o tópico para o topo da sua lista e avisar a qualquer um anteriormente envolvido na conversa. \n \nTem certeza de que quer continuar esta velha conversa? \n"
+    reviving_old_topic: "# # # Reviver este tópico?\n \nA última resposta a este tópico foi a %{days} atrás. Sua resposta vai levar o tópico para o topo da sua lista e avisar a qualquer um anteriormente envolvido na conversa. \n \nTem certeza de que quer continuar esta velha conversa? \n"
   activerecord:
     attributes:
       category:
@@ -586,26 +586,43 @@ pt_BR:
     queue_jobs: "APENAS DESENVOLVEDORES! ATENÇÃO! Por padrão, enfileira tarefas no sidekiq. Se desativado, seu site ficará defeituoso."
     crawl_images: "Recupere imagens de URLs remotas para inserir as dimensões de largura e altura corretos."
     download_remote_images_to_local: "Converta imagens remotas para imagens locais, transferindo-as; isto evita imagens quebradas."
+    download_remote_images_threshold: "Espaço mínimo necessário para download das imagens ( em % )"
+    disabled_image_download_domains: "Imagens hospedadas nestes domínios nunca serão baixadas. \nLista delimitada por |"
+    ninja_edit_window: "Pelos próximos (n) segundos após a postagem, as edições não terão histórico."
     post_edit_time_limit: "O autor pode editar ou apagar o seu post para (n) minutos após a postagem. Defina como 0 para sempre."
+    edit_history_visible_to_public: "Permitir que todos vejam as versões anteriores de uma postagem editada. Quando desativado, somente membros da equipe podem ver o histórico de alterações."
+    delete_removed_posts_after: "Postagens removidas pelo autor serão automaticamente deletadas depois de (n) horas. Se o valor definido for 0, as postagens serão deletadas imediatamente."
     max_image_width: "Largura máxima para imagens em um post"
     max_image_height: "Altura máxima para imagens em um post"
     category_featured_topics: "Número de tópicos exibidos por categoria na página /categories. Depois de alterar este valor, levará até 15 minutos para a página de categorias atualizar-se."
     show_subcategory_list: "Mostrar lista de subcategorias ao invés de lista de tópicos ao entrar em uma categoria."
     fixed_category_positions: "Se selecionado, você será capaz de organizar as categorias em uma ordem fixa. Se nada for feito, as categorias serão listadas em ordem de atividade."
+    add_rel_nofollow_to_user_content: "Adicionar \"nofollow\" para todo conteúdo incluído por um usuário, exceto links internos (incluindo sub domínios). Para que as mudanças façam efeito é necessário rodar \"rake posts:rebake\"."
     exclude_rel_nofollow_domains: "Lista de domínios separados por barras verticais (|) onde o nofollow não é adicionado (tld.com irá automaticamente disponibilizar sub.tld.com também) "
     post_excerpt_maxlength: "Limite de caracteres para o resumo de um post."
+    post_onebox_maxlength: "Tamanho máximo para um Post em caracteres"
     logo_url: "O logo à esquerda e acima para seu site eg: http://example.com/logo.png"
     digest_logo_url: "O logo alternativo usado no topo do resumo de e-mails do seu site. Se deixar em branco `logo_url` será usado. eg: http://example.com/logo.png"
     logo_small_url: "O logo à esquerda e acima pequeno para seu site, visto quando se faz rolagem. eg: http://example.com/logo-small.png"
     favicon_url: "Um favicon para o seu site"
+    mobile_logo_url: "O logo alternativo usado no topo do resumo de e-mails do seu site. Se deixar em branco `logo_url` será usado. eg: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Ícone usado para dispositivos Apple. Tamanho recomendado é 144px por 144px."
+    notification_email: "O endereço de email utilizado quando enviado emails do sistema. O domínio especificado deve ter registros SPF, DKIM e PTR, devidamente configurados para que os email funcionem corretamente."
     email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados"
+    email_subject: "Customizar o formato do assunto dos emails padrões. \nRef https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
     use_https: "Deverá a URL completa para o site (Discourse.base_url) ser http ou https? Não ative isso a MENOS QUE O HTTPS ESTEJA CONFIGURADO E FUNCIONANDO!"
+    summary_score_threshold: "A pontuação mínima requerida para uma postagem ser incluída no \"Resuma este tópico\" "
     summary_posts_required: "Mensagens mínimas em um tópico antes de 'Resumir este tópico' ficar habilitado"
     summary_likes_required: "Curtidas mínimas em um tópico antes de 'Resumir este tópico, ficar habilitado"
     summary_percent_filter: "Quando um usuário clicar em 'Resumor este tópico', mostrar os melhores % mensagens"
+    summary_max_results: "Máximo número de posts quando resumidos por Categoria "
+    enable_private_messages: "Permitir usuários de nível 1 a criar e responder mensagens privadas."
     enable_long_polling: "O sistema de mensagens das notificações pode fazer solicitações longas."
+    long_polling_base_url: "URL Utilizada para \"long polling\" ( Quando um CDN for configurado, tenha certeza que essa configuração seja a padrão) ex: http://origin.site.com"
+    long_polling_interval: "Tempo que o servidor deve aguardar antes de responder quando não existe nenhum dado para ser enviado. (apenas usuários logados)"
+    polling_interval: "Com que frequencia os clientes podem solicitar o servidor em milisegundos"
     anon_polling_interval: "Com que frequencia os clientes não registrados podem solicitar o servidor em milisegundos"
+    background_polling_interval: "Com que frequência os clientes podem solicitar o servidor em milisegundos ( em segundo plano )"
     auto_track_topics_after: "Quantos milisegundos esperar antes que um tópico seja automaticamente  rastreado (0 para sempre, -1 para nunca)"
     new_topic_duration_minutes: "Quantos minutos um tópico permanece considerado como novo (-1 para sempre, -2 para desde a última visita)"
     flags_required_to_hide_post: "As postagens vão ser escondidos automaticamente quando o númereo de sinalizações atingir este número (0 para nunca)"
@@ -656,12 +673,15 @@ pt_BR:
     s3_backup_bucket: "O repositório remoto para realizar backups. AVISO: Certifique-se de que é um repositório privado."
     active_user_rate_limit_secs: "Qual a frequencia de atualização do campo 'última vez visto em', em segundos."
     previous_visit_timeout_hours: "Quanto tempo uma visita dura antes de considerarmos como 'última visita', em horas."
+    max_edits_per_day: "Número máximo de edições que um usuário pode fazer por dia."
+    max_stars_per_day: "O número máximo de tópicos que podem ser favoritados por usuário por dia."
+    max_topics_per_day: "Número máximo de postagens que um usuário pode criar por dia."
+    max_private_messages_per_day: "Número máximo de mensagens privadas que os usuários podem criar por dia."
     suggested_topics: "Número de tópicos sugeridos mostrados no final de um tópico."
     limit_suggested_to_category: "Mostrar apenas tópicos da categoria atual em tópicos sugeridos."
     clean_up_uploads: "Remover envios sem referência para evitar hospedagem ilegal. AVISO: você pode querer fazer um backup do seu diretório de /uploads antes de habilitar essa configuração."
     clean_orphan_uploads_grace_period_hours: "Carência (em horas) antes de um upload órfão ser removido."
     purge_deleted_uploads_grace_period_days: "Carência (em dias) antes que um upload excluído seja apagado."
-    purge_inactive_users_grace_period_days: "Carência (em dias) antes de um usuário que não tenha ativado sua conta seja deletado."
     min_trust_to_create_topic: "O nível de confiança mínimo necessário para criar um novo tópico."
     min_trust_to_edit_wiki_post: "O nível de confiança mínimo necessário para editar uma postagem marcada como wiki."
     title_fancy_entities: "Converter caracteres ASCII comuns em entidades HTML nos títulos dos tópicos, ala SmartyPants http://daringfireball.net/projects/smartypants/"
@@ -678,9 +698,20 @@ pt_BR:
     default_external_links_in_new_tab: "Abrir links externos em uma nova guia. Os usuários podem mudar isso em suas preferências."
     public_user_custom_fields: "Uma lista de permissões de campos personalizados para um usuário que pode ser mostrado publicamente."
     enable_mobile_theme: "Os dispositivos móveis usam um tema mobile-friendly, com a possibilidade de mudar para o site completo. Desative isso se você quiser usar um estilo personalizado que é totalmente responsivo."
+    suppress_uncategorized_badge: "Não mostrar emblema para assuntos não categorizados em listas de tópicos"
     global_notice: "Mostrar um banner global URGENTE, de EMERGÊNCIA para todos os visitantes, mude para branco para esconder (HTML permitido)."
+    disable_edit_notifications: "Desabilitar modificação de notificações pelo sistema quando 'download_remote_images_to_local' estiver ativado."
+    enable_names: "Permitir que usuários exibam seus nomes completosPermitir que usuários exibam seus nomes completos"
+    display_name_on_posts: "Também exibir o nome completo do usuário em suas mensagens"
+    invites_per_page: "Mostrar convites padrões no página de usuário"
     short_progress_text_threshold: "Após o número de mensagens em um tópico for acima deste número, a barra de progresso mostrará apenas o número  da mensagem atual. Se você alterar a largura da barra de progresso, você pode precisar alterar este valor."
     default_code_lang: "Realce de sintaxe padrão da linguagem de programação aplicada a blocos de código GitHub (lang-auto, Ruby, Python, etc)"
+    warn_reviving_old_topic_age: "Quando alguém começa a responder a um tópico mais velho do que este número de dias, um aviso será exibido para desencorajar o usuário de reviver uma velha discussão. Desabilite definindo para 0."
+    autohighlight_all_code: "Aplicar código destacando todos os blocos de código pré-formatados, mesmo quando não for específica o idioma"
+    embeddable_host: "Host que pode incorporar os comentários deste fórum do Discourse"
+    feed_polling_enabled: "Se um feed RSS / ATOM são importados como mensagens"
+    feed_polling_url: "URL do feed RSS / ATOM para importar"
+    embed_by_username: "Nome de usuário Discourse para o usuário que cria os tópicos"
     embed_post_limit: "Número máximo de respostas para embutir"
     notify_about_flags_after: "Se houver sinalizações sem ações após muitas horas, envia um e-mail para contact_email. Ajuste para 0 para desligar."
     show_create_topics_notice: "Se o site tem menos de 5 tópicos públicos, mostrar um aviso pedindo para os administradores criarem alguns tópicos."
@@ -995,19 +1026,42 @@ pt_BR:
         Divirta-se durante sua estadia!
 
         [prefs]: %{user_preferences_url}
+    bulk_invite_succeeded:
+      subject_template: "Seus convites foram enviados com sucesso."
+      text_body_template: "Seus convites foram enviados com sucesso: %{sent}."
+    bulk_invite_failed:
+      subject_template: "Seus convites não forma enviados, contate os moderadores."
+    csv_export_succeeded:
+      subject_template: "Dados foram exportados com sucesso"
+    csv_export_failed:
+      subject_template: "Exporte Falhou"
+      text_body_template: "O export falhou, verifique os logs"
     email_reject_trust_level:
+      subject_template: "Mensagem rejeitada"
       text_body_template: |
         Lamentamos, mas o seu e-mail para%{destination} (intutulado %{former_title}) não funcionou.
 
         Sua conta não tem o nível de confiança necessário para criar novos tópicos para este endereço de e-mail. Se você acredita que isso é um erro, entre em contato com um membro da equipe.
     email_reject_no_account:
       subject_template: "Problema com Email -- Conta Desconhecida"
+      text_body_template: |
+        Lamentamos, mas o seu e-mail para%{destination} (intutulado %{former_title}) não funcionou. Não há nenhum relato conhecido com este endereço de e-mail. Tente enviar a partir de um endereço de e-mail diferente, ou entre em contato com um membro da equipe.
+    email_reject_empty:
+      subject_template: "Problemas no Email - Mensagem em Branco"
+      text_body_template: |
+        Desculpe-nos, mas seu e-mail para %{destination} (entitulado %{former_title}) não funcionou. Nós não conseguimos encontrar nenhum conteúdo no e-mail. Tenha certeza que você escreveu alguma coisa no topo do e-mail - nós não conseguimos analisar respostas em linha. Se você está recebendo isto, mas incluiu conteúdo, tente novamente com conteúdo em HTML no seu e-mail (não somente texto).
+    email_reject_parsing:
+      subject_template: "Problemas no Email - Conteúdo desconhecido."
+      text_body_template: |
+        Desculpe-nos, mas seu e-mail para %{destination} (entitulado %{former_title}) não funcionou. Não conseguimos encontrar onde sua resposta estava no e-mail. **Tenha certeza de escrever a resposta no topo do e-mail** -- tudo após o início da mensagem respondida é descartado.
     email_reject_post_error:
+      subject_template: "Problemas no email - \"Posting Error\" "
       text_body_template: |
         Desculpe-nos, mas seu e-mail para %{destination} (entitulado %{former_title}) não funcionou.
 
         Algumas possíveis causas são: formatação complexa, mensagem muito grande, mensagem muito pequena. Por favor tente novamente, ou poste através do site se persistir.
     email_reject_post_error_specified:
+      subject_template: "Problemas no email - \"Posting Error\" "
       text_body_template: |
         Desculpe-nos, mas seu e-mail para %{destination} (entitulado %{former_title}) não funcionou.
 
@@ -1016,6 +1070,16 @@ pt_BR:
         %{post_error}
 
         Se você puder corrigir, por favor tente novamente.
+    email_reject_reply_key:
+      subject_template: "Problemas no email - Sem endereço para retorno - \"Unknown Reply Key\""
+      text_body_template: |
+        Pedimos desculpas, mas seu email para %{destination} (titled %{former_title}) não foi enviado.
+
+        O endereço de email do destinatário é desconhecido ou inválido, Contate um dos moderadores para relatar esse problema
+    email_reject_destination:
+      subject_template: "Probelmas no Email - Email destinatário desconhecido"
+      text_body_template: |
+        Desculpe-nos, mas seu e-mail para %{destination} (entitulado %{former_title}) não funcionou. Nenhum dos endereços de destinatário são reconhecidos pelo fórum. Por favor tenha certeza que o fórum está na linha To: (não CC ou BCC), e que você está enviando para o endereço de e-mail fornecido pelos administradores.
     email_error_notification:
       text_body_template: |
         Erro de autenticação ao baixar e-mails através do servidor POP.
@@ -1242,6 +1306,7 @@ pt_BR:
   guidelines: "Diretrizes"
   privacy: "Privacidade"
   edit_this_page: "Editar esta página"
+  static_topic_first_reply: "Altere o primeiro post desse tópico para mudar seu conteúdo na página de %{page_name} \n"
   guidelines_topic:
     title: "Perguntas frequentes/Diretrizes"
     body: "<a name=\"civilizado\"></a>\n\n## [Este é um lugar civilizado para discussão pública](#civilizado)\n\nPor favor, trate este fórum de discussão com o mesmo respeito que seria um parque público. Nós, também, somos um recurso da comunidade compartilhada &mdash; um lugar para compartilhar habilidades, conhecimentos e interesses através de conversa.\n\nEstas não são regras rígidas e rápidas, apenas auxilia o julgamento humano de nossa comunidade. Use estas diretrizes para manter este, um lugar bem iluminado limpo para o discurso público civilizado.\n\n<a name=\"melhorar\"></a>\n\n## [Melhorar a Discussão](#melhorar)\n\nAjude-nos a fazer deste um ótimo lugar para discussão trabalhando sempre para melhorar a discussão de alguma forma, ainda que pequena. Se você não tiver certeza de que seu post acrescenta à conversa, pense sobre o que você quer dizer e tente novamente mais tarde. \n\nOs tópicos discutidos aqui são importantes para nós, e nós queremos que você aja como se eles fossem são importantes para você, também. Seja respeitoso com os temas e as pessoas que estão discutindo-los, mesmo se você não concordar com algumas das coisas que está sendo dito. \n\nUma forma de melhorar a discussão é descobrindo as que já estão acontecendo. Por favor, passe algum tempo visitando os tópicos aqui antes de responder ou iniciar o seu próprio, você terá uma melhor chance de encontrar outras pessoas que compartilham os seus interesses.\n\n<a name=\"agradavel\"></a>\n\n## [Seja agradável, mesmo quando você discorda](#agradavel)\n\nVocê pode querer responder a algo por discordar com ele. Isso é bom. Mas, lembre-se de _criticar as idéias, não pessoas_. Por favor, evite: \n\n* Xingamentos. \n* Ataques ad hominem. \n* Respondendo a um tom de mensagem, em vez de seu conteúdo real. \n* Instintiva contradição. \n\nEm vez disso, forneça fundamentados contra-argumentos que melhoram a conversa.\n\n<a name=\"participacao\"></a>\n\n## [Suas contagens de Participação](#participacao)\n\nAs conversas que temos aqui define o tom para todos. Ajude-nos a influenciar o futuro da nossa comunidade, optando por se envolver em discussões que fazem deste fórum\
diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml
index e54de7b714..c0b916f0f9 100644
--- a/config/locales/server.ru.yml
+++ b/config/locales/server.ru.yml
@@ -33,7 +33,7 @@ ru:
   log_in: "Войти"
   via: "%{username} на %{site_name}"
   is_reserved: "зарезервировано"
-  purge_reason: "Автоматически удалить из-за просроченности и непроверенности"
+  purge_reason: "Автоматически удален, как неактивная, неактивированная учетная запись"
   disable_remote_images_download_reason: "Загрузка картинок была отключена из-за недостаточности места на диске."
   errors:
     messages:
@@ -605,9 +605,6 @@ ru:
     title: "Короткое название этого сайта. Будет использоваться в HTML-тэге title."
     site_description: "Короткое описание этого сайта. Будет использоваться в HTML-тэге description."
     contact_email: "Главный адрес электронной почты для переписки по вопросам сайта. Команда Discourse.org может посылать важные уведомления на этот адрес."
-    company_full_name: "DEPRECATED. Not used anymore and will be removed. The full name of the company that runs this site, used in legal documents like /tos and /privacy"
-    company_short_name: "DEPRECATED. Not used anymore and will be removed. The short name of the company that runs this site, used in legal documents like /tos and /privacy"
-    company_domain: "DEPRECATED. Not used anymore and will be removed. The domain name owned by the company that runs this site, used in legal documents like /tos and /privacy"
     queue_jobs: "ТОЛЬКО ДЛЯ РАЗРАБОТЧИКОВ! ВНИМАНИЕ! По умолчанию задачи обрабатываются асинхронно в очереди sidekiq. Если настройка выключена, ваш сайт может не работать."
     crawl_images: "Скачивать картинки с других сайтов для автоматического определения их размеров."
     download_remote_images_to_local: "Скачивать картинки, вставленные в сообщения ссылками на другие сайты, и хранить их локально, чтобы предотвратить их изменения или утерю."
@@ -1018,6 +1015,7 @@ ru:
     disagreed: "Спасибо за информацию. Уже рассматриваем."
     deferred: "Спасибо за информацию. Уже рассматриваем."
     deferred_and_deleted: "Спасибо за информацию. Сообщение удалено."
+  temporarily_closed_due_to_flags: "Эта тема временно закрыта из-за большого количества жалоб"
   system_messages:
     post_hidden:
       subject_template: "Сообщение скрыто по причине поступления множественных жалоб"
diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml
index 9418e3cccd..a9aca48af8 100644
--- a/config/locales/server.sq.yml
+++ b/config/locales/server.sq.yml
@@ -33,7 +33,6 @@ sq:
   log_in: "Identifikohu"
   via: "%{username} \tnëpër %{site_name}"
   is_reserved: "është i rezervuar"
-  purge_reason: "Automatically deleted due to being old and unverified"
   disable_remote_images_download_reason: "Remote images download was disabled because there wasn't enough disk space available."
   errors:
     messages:
@@ -600,9 +599,6 @@ sq:
     title: "Brief title of this site, used in the title tag."
     site_description: "Describe this site in one sentence, used in the meta description tag."
     contact_email: "Email address of key contact for site. Important notices from discourse.org regarding critical updates may be sent to this address."
-    company_full_name: "DEPRECATED. Not used anymore and will be removed. The full name of the company that runs this site, used in legal documents like /tos and /privacy"
-    company_short_name: "DEPRECATED. Not used anymore and will be removed. The short name of the company that runs this site, used in legal documents like /tos and /privacy"
-    company_domain: "DEPRECATED. Not used anymore and will be removed. The domain name owned by the company that runs this site, used in legal documents like /tos and /privacy"
     queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken."
     crawl_images: "Retrieve images from remote URLs to insert the correct width and height dimensions."
     download_remote_images_to_local: "Convert remote images to local images by downloading them; this prevents broken images."
@@ -749,7 +745,6 @@ sq:
     clean_up_uploads: "Remove orphan unreferenced uploads to prevent illegal hosting. WARNING: you may want to back up of your /uploads directory before enabling this setting."
     clean_orphan_uploads_grace_period_hours: "Grace period (in hours) before an orphan upload is removed."
     purge_deleted_uploads_grace_period_days: "Grace period (in days) before a deleted upload is erased."
-    purge_inactive_users_grace_period_days: "Grace period (in days) before a user who has not activated their account is deleted."
     enable_s3_uploads: "Place uploads on Amazon S3 storage. IMPORTANT: requires valid S3 credentials (both access key id & secret access key)."
     s3_use_iam_profile: 'Use AWS EC2 IAM role to retrieve keys. NOTE: enabling will override "s3 access key id" and "s3 secret access key" settings.'
     s3_upload_bucket: "The Amazon S3 bucket name that files will be uploaded into. WARNING: must be lowercase, no periods, no underscores."
@@ -1927,25 +1922,3 @@ sq:
       If we decide to change our privacy policy, we will post those changes on this page.
 
       This document is CC-BY-SA. It was last updated May 31, 2013.
-  static:
-    search_help: |
-      <h2>Tips</h2>
-      <p>
-      <ul>
-        <li>Title matches are prioritized, so when in doubt, search for titles</li>
-        <li>Unique, uncommon words will always produce the best results</li>
-        <li>Whenever possible, scope your search to a particular category, user, or topic</li>
-      </ul>
-      </p>
-      <h2>Options</h2>
-      <p>
-        <table>
-        <tr><td><code>order:views</code></td><td><code>order:latest</code></td><td colspan=3></td></tr>
-        <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:singleuser</code></td></tr>
-        <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td colspan=3></td></tr>
-        <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td></td></tr>
-        </table>
-      </p>
-      <p>
-        <code>rainbows category:parks status:open order:latest</code> will search for topics containing the word "rainbows" in the category "parks" that are not closed or archived, ordered by date of last post.
-      </p>
diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml
index d8dcfbe6f3..19fa3cf263 100644
--- a/config/locales/server.sv.yml
+++ b/config/locales/server.sv.yml
@@ -23,7 +23,6 @@ sv:
   log_in: "Logga in"
   via: "%{username} via %{site_name}"
   is_reserved: "är reserverat"
-  purge_reason: "Automatiskt borttagen på grund av att vara gammal och ej verifierad"
   disable_remote_images_download_reason: "Fjärrbilds nedladdning är inaktiverad eftersom det inte fanns tillräckligt mycket lagringsutrymme tillgängligt."
   errors:
     messages:
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
new file mode 100644
index 0000000000..fca1fed54d
--- /dev/null
+++ b/config/locales/server.tr_TR.yml
@@ -0,0 +1,1421 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+tr_TR:
+  stringex:
+    characters:
+      number: "-"
+  i18n:
+    transliterate:
+      rule:
+        ț: "t"
+        Ț: "t"
+        ș: "s"
+        Ș: "s"
+  dates:
+    short_date_no_year: "D MMM"
+    short_date: "D MMM, YYYY"
+    long_date: "MMMM D, YYYY h:mma"
+  time:
+    formats:
+      short: "%d-%m-%Y"
+      short_no_year: "%B %-d"
+      date_only: "%-d. %b. %Y"
+  title: "Discourse"
+  topics: "Konular"
+  posts: "gönderiler"
+  loading: "Yükleniyor"
+  powered_by_html: 'Gücünü <a href="http://www.discourse.org">Discourse</a> ''tan alır, en iyi görünüm için JavaScript etkinleştirmeniz gerekir'
+  log_in: "Giriş Yap"
+  via: "%{site_name} sitesinden %{username}"
+  is_reserved: "rezerve edilmiş"
+  purge_reason: "Bırakılmış, aktive edilmemiş hesap olarak otomatik silindi"
+  disable_remote_images_download_reason: "Yeterli disk alanı kalmaması sebebiyle uzaktan görüntü indirme devre dışı bırakıldı."
+  errors:
+    messages:
+      too_long_validation: "%{max} karakter ile limitli; siz %{length} karakter girdiniz."
+      invalid_boolean: "Geçersiz boolean değeri."
+      taken: "alınmış"
+    embed:
+      load_from_remote: "Gönderi yüklenirken bir hata oluştu."
+  bulk_invite:
+    file_should_be_csv: "Yüklenen dosya csv veya txt formatında olmalı. "
+  backup:
+    operation_already_running: "Devam eden bir işlem var. Yeni bir işlem başlatılamaz."
+    backup_file_should_be_tar_gz: "Yedekleme dosyası .tar.gz uzantılı olmalı."
+    not_enough_space_on_disk: "Yedeklemenin yapılması için diskte yeterli alan bulunmuyor."
+  not_logged_in: "Bunun için giriş yapmanız gerekir."
+  read_only_mode_enabled: "Bu site sadece okuma modunda. Etkileşimler etkisizleştirildi."
+  too_many_replies:
+    other: "Üzgünüz, yeni kullanıcılar geçici olarak aynı konu içinde sadece %{count} cevap ile sınırlılar. "
+  embed:
+    start_discussion: "Tartışma Başlat"
+    continue: "Tartışmaya Devam Et"
+    more_replies:
+      other: "%{count} cevap daha"
+    loading: "Tartışma Yükleniyor..."
+    permalink: "Kalıcı Bağlantı"
+    imported_from: "Bu ilave bir tartışmadır, asıl konu adresi %{link}"
+    in_reply_to: "▶ %{username}"
+    replies:
+      other: "%{count} cevap"
+  too_many_mentions:
+    zero: "Üzgünüz, diğer kullanıcılardan bahsedemezsiniz."
+    one: "Üzgünüz, bir gönderide sadece bir kullanıcıdan bahsedebilirsiniz."
+    other: "Üzgünüz, bir gönderide sadece %{count} kullanıcıdan bahsedebilirsiniz."
+  too_many_mentions_newuser:
+    zero: "Üzgünüz, yeni kullanıcılar diğer kullanıcılardan bahsedemezler."
+    one: "Üzgünüz, yeni kullanıcılar bir gönderide sadece bir kullanıcıdan bahsedebilirler."
+    other: "Üzgünüz, yeni kullanıcılar bir gönderide sadece %{count} kullanıcıdan bahsedebilirler."
+  too_many_images:
+    zero: "Üzgünüz, yeni kullanıcılar gönderilere resi ekleyemezler."
+    one: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece bir resim ekleyebilirler."
+    other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} resim koyabilirler. "
+  too_many_attachments:
+    zero: "Üzgünüz, yeni kullanıcılar gönderilere bir şey ekleyemezler."
+    one: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece bir eklenti koyabilirler. "
+    other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} eklenti koyabilirler."
+  too_many_links:
+    zero: "Üzgünüz, yeni kullanıcılar gönderilere bağlantı ekleyemezler."
+    one: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece bir bağlantı ekleyebilirler. "
+    other: "Üzgünüz, yeni kullanıcılar bir gönderiye sadece %{count} bağlantı ekleyebilirler."
+  spamming_host: "Üzgünüz bu sunucuya bağlantı veremezsiniz."
+  user_is_suspended: "Uzaklaştırılmış kullanıcılar gönderi yapamazlar."
+  just_posted_that: "yakın zamanda yaptığınız bir gönderiye çok benziyor"
+  has_already_been_used: "önceden kullanıldı"
+  invalid_characters: "geçersiz karakterler barındırıyor"
+  is_invalid: "geçersiz; biraz daha açıklayıcı olmaya çalışın"
+  next_page: "sonraki sayfa →"
+  prev_page: "← önceki sayfa"
+  page_num: "Sayfa %{num}"
+  topics_in_category: "'%{category}' kategorisindeki konular"
+  rss_posts_in_topic: " '%{topic}' konusuna ait RSS akışı"
+  rss_topics_in_category: "'%{category}' kategorisindeki konulara ait RSS akışı"
+  author_wrote: "%{author} yazdı:"
+  num_posts: "Gönderiler:"
+  num_participants: "Katılımcılar:"
+  read_full_topic: "Konunun tamamını okuyun"
+  private_message_abbrev: "Özel Mesaj"
+  rss_description:
+    latest: "En son konular"
+    hot: "Sıcak konular"
+  too_late_to_edit: "Gönderi çok uzun zaman önce oluşturulmuş. Artık düzenlenemez ya da silinemez. "
+  groups:
+    errors:
+      can_not_modify_automatic: "Otomatik oluşturulan grubu düzenleyemezsiniz"
+    default_names:
+      everyone: "herkes"
+      admins: "adminler"
+      moderators: "moderatörler"
+      staff: "görevli"
+      trust_level_0: "güven_seviyesi_0"
+      trust_level_1: "güven_seviyesi_1"
+      trust_level_2: "güven_seviyesi_2"
+      trust_level_3: "güven_seviyesi_3"
+      trust_level_4: "güven_seviyesi_4"
+  education:
+    until_posts:
+      other: "%{count} gönderi"
+    new-topic: |+
+      %{site_name} &mdash sitesine hoşgeldiniz;  **yeni bir sohbet başlattığınız için teşekkür ederiz! **
+
+      - Başlık konunuzu en iyi şekilde açıklıyor mu? İlgi çekiyor mu?
+
+      - Bu sohbet neyle ilgili? Kimin ilgisini çeker? Neden önemli? Topluluktan ne gibi cevaplar almayı bekliyorsunuz?
+
+      - Diğerlerinin konunuzu  *bulabilmesi * için doğru arama kelimeleri girin. Konunuzun benzer konularla gruplanması için bir kategori seçin.
+
+      Daha fazlası için, [topluluk yönetmeliklerimize bakın](/guidelines). Bu yazı sadece ilk gönderinizde %{education_posts_text} gözükür.
+
+    new-reply: |
+      %{site_name} &mdash sitesine hoşgeldiniz; katılımınız için teşekkür ederiz!
+
+      - Cevabınız sohbetin gelişmesine yardımcı oluyor mu?
+
+      - Topluluğun diğer üyelerine karşı nazik olun.
+
+      - Yapıcı eleştirici her zaman kabul edilir, ama fikirleri eleştirin, insanları değil.
+
+      Daha fazlası için,  [topluluk yönetmeliğine bakın](/guidelines). Bu yazı sadece ilk gönderinizde %{education_posts_text} gözükür.
+    avatar: |
+      ### Hesabın için bir fotoğraf yüklemeye ne dersin?
+
+      Birkaç konu açtın ve cevap bıraktın, fakat avatarın hala kendine has değil - tüm yeni kullanıcıların sahip olduğu varsayılan avatar.
+
+       **[Profil sayfana](%{profile_path})** gitmeyi ve seni temsil eden özel bir resim yüklemeyi düşündün mü?
+
+      Herkesin kendine has avatarı olduğunda, topluluktaki tartışmaları takip etmek ve sohbet esnasında ilginç insanlarla tanışmak daha kolay!
+    sequential_replies: "### Birden fazla gönderiyi aynı anda cevaplayabilirsin\n\nAynı konuya ardı ardına cevaplar yazmak yerine, lütfen önceki gönderilerden alıntı veya @isim referansları içeren tek bir cevap yaz. \n\nHerhangi bir yazıyı seçtikten sonra çıkan <b>alıntılayarak cevapla</b> butonuna tıklayarak alıntı yapmak için bir önceki cevabınızı düzenleyebilirsiniz.\n\nDaha az kısa, tekil cevaplardan ve iç içe yanıtlamalardan oluşan konuların okunması herkes için daha kolay oluyor.\n"
+    dominating_topic: "###Sohbete başkalarının katılmasına izin verin\n\nBu konunun sizin için önemli olduğunu görüyoruz &ndash; buradaki cevapların %{percent}% oranından daha fazlasını siz göndermişsiniz. \n\nDiğerlerinin de kendi fikirlerini paylaşmaları için onlara yeteri kadar zaman tanıdığınıza emin misiniz?\n"
+    too_many_replies: "### Bu konu için cevap limitinizi doldurdunuz\n\nÜzgünüz, ancak geçici olarak, yeni kullanıcılar aynı konu içinde en fazla %{newuser_max_replies_per_topic} cevap yazabiliyorlar. \n\nYeni bir cevap yazmak yerine, önceki cevaplarınızı düzenlemeyi, ya da başka konulara göz atmayı düşünün.\n"
+    reviving_old_topic: |
+      ### Bu konuyu tekrar canlandırmak mı istediniz?
+
+      Bu başlığa en son %{days} gün önce cevap yazılmış. Cevabınız, bu konuyu listesinin en üstüne taşıyacak ve geçmişte sohbete katılmış olan tüm yazarlara bildirim gönderecek.
+
+      Bu eski sohbeti devam ettirmek istediğinize emin misiniz?
+  activerecord:
+    attributes:
+      category:
+        name: "Kategori Adı"
+      post:
+        raw: "İçerik"
+      user_profile:
+        bio_raw: "Hakkımda"
+    errors:
+      messages:
+        is_invalid: "geçersiz; biraz daha açıklayıcı olmaya çalışın"
+        has_already_been_used: "önceden kullanıldı"
+      models:
+        topic:
+          attributes:
+            base:
+              warning_requires_pm: "Özel mesajlara sadece uyarı ekleyebilirsiniz. "
+              too_many_users: "Uyarıları aynı anda sadece bir kişiye gönderebilirsiniz."
+            archetype:
+              cant_send_pm: "Üzgünüz, bu kullanıcıya özel mesaj gönderemezsiniz."
+        user:
+          attributes:
+            password:
+              common: "En çok kullanılan 10000 şifreden biri. Lütfen daha güvenli bir şifre seçin."
+            ip_address:
+              signup_not_allowed: "Bu hesaptan yeni üyelik oluşturulmasına izin verilmiyor."
+        color_scheme_color:
+          attributes:
+            hex:
+              invalid: "geçerli bir renk değil"
+  user_profile:
+    no_info_me: "<div class='missing-profile'>Profilinizdeki Hakkımda bölümü boş, <a href='/users/%{username_lower}/preferences/about-me'>doldurmak ister misiniz?</a></div>"
+    no_info_other: "<div class='missing-profile'>%{name} profilinde Hakkımda kısmına henüz bir şey girmedi</div>"
+  vip_category_name: "Lobi"
+  vip_category_description: "Güven seviyesi 3 ve üzerinde olan üyelere özel kategori."
+  meta_category_name: "Meta"
+  meta_category_description: "Bu site, sitenin organizasyonu, nasıl çalıştığı ve nasıl geliştirilebileceği ile ilgili tartışma alanı."
+  staff_category_name: "Görevliler"
+  staff_category_description: "Görevliler arası konuşmalar için özel kategori. Konular sadece admin ve moderatörlere gözükür."
+  assets_topic_body: "Bu kalıcı bir konudur, sadece görevlilere gözükür, site tasarımında kullanılan resim ve dosyaların depolanması için kullanılır. Sakın silmeyin!\n\n\nİşleyiş aşağıdaki gibidir:\n\n\n1. Bu konuyu cevaplayın.\n2. Logolar, favicon'lar vb. için kullanmak istediğiniz resimleri buraya yükleyin. (Gönderi düzenleyicisindeki yükleme düğmesini kullanabilir, veya resimleri sürükleyip bırakabilir veya kopyalayıp yapıştırabilirsiniz.)\n3. Cevabı gönderin.\n4. Yeni gönderinizdeki resimlere sağ tıklayarak ya da düzenleme ikonuna tıklayıp gönderinizi düzenleyerek resimlerin bağlantılarına ulaşabilirsiniz. Bağlantıları kopyalayın.\n5. Bağlantıları [basit ayarlar](/admin/site_settings/category/required) ilgili bölümlere yapıştırın.\n\n\nEğer farklı dosya tipleri yükleyebilmek istiyorsanız, [dosya ayarları](/admin/site_settings/category/files) sayfasındaki `authorized_extensions` ayarını düzenleyin."
+  lounge_welcome:
+    title: "Lobiye hoşgeldiniz"
+    body: |2
+
+      Tebrikler! :confetti_ball:
+
+      Bu konuyu görebiliyorsanız,  yakın süre önce **standart** (güven seviyesi 3) seviyesine terfi etmişsiniz demektir.
+
+      Artık &hellip;
+
+      * Herhangi bir konunun başlık bilgisini düzenleyebilirsiniz
+      * Herhangi bir konunun kategorisini değiştirebilirsiniz
+      * Eklediğiniz linkler takip edilebilir durumunda olacaktır ([otomatik nofollow] (http://en.wikipedia.org/wiki/Nofollow) kaldırıldı)
+      * Sadece 3. güven seviyesi ve üzerindekilere gözüken özel Lobi kategorisine erişebilirsiniz
+      * Tek bayraklamayla spam içerikli mesajları gizleyebilirsiniz
+
+      [Şu anki standart seviyedeki arkadaşların listesi(/badges/3/regular). Merhaba demeyi unutmayın.
+
+      Bu topluluğun önemli bir parçası olduğunuz için teşekkür ederiz!
+
+      (Güven seviyeleriyle ilgili daha fazla bilgi için, [bu konuya bakın][trust]. Lütfen, sadece sürekli olarak kriterlere uyan üyelerin standart seviyede kalacağını unutmayın.)
+
+      [trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924
+  category:
+    topic_prefix: "%{category} kategorisi hakkında "
+    replace_paragraph: "[Bu paragrafın yerine kategorinizin kısa bir açıklamasını girin. Buraya yazılanlar kategori seçim alanında görüneceği için, açıklamanızı 200 karakterin altında tutmaya çalışın. Siz bu metni düzenleyene veya herhangi bir konu yaratana kadar bu kategori, kategoriler sayfasında gözükmeyecek.]"
+    post_template: "%{replace_paragraph}\n\nDaha uzun bir açıklama, kategori yönergeleri veya kuralları oluşturmak için aşağıdaki paragrafları kullanın.\n\nHerhangi bir tartışma için düşünülebilecek bazı maddeler:\n\n- Bu kategorinin amacı ne? İnsanlar konu oluştururken neden bu kategoriyi seçmeliler?\n\n- Bu kategorinin sahip olduğumuz diğer mevcut kategorilerden farkı ne?\n\n- Bu kategoriye ihtiyacımız var mı?\n\n- Bunu başka bir kategoriyle birleştirmeli miyiz, yoksa daha fazla kategoriye mi bölmeli miyiz?\n"
+    errors:
+      uncategorized_parent: "Kategorisizin üst kategorisi olamaz"
+      self_parent: "Alt kategorinin üst kategorisi kendisi olamaz"
+      depth: "Bir alt kategori başka bir alt kategorinin altında yer alamaz"
+    cannot_delete:
+      uncategorized: "Kategorisiz silinemez"
+      has_subcategories: "Alt kategorileri bulunduğu için bu kategori silinemez."
+      topic_exists:
+        other: "Bu kategoriyi silemezsiniz çünkü %{count} konusu bulunuyor. En eski konu; %{topic_link}."
+      topic_exists_no_oldest: "Bu kategoriyi silemezsiniz çünkü %{count} konusu bulunuyor."
+  trust_levels:
+    newuser:
+      title: "yeni kullanıcı"
+    basic:
+      title: "acemi kullanıcı"
+    regular:
+      title: "üye"
+    leader:
+      title: "standart"
+    elder:
+      title: "lider"
+    change_failed_explanation: " %{user_name} adlı kullanıcıyı '%{new_trust_level}' seviyesine düşürmeye çalıştınız. Ancak, halihazırda kullanıcının güven seviyesi zaten '%{current_trust_level}'. %{user_name} '%{current_trust_level}' seviyesinde kalacak - eğer seviyesini düşürmek istiyorsanız öncelikle güven seviyesini kilitlemelisiniz"
+  rate_limiter:
+    slow_down: "Bu işlemi çok fazla kere tekrar ettiniz, lütfen daha sonra tekrar deneyin"
+    too_many_requests: "Bu işlem için günlük limitinizi aştınız. Lütfen tekrar denemek için %{time_left} bekleyin. "
+    hours:
+      other: "%{count} saat"
+    minutes:
+      other: "%{count} dakika"
+    seconds:
+      other: "%{count} saniye"
+  datetime:
+    distance_in_words:
+      half_a_minute: "< 1dk"
+      less_than_x_seconds:
+        other: "< %{count}sn"
+      x_seconds:
+        other: "%{count}sn"
+      less_than_x_minutes:
+        other: "< %{count}dk"
+      x_minutes:
+        other: "%{count}dk"
+      about_x_hours:
+        other: "%{count}sa"
+      x_days:
+        other: "%{count}gün"
+      about_x_months:
+        other: "%{count}ay"
+      x_months:
+        other: "%{count}ay"
+      about_x_years:
+        other: "%{count}yıl"
+      over_x_years:
+        other: "> %{count}yıl"
+      almost_x_years:
+        other: "%{count}yıl"
+    distance_in_words_verbose:
+      half_a_minute: "şu anda"
+      less_than_x_seconds:
+        other: "şu anda"
+      x_seconds:
+        other: "%{count} saniye önce"
+      less_than_x_minutes:
+        other: "son %{count} dakika içerisinde"
+      x_minutes:
+        other: "%{count} dakika önce"
+      about_x_hours:
+        other: "%{count} saat önce"
+      x_days:
+        other: "%{count} gün önce"
+      about_x_months:
+        other: "yaklaşık %{count} ay önce"
+      x_months:
+        other: "%{count} ay önce"
+      about_x_years:
+        other: "yaklaşık %{count} yıl önce"
+      over_x_years:
+        other: "%{count} yıldan daha fazla önce"
+      almost_x_years:
+        other: "yaklaşık %{count} yıl önce"
+  password_reset:
+    no_token: "Üzgünüz, erişim jetonunuzun süresi doldu. Lütfen şifrenizi sıfırlamayı tekrar deneyin."
+    choose_new: "Lütfen yeni bir şifre seçin"
+    choose: "Lütfen şifre seçin"
+    update: 'Şifreyi Güncelle'
+    save: 'Şifre Belirle'
+    title: 'Şifreyi Sıfırla'
+    success: "Şifrenizi başarıyla değiştirdiniz ve giriş yaptınız."
+    success_unapproved: "Şifrenizi başarıyla değiştirdiniz."
+    continue: "%{site_name} adresine devam edin"
+  change_email:
+    confirmed: "Email adresiniz güncellendi."
+    please_continue: "%{site_name} adresine devam edin"
+    error: "Email adresiniz değiştirilirken bir hata oluştu. Bu adres zaten kullanımda olabilir."
+  activation:
+    action: "Hesabınızı aktive edin"
+    already_done: "Üzgünüz, hesap aktivasyon linki artık geçerli değil. Hesabınız zaten aktif olabilir mi?"
+    please_continue: "Hesabınız doğrulandı; şimdi ana sayfaya yönlendirileceksiniz."
+    continue_button: "%{site_name} adresine devam edin"
+    welcome_to: "%{site_name} sitesine hoşgeldiniz!"
+    approval_required: "Bu foruma erişebilmeniz için yeni hesabınızın bir moderatör tarafından manuel olarak onaylanması gerekir. Hesabınız onaylandığında email ile bilgilendirileceksiniz!"
+  post_action_types:
+    off_topic:
+      title: 'Konu dışı'
+      description: 'Bu gönderinin, başlık ve ilk gönderide belirtilen mevcut tartışmayla alakası yok, ve büyük ihtimal başka bir yere taşınmalı.'
+      long_form: 'konu dışı olarak bayraklandı'
+    spam:
+      title: 'Spam'
+      description: 'Bu gönderi reklam içeriklidir. Mevcut konuya alakası ya da faydası yoktur.'
+      long_form: 'spam olarak bayraklanmış'
+    inappropriate:
+      title: 'Uygunsuz'
+      description: 'Bu gönderi saldırgan, kötüleyici ya da <a href="/guidelines">topluluk yönetmeliğini</a> ihlal eden içerik barındırmaktadır. '
+      long_form: 'uygunsuz olarak bayraklanmış'
+    notify_user:
+      title: 'Özel Mesaj @{{username}}'
+      description: 'Bu gönderi, bu kişiyle doğrudan veya özel olarak konuşmamı gerektiren içeriğe sahip. Bayraklanacak bir durum yok.'
+      long_form: 'kullanıcıya özel mesaj yollandı'
+      email_title: '"%{title}" başlıklı gönderiniz'
+      email_body: "%{link}\n\n%{message}"
+    notify_moderators:
+      title: "Başka Bir Şey"
+      description: 'Bu gönderinin, yukarıda belirtilmeyen bir nedenden ötürü moderatör tarafından kontrol edilmesi gerekiyor.'
+      long_form: 'moderatör tarafından kontrol edilmesi için bayraklandı'
+      email_title: '"%{title}" başlığındaki bir gönderinin moderatör tarafından kontrol edilmesi gerekiyor.'
+      email_body: "%{link}\n\n%{message}"
+    bookmark:
+      title: 'İşaretle'
+      description: 'Bu gönderiyi işaretle'
+      long_form: 'bu gönderi işaretlendi'
+    like:
+      title: 'Beğen'
+      description: 'Bu gönderiyi beğen'
+      long_form: 'bu beğenildi'
+    vote:
+      title: 'Oyla'
+      description: 'Bu gönderiyi oyla'
+      long_form: 'bu gönderi oylandı'
+  topic_flag_types:
+    spam:
+      title: 'Spam'
+      description: 'Bu konu reklam içeriklidir. Bu siteye alakası ya da faydası yoktur.'
+      long_form: 'spam olarak bayraklandı'
+    inappropriate:
+      title: 'Uygunsuz'
+      description: 'Bu konu saldırgan, kötüleyici ya da <a href="/guidelines">topluluk yönetmeliğini</a> ihlal eden içerik barındırmaktadır. '
+      long_form: 'uygunsuz olarak bayraklandı'
+    notify_moderators:
+      title: "Başka Bir Şey"
+      description: 'Bu gönderi <a href="/guidelines">yönergeler</a>, <a href="%{tos_url}">kullanıcı sözleşmesi</a> veya yukarıda belirtilmeyen bir nedenden dolayı genel bir moderatör kontrolü gerektiriyor.'
+      long_form: 'moderatörün ilgisi için bayraklandı'
+      email_title: '"%{title}" konu başlığının moderatör tarafından kontrol edilmesi gerekiyor'
+      email_body: "%{link}\n\n%{message}"
+  flagging:
+    you_must_edit: '<p>Gönderiniz topluluk tarafından bayraklandı. Lütfen <a href="/my/private-messages">özel mesajlarınıza göz atın</a>.</p>'
+    user_must_edit: '<p>Bu gönderi topluluk tarafından bayraklandı ve geçici olarak gizlendi.</p>'
+  archetypes:
+    regular:
+      title: "Standart Konu"
+    banner:
+      message:
+        make: "Bu konu artık bir manşettir. Kullanıcı tarafından yoksayılana kadar her sayfanın en üstünde belirecektir."
+        remove: "Bu konu artık manşet değildir. Artık her sayfanın en üstünde yer belirmeyecektir."
+  unsubscribed:
+    title: 'Aboneliğiniz İptal Edildi'
+    description: "Aboneliğiniz iptal edildi. Sizinle bir daha iletişime geçmeyeceğiz!"
+    oops: "Bu işlemi yanlışlıkla yaptıysanız, aşağıya tıklayın."
+    error: "Abonelik İptalinde Hata Oluştu"
+    preferences_link: "Özet emailleri aboneliğinizi <a href='/my/preferences'>tercihler sayfasınızdan</a> da iptal edebilirsiniz"
+    different_user_description: "Özet emaillarının yollandığı kullanıcıdan farklı bir kullanıcı hesabı ile giriş yapmış bulunmaktasınız. Lütfen çıkış yapıp tekrar deneyin."
+    not_found_description: "Üzgünüz, aboneliğinizi iptal edemedik. Emailinizdeki bağlantı artık geçerli olmayabilir."
+  resubscribe:
+    action: "Tekrar Abone Ol"
+    title: "Tekrar Abone Olundu!"
+    description: "Tekrar abone oldunuz."
+  reports:
+    visits:
+      title: "Kullanıcı Ziyaretleri"
+      xaxis: "Gün"
+      yaxis: "Ziyaret sayısı"
+    signups:
+      title: "Kullanıcılar"
+      xaxis: "Gün"
+      yaxis: "Yeni kullanıcı sayısı"
+    topics:
+      title: "Konular"
+      xaxis: "Gün"
+      yaxis: "Yeni konu sayısı"
+    posts:
+      title: "Gönderiler"
+      xaxis: "Gün"
+      yaxis: "Yeni gönderi sayısı"
+    likes:
+      title: "Beğeniler"
+      xaxis: "Gün"
+      yaxis: "Yeni beğenilerin sayısı"
+    flags:
+      title: "Bayraklar"
+      xaxis: "Gün"
+      yaxis: "Bayrakların sayısı"
+    bookmarks:
+      title: "İşaretlenenler"
+      xaxis: "Gün"
+      yaxis: "Yeni işaretlenenlerin sayısı"
+    starred:
+      title: "Yıldızlı"
+      xaxis: "Gün"
+      yaxis: "Yeni yıldızlı konuların sayısı"
+    users_by_trust_level:
+      title: "Güven Seviyesine ait Kullanıcı Sayısı"
+      xaxis: "Güven Seviyesi"
+      yaxis: "Kullanıcı Sayısı"
+    emails:
+      title: "Gönderilen Emailler"
+      xaxis: "Gün"
+      yaxis: "Email Sayısı"
+    user_to_user_private_messages:
+      title: "Kullanıcıdan Kullanıcıya"
+      xaxis: "Gün"
+      yaxis: "Özel mesajların sayısı"
+    system_private_messages:
+      title: "Sistem"
+      xaxis: "Gün"
+      yaxis: "Özel mesajların sayısı"
+    moderator_warning_private_messages:
+      title: "Moderatör Uyarısı"
+      xaxis: "Gün"
+      yaxis: "Özel mesajların sayısı"
+    notify_moderators_private_messages:
+      title: "Moderatörleri Bilgilendir"
+      xaxis: "Gün"
+      yaxis: "Özel mesajların sayısı"
+    notify_user_private_messages:
+      title: "Kullanıcıyı Bilgilendir"
+      xaxis: "Gün"
+      yaxis: "Özel mesajların sayısı"
+    top_referrers:
+      title: "En Çok Atıfta Bulunanlar"
+      xaxis: "Kullanıcı"
+      num_clicks: "Tıklamalar"
+      num_topics: "Konular"
+    top_traffic_sources:
+      title: "En İyi Trafik Kaynakları"
+      xaxis: "Alan Adı"
+      num_clicks: "Tıklamalar"
+      num_topics: "Konular"
+      num_users: "Kullanıcılar"
+    top_referred_topics:
+      title: "En Çok Atıfta Bulunulan Konular"
+      xaxis: "Konu"
+      num_clicks: "Tıklamalar"
+  dashboard:
+    rails_env_warning: "Sunucunuz %{env} modunda çalışıyor."
+    ruby_version_warning: "Problemli olduğu bilinegelen Ruby 2.0.0 sürümünü kullanmaktasınız. Yama seviyesi 247 veya daha yenisine güncelleme yapınız."
+    host_names_warning: "config/database.yml dosyasınızda, bilgisayar adı olarak varsayılan değer olan \"localhost\" ayarlı. Değeri, sitenizin bilgisayar adını kullanacak biçimde güncelleyiniz."
+    gc_warning: 'Sunucunuz, Ruby''nin varsayılan çöp toplama ayarlarını kullanıyor ki bu size en iyi performansı vermeyecektir. Performansı ayarı için şu konuyu okuyun: <a href="http://meta.discourse.org/t/tuning-ruby-and-rails-for-discourse/4126" target="_blank">Discourse için Ruby on Rails Ayarları</a>.'
+    sidekiq_warning: 'Sidekiq çalışmıyor. Email yollamak gibi gibi birçok asenkron görev sidekiq''in işidir. En az bir tane sidekiq süreci çalıştırdığınızdan emin olun. <a href="https://github.com/mperham/sidekiq" target="_blank">Sidekiq ile ilgili bilgi burada</a>.'
+    queue_size_warning: 'Kuyrukta çok fazla, %{queue_size} tane iş var. Bu Sidekiq süreçleriyle ilgili bir sorunu gösteriyor olabilir, daha fazla Sidekiq işçisi eklemeniz gerekebilir.'
+    memory_warning: 'Sunucunuz toplam 1GB''tan az bellek ile çalışıyor. En az 1GB bellek tavsiye edilmektedir.'
+    enable_google_logins_warning: "Google OpenID kimlik doğrulama sisteminin ıskartaya çıkartılmış bir sürümünü kullanıyorsunuz. Google OpenID'den desteğini 20 Nisan 2015'te çekecek. Bir an önce Google OAuth2 kullanmaya başlayın. <a href='https://meta.discourse.org/t/configuring-google-login-for-discourse/15858' target='_blank'>Daha fazlasını öğrenmek için bu rehberi okuyun</a>"
+    both_googles_warning: "Site ayarlarında enable_google_logins ve enable_google_oauth2_logins ayarlarından her ikisi de etkin. enable_google_logins ayarını devre dışı bırakın."
+    google_oauth2_config_warning: 'Sunucu Google OAuth2 (enable_google_oauth2_logins) ile üyelik oluşturulması ve giriş yapılmasına elveriyor, fakat the kullanıcı IDsi and gizli kullanıcı değerleri henüz ayarlanmamış. <a href="/admin/site_settings">Site Ayarları</a> sayfasına gidin ve ayarları güncelleyin. <a href="https://meta.discourse.org/t/configuring-google-login-for-discourse/15858" target="_blank">Daha fazla bilgi için bu yönetmeliğe bakın</a>.'
+    facebook_config_warning: 'Sunucu Facebook (enable_facebook_logins) ile üyelik oluşturulması ve giriş yapılmasına izin veriyor, fakat app ID ve gizli app değerleri henüz ayarlanmamış. <a href="/admin/site_settings">Site Ayarları</a> sayfasına gidin ve ayarları güncelleyin. <a href="https://meta.discourse.org/t/configuring-facebook-login-for-discourse/13394" target="_blank">Daha fazla bilgi için bu yönetmeliğe bakın</a>.'
+    twitter_config_warning: 'Sunucu Twitter (enable_twitter_logins) ile üyelik oluşturulması ve giriş yapılmasına izin veriyor, fakat anahtar ve gizli değerler henüz ayarlanmamış. <a href="/admin/site_settings">Site Ayarları</a> sayfasına gidin ve ayarları güncelleyin. <a href="https://meta.discourse.org/t/configuring-twitter-login-for-discourse/13395" target="_blank">Daha fazla bilgi için bu yönetmeliğe bakın</a>.'
+    github_config_warning: 'Sunucu GitHub (enable_github_logins) ile üyelik oluşturulması ve giriş yapılmasına izin veriyor, fakat kullanıcı IDsi ve gizli değerler henüz ayarlanmamış. <a href="/admin/site_settings">Site Ayarları</a> sayfasına gidin ayarları güncelleyin. <a href="https://meta.discourse.org/t/configuring-github-login-for-discourse/13745" target="_blank">Daha fazla bilgi için bu yönetmeliğe bakın</a>.'
+    s3_config_warning: 'Sunucu s3''e dosya yüklenebilmesi için yapılandırılmış, fakat şunlardan en az biri henüz ayarlanmamış: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. <a href="/admin/site_settings">Site Ayarları</a> sayfasına gidin ve ayarları güncelleyin. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Daha fazla bilgi için "How to set up image uploads to S3?" konulu gönderiye bakın</a>.'
+    s3_backup_config_warning: 'Sunucu s3''e yedekleme yüklenebilmesi için yapılandırılmış, fakat şunlardan en az biri henüz ayarlanmamış: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. <a href="/admin/site_settings">Site Ayarları</a> sayfasına gidin ve ayarları güncelleyin. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Daha fazla bilgi için "How to set up image uploads to S3?" konulu gönderiye bakın</a>.'
+    image_magick_warning: 'Sunucu büyük resimlerin küçük boylarının oluşturulması için yapılandırılmış, fakat ImageMagick henüz kurulmamış. Favori paket yöneticinizi kullanarak ImageMagick kurun veya <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">son sürümünü indirin</a>.'
+    failing_emails_warning: 'Başarısız sonuçlanmış %{num_failed_jobs} email işlemi bulunuyor. config/discourse.conf dosyanızı kontrol edin ve email sunucu ayarlarınızın doğru olduğundan emin olun. <a href="/sidekiq/retries" target="_blank">Sidekiq''deki başarısız işlemlere gözatın</a>.'
+    default_logo_warning: "Sitenizdeki logo resimlerini henüz kişiselleştirmemişsiniz.  <a href='/admin/site_settings'>Site Ayarları</a> sayfasında logo_url, logo_small_url, ve favicon_url bağlantılarını güncelleyin."
+    contact_email_missing: "Siteniz için bir iletişim emaili girmediniz. Lütfen <a href='/admin/site_settings'>Site Ayarları</a> sayfasında iletişim emailinizi güncelleyin."
+    contact_email_invalid: "Siteniz için girilen iletişim emaili geçersiz. Lütfen <a href='/admin/site_settings'>Site Ayarları</a> sayfasında iletişim emailinizi güncelleyin."
+    title_nag: "Site Ayarları başlığı hala varsayılan değerinde. Lütfen <a href='/admin/site_settings'>Site Ayarları</a> sayfasından kendi sitenizin başlıyla güncelleyin."
+    site_description_missing: "site_description ayarı boş bırakılmış. <a href='/admin/site_settings'>Site Ayarları</a> sayfasında bu forumla ilgili kısa bir açıklama yazın. "
+    consumer_email_warning: "Sitenizde email gönderimleri için Gmail (ya da başka bir email hizmeti) kurulumu yapılmış. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail ile gönderebileceğiniz email sayısı limitlidir</a>. Onun yerine, emaillarınızın ulaştırılabildiğinden emin olmak için mandrill.com benzeri bir hizmet sağlayıcısını kullanın."
+    access_password_removal: "Siteniz artık kaldırılmış olan access_password ayarını kullanıyordu. Yerine etkinleştirilen login_required ve must_approve_users ayarları kullanılmalı. Bu ayarları <a href='/admin/site_settings'>Site Ayarları</a> sayfasından değiştirebilirsiniz. <a href='/admin/users/list/pending'>Bekleyen Kullanıcılar listesinden kullanıcıları onayladığınızdan</a> emin olun. (Bu mesaj 2 gün sonra kaybolacak.)"
+    site_contact_username_warning: "site_contact_username ayarı boş bırakılmış. Lütfen <a href='/admin/site_settings'>Site Ayarları</a> sayfasından güncelleyin. Sistem mesajlarını gönderen kişi olarak gözükecek adminin kullanıcı adını girin. "
+    notification_email_warning: "notification_email ayarı boş bırakılmış. Lütfen, <a href='/admin/site_settings'>Site Ayarları</a> sayfasından güncelleyin."
+  content_types:
+    education_new_reply:
+      title: "Yeni Kullanıcı Eğitimi: İlk Cevaplar"
+      description: "Yeni kullanıcılar, ilk iki cevaplarını yazmaya başladıklarında, pop-up son-dakika yardım kılavuzu metin düzenleyecisinin üstünde otomatik olarak çıksın."
+    education_new_topic:
+      title: "Yeni Kullanıcı Eğitimi: İlk Konular"
+      description: "Yeni kullanıcılar, ilk iki cevaplarını yazmaya başladıklarında, pop-up son-dakika yardım kılavuzu metin düzenleyecisinin üstünde otomatik olarak çıksın."
+    usage_tips:
+      title: "Yeni Kullanıcı Kılavuzu"
+      description: "Yeni kullanıcılar için kılavuz ve gerekli bilgiler."
+    welcome_user:
+      title: "Hoşgeldiniz: Yeni Kullanıcı"
+      description: "Tüm yeni kullanıcılara, ilk üye olduklarında otomatik olarak gönderilen özel mesaj. "
+    welcome_invite:
+      title: "Hoşgeldiniz: Davetli Kullanıcı"
+      description: "Bir başka kullanıcı tarafından davet edilen yeni kullanıcılara, daveti kabul ettiklerinde gönderilen otomatik özel mesaj."
+    login_required_welcome_message:
+      title: "Giriş Yapmak Zorunlu: Hoşgeldiniz Mesajı"
+      description: "'Giriş yapmak zorunlu' ayarı etkinleştirildiğinde, sisteme giriş yapmamış olan ziyaretçilere gözüken hoşgeldiniz mesajı. "
+    login_required:
+      title: "Giriş Yapmak Zorunlu: Anasayfa"
+      description: "Siteye giriş yapmanın zorunlu olduğu durumlarda izin almamış kullanıcılara çıkan mesaj."
+    head:
+      title: "HTML başlık"
+      description: "<head></head> etiketleri arasına eklenecek HTML."
+    top:
+      title: "Sayfaların en üstü"
+      description: "Her sayfanın en üstüne eklenecek HTML (sayfa başlığından sonra, navigasyondan ya da konu başlığından önce)."
+    bottom:
+      title: "Sayfaların en altı"
+      description: "</body> etiketinden önce eklenecek HTML"
+  site_settings:
+    censored_words: " &#9632;&#9632;&#9632;&#9632; yerine otomatik olarak kullanılacak kelimeler"
+    delete_old_hidden_posts: "30 günden fazla süreyle gizli kalan gizlenmiş gönderileri otomatik olarak sil."
+    default_locale: "Bu Discourse yüklemesinin  (ISO 639-1 Code) varsayılan dili"
+    allow_user_locale: "Kullanıcıların arayüz için kendi istedikleri dili seçmesine izin ver"
+    min_post_length: "Gönderide olması gereken minimum karakter sayısı"
+    min_private_message_post_length: "Özel mesaj gönderilerinde olması gereken minimum karakter sayısı"
+    max_post_length: "Gönderide izin verilen maximum karakter sayısı"
+    min_topic_title_length: "Konuda olması gereken minimum karakter sayısı"
+    max_topic_title_length: "Konu başlığında izin verilen maksimum karakter sayısı"
+    min_private_message_title_length: "Özel mesajın başlığında olabilecek minimum karakter sayısı"
+    min_search_term_length: "Arama için girilecek kelimede olması gereken minimum karakter sayısı"
+    allow_uncategorized_topics: "Konuların kategori seçmeden oluşturulmasına izin ver."
+    uncategorized_description: "Kategorisiz kategorisinin tanıtımı. Boş bırakabilirsiniz."
+    allow_duplicate_topic_titles: "Aynı başlık ile birden çok konu açılmasına izin ver."
+    unique_posts_mins: "Kullanıcının aynı içerikle yeni bir gönderi oluşturmadan önce geçmesi gereken dakika"
+    educate_until_posts: "Kullanıcılar, ilk (n) gönderilerini yazmaya başladıklarında, pop-up yeni kullanıcı eğitim paneli metin düzenleyecisinin üstünde çıksın."
+    title: "Sayfa başlığı etiketinde kullanılacak, sitenin kısa başlığı. "
+    site_description: "Açıklama etiketinde kullanılacak, sitenin bir cümlelik açıklaması. "
+    contact_email: "Siteye ait ana iletişim emaili. Discourse.org'dan, kritik güncellemelerle ilgili önemli bildiriler bu adrese gönderilebilir."
+    queue_jobs: "SADECE YAZILIMCILAR İÇİN! UYARI! Aksi gerekmediği takdirde sidekiq işlerini hep otomatik sıraya koydurtun. Bu özellik devre dışı bırakılırsa, siteniz düzgün çalışmayacaktır."
+    crawl_images: "Doğru genişlik ve yükseklik boyutlarını girmek için uzak URL'lerdeki resimlerin birer kopyasını alınsın."
+    download_remote_images_to_local: "Uzaktaki resimler yerel resimlere çevirmek için indirilsin; bu ayar resim bağlantılarının kırılmasını önleyecektir"
+    download_remote_images_threshold: "Uzaktaki resimlerin yerele indirilmesi için gereken minimum disk alanı (yüzdesel)"
+    disabled_image_download_domains: "Bu alan adlarından hiç bir zaman uzaktan resim indirme. Sınırlandırılmış liste."
+    ninja_edit_window: "Gönderi oluşturulduktan (n) saniye içerisinde bir düzenleme yapıldığında, gönderi tarihinde yeni bir versiyon yaratma."
+    post_edit_time_limit: "Yazar gönderiyi yayınladıktan sonra (n) dakika içerisinde gönderiyi düzenleyebilir ya da silebilir. Sonsuz için 0 girin."
+    edit_history_visible_to_public: "Düzenlenmiş gönderinin eski verisyonlarını herkesin görmesine izin ver. Bu özellik kapatıldığında, eski versiyonları sadece görevliler görebilir."
+    delete_removed_posts_after: "Yazar tarafından kaldırılan gönderiler (n) saat sonra otomatik olarak silinecektir. 0 olarak ayarlanırsa, gönderiler beklemeden hemen silinir."
+    max_image_width: "Bir gönderideki küçük resimlerin maksimum genişliği"
+    max_image_height: "Bir gönderideki küçük resimlerin maksimum yüksekliği"
+    category_featured_topics: "/categories sayfasında yer alan kategori başına düşen konu sayısı. Bu değeri değiştirirseniz, değişikliğin kategoriler sayfasına yansıması 15 dakika kadar sürebilir."
+    show_subcategory_list: "Bir kategoriye girildiğinde konu listesi yerine alt kategori listesini göster."
+    fixed_category_positions: "Seçerseniz, kategoriler için sabit bir sıralama belirleyebileceksiniz. Seçmezseniz, kategoriler aktivite sırasına göre listelenir. "
+    add_rel_nofollow_to_user_content: "İç bağlantılar (ana alan adları dahil) hariç, gönderilen tüm kullanıcı içeriklerine rel nofollow ekle. Bu ayarı değiştirirseniz, tüm gönderileri \"rake post:rebake\" ile rebake etmeniz gerekir."
+    exclude_rel_nofollow_domains: "Nofollow eklenmeyecek sınırlandırılmış alan adları listesi. (tld.com'a izin verirseniz otomatik olarak sub.tld.com'a da izin verilir.)"
+    post_excerpt_maxlength: "Gönderi alıntısının / özetinin maksimum uzunluğu."
+    post_onebox_maxlength: "Kutulanmış bir Discourse gönderisinin maksimum karakter uzunluğu"
+    onebox_domains_whitelist: "Kutulamaya izin verilen alan adları listesi; bu alan adları OpenGraph ya da oEmbed desteklemeliler. http://iframely.com/debug adresinden test edebilirsiniz."
+    logo_url: "Sitenizin sol üstünde yer alan logo örn: http://example.com/logo.png"
+    digest_logo_url: "Sitenizin özet emaillarının üst kısmında kullanılacak logo. Boş bırakılırsa `logo_url` kullanılacak. örn: http://example.com/logo.png"
+    logo_small_url: "Sitenizin sol üstünde yer alacak, sayfayı aşağı kaydırdığınızda gözükecek küçük logo. Örnek: http://example.com/logo-small.png "
+    favicon_url: "Site favikonunuz. Bakın; http://en.wikipedia.org/wiki/Favicon"
+    mobile_logo_url: "Mobil sitenizin sol üstünde yer alacak sabit pozisyonlu logo. Boş bırakılırsa, `logo_url` kullanılacak. örn: http://example.com/uploads/default/logo.png"
+    apple_touch_icon_url: "Apple dokunmatik cihazları için kullanılan ikon. Önerilen boyut; 144 x 144 pixel."
+    notification_email: "Tüm önemli sistem emailları için kullanılacak olan gönderen email adresi. Emailların başarıyla ulaşması için buraya girilen alan adının SPF, DKIM ve reverse PTR kayıtlarının doğru yapılması lazım."
+    email_custom_headers: "Sınırlandırılmış özel email başlıkları listesi"
+    email_subject: "Standart emailları için özelleştirilebilir konu formatı. Bakınız https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801"
+    use_https: "Sitenizin tam url'i (Discourse.base_url) http mi yoksa https uzantılı mı olmalı? HTTPS AYARLARINIZ TAMAMLANMADIYSA VE HENÜZ ÇALIŞMIYORSA BUNU ETKİNLEŞTİRMEYİN! "
+    summary_score_threshold: "Bir gönderinin 'Bu Konuyu Özetle' içinde yer alması için gereken minimum skor."
+    summary_posts_required: "'Bu Konuyu Özetle'nin etkinleştirilmesi için konuda olması gereken minimum gönderi sayısı"
+    summary_likes_required: "'Bu Konuyu Özetle'nin etkinleştirilmesi için konuda olması gereken minimum beğeni sayısı"
+    summary_percent_filter: "Kullanıcı 'Bu Konuyu Özetle'ye tıkladığında, gönderinin ilk % kısmını göster"
+    summary_max_results: "'Bu Konuyu Özetle'den dönen maksimum gönderi sayısı"
+    enable_private_messages: "Güven seviyesi 1 olan kullanıcıların özel mesaj oluşturmasına ve özel mesajlara cevap vermesine izin ver"
+    enable_long_polling: "Bildiri için kullanılan message bus uzun sorgular yapabilir"
+    long_polling_base_url: "Uzun sorgular için kullanılan baz URL (CDN dinamik içerik sunuyorsa, bunu origin olarak ayarladığına emin ol) ör: http://origin.site.com"
+    long_polling_interval: "Gönderilecek bilgi olmadığı zaman sunucunun kullanıcılara geri dönmeden önce beklemesi gereken zaman (sadece giriş yapmış kullanıcın için)"
+    polling_interval: "Uzun sorgular yapılmadığı zaman, kaç mili saniyede bir giriş yapmış kullanıcılar poll yapmalı"
+    anon_polling_interval: "Kaç mili saniyede bir anonim kullanıcılar sorgu yapmalı"
+    background_polling_interval: "(Pencere arkaplanda olduğu zaman) kaç mili saniyede bir kullanıcılan sorgu yapmalı"
+    auto_track_topics_after: "Bir konu otomatik olarak takip edilmeye başlanılmadan önce varsayılan global mili saniye süre, kullanıcılar bu ayarı geçersiz kılabilir (her zaman için 0, hiç bir zaman için -1 girin)"
+    new_topic_duration_minutes: "Bir konunun yeni sayılması için varsayılan global dakika süre, kullanıcılar bu ayarı geçersiz kılabilir (her zaman için -1, son ziyaret için -2 girin)"
+    flags_required_to_hide_post: "Bir postun otomatik olarak gizlenmesi ve yazarına Özel Mesaj gönderilmesi için gereken bayrak sayısı (Hiç bir zaman için 0 girin)"
+    cooldown_minutes_after_hiding_posts: "Topluluk tarafından bayraklanarak gizlenen gönderiyi düzenleyebilmek için, kullanıcının beklemesi gereken dakika süresi "
+    max_topics_in_first_day: "Kullanıcının sitedeki ilk gününde, oluşturabileceği maksimum konu sayısı"
+    max_replies_in_first_day: "Kullanıcının sitedeki ilk gününde, oluşturabileceği maksimum cevap sayısı"
+    num_flags_to_block_new_user: "Eğer, yeni bir kullanıcının gönderileri num_flags_to_block_new_user farklı kullanıcıdan buradaki sayı kadar bayrak alırsa , kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin."
+    num_users_to_block_new_user: "Eğer, yeni bir kullanıcının gönderileri buradaki sayı kadar farklı kullanıcı tarafından num_flags_to_block_new_user bayrak alırsa, kullanıcının bütün gönderilerini gizle ve yeni gönderi oluşturabilmesine izin verme. Devre dışı bırakmak için 0 girin."
+    notify_mods_when_user_blocked: "Eğer bir kullanıcı otomatik olarak engellendiyse, tüm moderatörlere mesaj yolla."
+    flag_sockpuppets: "Eğer, yeni kullanıcı konuya, konuyu başlatan yeni kullanıcı ile aynı IP adresinden cevap yazarsa, her iki gönderiyi de potansiyel spam olarak işaretle. "
+    traditional_markdown_linebreaks: "Markdown'da, satır sonundan önce yazının sağında iki tane boşluk gerektiren, geleneksel satır sonu metodunu kullan kullan."
+    post_undo_action_window_mins: "Kullanıcıya tanınan, bir gönderide yapılan yeni aksiyonları (beğenme, bayraklama, vs) geri alabilme dakika süresi"
+    must_approve_users: "Siteye erişimlerine izin verilmeden önce tüm yeni kullanıcı hesaplarının görevliler tarafından onaylanması gerekir."
+    ga_tracking_code: "Google analytics (ga.js) takip kodu, ör: UA-12345678-9; bakınız http://google.com/analytics"
+    ga_domain_name: "Google analytics (ga.js) alan adı, ör: mysite.com; bakınız http://google.com/analytics"
+    ga_universal_tracking_code: "Google Universal Analytics (analytics.js) takip kodu, ör: UA-12345678-9; bakınız http://google.com/analytics"
+    ga_universal_domain_name: "Google Universal Analytics (analytics.js) alan adı, ör: mysite.com; bakınız http://google.com/analytics"
+    enable_escaped_fragments: "Webcrawler algılanmadığı zaman Google'ın Ajax-Crawling API'sine başvur. Bakınız https://support.google.com/webmasters/answer/174992?hl=en"
+    enable_noscript_support: "Noscript etiketi üzerinden standart webcrawler arama motoru desteğini etkinleştir"
+    allow_moderators_to_create_categories: "Moderatörlerin yeni kategoriler oluşturmasına izin ver"
+    cors_origins: "Cross-origin taleplerine (CORS) izin verilen originler. Her origin http:// veya https:// içermeli. CORS'u etkinleştirebilmek için DISCOURSE_ENABLE_CORS env değişkeni doğru olarak ayarlanmalı."
+    top_menu: "Anasayfa navigasyonundaki öğelerin hangi sırada yer alacağını belirleyin. Örneğin;\nen sonIyeniIokunmamışIyıldızlıIkategorilerIpopülerIokunmuşlarIgönderilenler"
+    post_menu: "Gönderi menüsündeki öğelerin hangi sırada yer alacağını belirleyin. Örnek: beğen|düzenle|bayrakla|sil|paylaş|işaretle|cevapla"
+    post_menu_hidden_items: "Gönderi menüsündeki maddeler, genişletme üç noktasına tıklanmadığı takdirde otomatik olarak gizlenir. "
+    share_links: "Paylaşım penceresinde hangi maddelerin ne sırada gözükeceğini belirleyin."
+    track_external_right_clicks: "URL'leri tekrar yazdığı için, sağ tıklanan dış bağlantıların (ör: yeni bir sekmede aç) takibi varsayılan ayarlarda devre dışı bırakılmıştır."
+    topics_per_page: "Konu listesinde gözüken ve daha fazla konu görmek için sayfa aşağı kaydırıldığında yüklenen konu sayısı"
+    posts_chunksize: "Bir konuda gözüken ve daha fazla gönderi görmek için sayfa aşağı kaydırıldığında yüklenen gönderi sayısı"
+    site_contact_username: "Tüm otomatik özel mesajlar bu kullanıcıdan gönderilecek; boş bırakılırsa varsayılan Sistem hesabı kullanılır. "
+    send_welcome_message: "Tüm yeni kullanıcılara bir hoşgeldiniz özel mesajı ile beraber hızlı başlangıç kılavuzu gönderin."
+    suppress_reply_directly_below: "Bu gönderinin direk altında sadece tek bir cevap varsa, gönderideki açılabilir cevap sayısı bölümünü gösterme."
+    suppress_reply_directly_above: "Bu gönderinin direk üstünde sadece tek bir cevap varsa, gönderideki açılabilir hangi-cevaba-istinaden-cevapla bölümünü gösterme."
+    suppress_reply_when_quoting: "Gönderi cevabı alıntılarsa, gönderideki açılabilir hangi-cevaba-istinaden-cevapla bölümünü gösterme."
+    max_reply_history: "Hangi-cevaba-istinaden-cevapla bölümü açılınca gösterilecek maximum cevap sayısı"
+    experimental_reply_expansion: "Hangi-cevaba-istinaden-cevapla bölümü açılınca ara cevapları gizle (deneysel)"
+    topics_per_period_in_top_summary: "Popüler konular özetinde gösterilen popüler konu sayısı."
+    topics_per_period_in_top_page: "'Daha Fazla Göster' ile genişletilen popüler konular bölümünde gösterilecek popüler konu sayısı. "
+    redirect_users_to_top_page: "Yeni ve uzun süredir giriş yapmamış kullanıcıları otomatik olarak Popüler sayfasına yönlendir."
+    show_email_on_profile: "Kullanıcının email adresini profilinde göster (sadece kendilerine ve site görevlilerine gözükür)"
+    email_token_valid_hours: "Şifremi unuttum / hesap aktivasyon jetonları (n) saat geçerlidir."
+    email_token_grace_period_hours: "Şifremi unuttum / hesabı aktive et jetonları kullanıldıktan sonra (n) saat boyunca hala geçerlidir."
+    enable_badges: "Rozet sistemini etkinleştir"
+    allow_index_in_robots_txt: "robots.txt dosyasında bu sitenin arama motorları tarafından indekslenmesine izin verildiğini belirt."
+    email_domains_blacklist: "Kullanıcıların kayıt olurken kullanamayacağı email alan adlarının listesi. Örneğin: mailinator.com trashmail.net"
+    email_domains_whitelist: "Kullanıcıların kayıt olurken kullanmak ZORUNDA olduğu email alan adlarının listesi. UYARI: Bu listede yer almayan email uzantıları kabul edilmeyecektir!"
+    forgot_password_strict: "Şifremi unuttum alanını kullanırlarken, kullanıcıları hesabın varlığından haberdar etme. "
+    version_checks: "Discourse Hub'a versiyon güncellemeleri için ping yolla ve yeni versiyon mesajlarına /admin gösterge panelinde yer ver"
+    new_version_emails: "Discourse'un yeni versiyonu çıktığında contact_email adresine email gönder."
+    port: "SADECE YAZILIMCILAR İÇİN! UYARI! Varsayılan 80 portu yerine bu HTTP portunu kullanın. Varsayılan 80'i kullanmak için boş bırakın. "
+    force_hostname: "SADECE YAZILIMCILAR İÇİN! DİKKAT! URL'de bir bilgisayar adı belirleyin. Varsayılan için boş bırakın."
+    invite_expiry_days: "Kullanıcı davet anahtarlarının geçerlilik süresi, gün olarak"
+    invite_passthrough_hours: "Daha önce kabul edilmiş davetiye anahtarının kullanım süresi, saat olarak"
+    invite_only: "Halka açık kayıt sistemi devre dışı bırakıldı, tüm yeni kullanıcıların bir üye ya da görevli tarafından davet edilmesi gerekir. "
+    login_required: "Bu sitede içerik görüntülenebilmesi için kimlik doğrulamayı zorunlu kıl, isimsiz girişe izin verme."
+    min_username_length: "Kullanıcı adında olması gereken minimum karakter sayısı. UYARI: HALİHAZIRDA BUNDAN DAHA KISA BİR KULLANICI ADINA SAHİP OLAN KULLANICILAR SİTEYE GİRİŞ YAPAMAYACAKLAR. "
+    max_username_length: "Kullanıcı adında olabilecek maksimum karakter sayısı. UYARI: HALİHAZIRDA BUNDAN DAHA UZUN BİR KULLANICI ADINA SAHİP OLAN KULLANICILAR SİTEYE GİRİŞ YAPAMAYACAKLAR. "
+    min_password_length: "Minimum şifre uzunluğu."
+    block_common_passwords: "En çok kullanılan 10,000 şifre arasında yer alan şifrelere izin verme."
+    enable_sso: "Dış bir site aracılığı ile tek oturum açma sistemini etkinleştir. (Not: davetiye sistemini devre dışı bırakır)"
+    enable_sso_provider: " /session/sso_provider son noktasında Discourse TOA uygula, sso_secret değerinin seçilmiş olmasını gerektirir"
+    sso_url: "Bitiş noktasındaki tek oturum açma URL'i"
+    sso_secret: "TOA bilgisinin şifrelemesi/deşifre edilmesi için kullanılan gizli string, 10 karakter veya daha uzun olması gerekli"
+    sso_overrides_email: "TOA yararlı yükündeki dış site emailini yerel emailin üzerine yazar (DİKKAT: yerel emailların normalizasyon sürecinde uyuşmazlıklar doğabilir)"
+    sso_overrides_username: "TOA yararlı yükündeki dış site kullanıcı adını yerel kullanıcı adının üzerine yazar (DİKKAT: kullanıcı adı uzunlukları/gereksinimleri arasındaki farklılıklardan ötürü uyuşmazlıklar yaşanabilir)"
+    sso_overrides_name: "TOA yararlı yükündeki dış site ismini yerel ismin üzerine yazar (DİKKAT: yerel isimlerin normalizasyon sürecinde uyuşmazlıklar doğabilir)"
+    sso_overrides_avatar: "TOA yararlı yükündeki dış site avatarını kullanıcı avatarının üzerine yazar Eğer etkinleştirildiyse, allow_uploaded_avatars ayarının devre dışı bırakılması şiddetle önerilir"
+    enable_local_logins: "Yerel kullanıcı adı ve şifre bazlı hesap girişlerini etkinleştir. (Not: davetiyelerin çalışabilmesi için bu ayarın etkinleştirilmesi gerekli)"
+    allow_new_registrations: "Yeni kayıtlara izin ver. Yeni hesap oluşturulmasını engellemek için burayı işaretlemeyin."
+    enable_google_logins: "(ıskartaya çıkartılmış) Google doğrumalasını etkinleştir. Bu Google'ın artık ıskartaya çıkardığı OPENID doğrulama metodudur. Yeni kurulumlar bununla çalışmayacaktır. Yerine Google Oauth2 kullanın. Varolan kurulumlar 20 Nisan 2015 tarihine kadar Google Oauth2'ye geçmeli."
+    enable_yahoo_logins: "Yahoo doğrulamasını etkinleştir"
+    enable_google_oauth2_logins: "Google Oauth2 doğrulamasını etkinleştir. Bu Google'ın şu an desteklediği doğrulama metodu. Anahtar ve secret gerektirir."
+    google_oauth2_client_id: "Google uygulamanıza ait Müşteri ID'si."
+    google_oauth2_client_secret: "Google uygulamanıza ait client secret değeri."
+    enable_twitter_logins: "Twitter doğrulamasını etkinleştir. twitter_consumer_key ve twitter_consumer_secret gereklidir"
+    twitter_consumer_key: "Twitter doğrulaması için gereken, http://dev.twitter.com adresinde kayıtlı consumer key"
+    twitter_consumer_secret: "Twitter doğrulaması için gereken, http://dev.twitter.com adresinde kayıtlı consumer secret"
+    enable_facebook_logins: "Facebook doğrulamasını etkinleştir. facebook_app_id ve facebook_app_secret gerekir"
+    facebook_app_id: "Facebook kimlik doğrulama için gerekli, https://developers.facebook.com/apps sayfasında bulunan app id"
+    facebook_app_secret: "Facebook kimlik doğrulama için gerekli, https://developers.facebook.com/apps sayfasında bulunan app secret"
+    enable_github_logins: "Github doğrulamasını etkinleştirin, github_client_id ve github_client_secret gereklidir"
+    github_client_id: "Github doğrulaması için gereken, https://github.com/settings/applications adresinde kayıtlı client id"
+    github_client_secret: "Github doğrulaması için gereken, https://github.com/settings/applications adresinde kayıtlı client secret"
+    allow_restore: "Geri almaya izin ver. Tüm sitedeki verileri değiştirebilir! Bir yedeklemeyi geri yüklemeyi planlamıyorsanız devre dışı bırakın."
+    maximum_backups: "Diskte tutulacak maksimum yedek sayısı. Eski yedekler otomatik olarak silinir."
+    backup_daily: "Siteyi günde bir kere otomatik olarak yedekle."
+    enable_s3_backups: "Tamamlanınca yedeklemeleri S3'e yükle. ÖNEMLİ: Dosyalar ayarında doğru S3 girilmesini gerektirir"
+    s3_backup_bucket: "Yedeklemelerin yüklenmesi için uzak biriktirme yeri. UYARI: Özel bir biriktirme yeri olduğundan emin olun"
+    active_user_rate_limit_secs: "'last_seen_at' alanını ne kadar sıklıkta güncelliyoruz, saniye olarak"
+    verbose_localization: "UI'da genişletilmiş yerelleştirme ipuçlarını göster"
+    previous_visit_timeout_hours: "Ziyaretin üzerinden burada belirtilen saat kadar süre geçtiğinde, ziyareti \"bir önceki\" olarak nitelendir"
+    rate_limit_create_topic: "Bir konu oluşturduktan sonra, başka bir konu oluşturmak için kullanıcılar (n) saniye beklemeli. "
+    rate_limit_create_post: "Bir gönderi oluşturduktan sonra, başka bir gönderi oluşturmak için kullanıcılar  (n) saniye beklemeli. "
+    rate_limit_new_user_create_topic: "Bir konu oluşturduktan sonra, başka bir konu oluşturmak için yeni kullanıcılar (n) saniye beklemeli. "
+    rate_limit_new_user_create_post: "Bir gönderi oluşturduktan sonra, başka bir gönderi oluşturmak için yeni kullanıcılar (n) saniye beklemeli. "
+    max_likes_per_day: "Bir günde, bir kullanıcının verilebileceği maksimum beğeni sayısı."
+    max_flags_per_day: "Bir günde, bir kullanıcının verebileceği maksimum bayrak sayısı. "
+    max_bookmarks_per_day: "Kullanıcı başına düşen günlük maksimum işaretleme sayısı."
+    max_edits_per_day: "Bir günde, bir kullanıcının yapabileceği maksimum düzenleme sayısı."
+    max_stars_per_day: "Bir günde, bir kullanıcının yıldızlayabileceği maksimum konu sayısı."
+    max_topics_per_day: "Bir günde, bir kullanıcının oluşturabileceği maksimum konu sayısı."
+    max_private_messages_per_day: "Bir günde, bir kullanıcının oluşturabileceği maksimum özel mesaj sayısı."
+    suggested_topics: "Konunun en altında yer alan, önerilen konu sayısı. "
+    limit_suggested_to_category: "Önerilen konularda sadece kullanıcının bulunduğu kategoriye ait konuları göster."
+    clean_up_uploads: "Yasadışı barındırmayı engellemek için artık referanssız yüklemeleri kaldır. UYARI: Bu ayarı etkinleştirmeden önce /uploads dizinini yedeklemeyi isteyebilirsiniz"
+    clean_orphan_uploads_grace_period_hours: "Artık yüklemeler kaldırılmadan önce tanınan süre (saat olarak)."
+    purge_deleted_uploads_grace_period_days: "Silinen yüklemelerin kaldırılması için tanınan süre (gün olarak)."
+    purge_unactivated_users_grace_period_days: "Hesabını aktive etmemiş bir kullanıcının sistemden silinmesi için tanınan süre (gün olarak)."
+    enable_s3_uploads: "Yüklemeleri Amazon S3 belleklerinde sakla. ÖNEMLİ: Doğru S3 bilgileri (erişim anahtarı id & gizli erişim anahtarı) gerektirir"
+    s3_use_iam_profile: 'Anahtarları almak için AWS EC2 IAM rolünü kullan. NOT: Etkinleştirilmesi "s3 access key id" and "s3 secret access key" ayarlarının üzerine yazacaktır.'
+    s3_upload_bucket: "Dosyaların yükleneceği Amazon S3 biriktirme yeri adı. DİKKAT: büyük harfler, nokta ve altçizgi karakterleri kullanılmamalı."
+    s3_access_key_id: "Resimleri yüklemek için kullanılacak olan Amazon S3 access key id."
+    s3_secret_access_key: "Resimleri yüklemek için kullanılacak olan Amazon S3 secret access key."
+    s3_region: "Resimleri yüklemek için kullanılacak olan Amazon S3 region name."
+    enable_flash_video_onebox: "Kutularda swf ve flv (Adobe Flash) yerleştirmelerine izin ver. UYARI: güvenlik açıkları doğurabilir"
+    default_invitee_trust_level: "Davet edilen kullanıcılar için varsayılan güven seviyesi (0-4)."
+    default_trust_level: "Tüm yeni kullanıcılar için varsayılan güven seviyesi (0-4)."
+    tl1_requires_topics_entered: "Yeni bir kullanıcının güven seviyesi 1'e yükseltilmeden önce oluşturması gereken konu sayısı."
+    tl1_requires_read_posts: "Yeni bir kullanıcının güven seviyesi 1'e yükseltilmeden önce okuması gereken gönderi sayısı."
+    tl1_requires_time_spent_mins: "Yeni bir kullanıcının güven seviyesi 1'e yükseltimeden önce gönderi okuyarak geçirmesi gereken dakika miktarı."
+    tl2_requires_topics_entered: "Bir kullanıcının güven seviyesi 2'ye yükseltimeden önce oluşturması gereken konu sayısı."
+    tl2_requires_read_posts: "Bir kullanıcının güven seviyesi 2'ye yükseltimeden önce okuması gereken gönderi sayısı."
+    tl2_requires_time_spent_mins: "Bir kullanıcının güven seviyesi 2'ye yükseltimeden önce gönderi okuyarak geçirmesi gereken dakika miktarı."
+    tl2_requires_days_visited: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce siteye girmesi gereken gün sayısı. "
+    tl2_requires_likes_received: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce alması gereken beğeni sayısı."
+    tl2_requires_likes_given: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce vermesi gereken beğeni sayısı."
+    tl2_requires_topic_reply_count: "Bir kullanıcının güven seviyesi 2'ye yükseltilmeden önce cevaplaması gereken konu sayısı."
+    tl3_requires_days_visited: "Bir kullanıcının güven seviyesi 3'e yükseltimeye hak kazanması için, son 100 günde siteyi ziyaret etmesi gereken minimum gün sayısı. (0 - 100)"
+    tl3_requires_topics_replied_to: "Bir kullanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için son 100 günde cevap yazması gereken minimum konu sayısı. (0 ya da daha fazla)"
+    tl3_requires_topics_viewed: "Bir kulanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için, son 100 gün içinde oluşturulmuş konulardan görüntülemesi gereken yüzde oranı. (0 ile 100 arası)"
+    tl3_requires_posts_read: "Bir kulanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için, son 100 gün içinde oluşturulmuş gönderilerden görüntülemesi gereken yüzde oranı. (0 ile 100 arası)"
+    tl3_requires_topics_viewed_all_time: "Bir kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için görüntülemesi gereken toplam minimum konu sayısı."
+    tl3_requires_posts_read_all_time: "Bir kullanıcının güven seviyesi 3'e yükselmeye hak kazanması için görüntülemesi gereken toplam minimum gönderi sayısı."
+    tl3_requires_max_flagged: "Bir kullanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için, son 100 gün içinde x farklı kullanıcı tarafından x adetten fazla gönderisinin bayraklanmamış olmaması gerekir. x bu ayara verilen değerdir. (0 ya da daha yüksek) "
+    tl3_promotion_min_duration: "Bir kullanıcının güven seviyesi 2'ye düşürülebilmesi için güven seviyesi 3'te geçirmesi gereken minimum gün sayısı."
+    tl3_requires_likes_given: "Bir kullanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için son 100 günde vermesi gereken minimum beğeni sayısı. "
+    tl3_requires_likes_received: "Bir kullanıcının güven seviyesi 3'e yükseltilmeye hak kazanması için son 100 günde alması gereken minimum beğeni sayısı. "
+    tl3_links_no_follow: "Güven seviyesi 3'teki kullanıcılar tarafından paylaşılan linklerdeki rel=nofollow'u kaldırma."
+    min_trust_to_create_topic: "Yeni bir konu oluşturmak için gereken minimum güven seviyesi. "
+    min_trust_to_edit_wiki_post: "Wiki olarak işaretlenmiş bir gönderiyi düzenleyebilmek için gereken minimum güven seviyesi."
+    newuser_max_links: "Yeni bir kullanıcının bir gönderiye ekleyebileceği bağlantı sayısı."
+    newuser_max_images: "Yeni bir kullanıcının bir gönderiye ekleyebileceği resim sayısı."
+    newuser_max_attachments: "Yeni bir kullanıcının bir gönderiye ekleyebileceği dosya sayısı."
+    newuser_max_mentions_per_post: "Yeni bir kullanıcının bir gönderi içinde kullanabileceği maksimum @isim bildiri sayısı."
+    newuser_max_replies_per_topic: "Yeni bir kullanıcının tek bir konu içerisinde, başka bir kullanıcı ona cevap yazana kadar, girebileceği maksimum cevap sayısı. "
+    max_mentions_per_post: "Bir kullanıcının bir gönderi içinde kullanabileceği maksimum @isim bildiri sayısı."
+    create_thumbnails: "Gönderiye sığmayacak kadar büyük olan görseller için küçük resimler ve lightbox resimleri oluştur."
+    email_time_window_mins: "Kullanıcılara, gönderilerini düzenlemelerine ve tamamlamalarına fırsat vermek için herhangi bir bildiri emaili göndermeden önce (n) dakika bekleyin."
+    email_posts_context: "Genel durumu göstermek amaçlı, bildiri emaillerinde yer alacak önceki cevap sayısı."
+    flush_timings_secs: "Zaman verisinin sunucuya atılma sıklığı, saniye olarak."
+    max_word_length: "Konu başlığında bulunabilecek maksimum karakter sayısı."
+    title_min_entropy: "Konu başlığı için gereken minimum entropi (tekil karakter, ingilizce-dışı karakterler daha fazla sayılır)"
+    body_min_entropy: "Gönderi içeriği için gereken minimum entropi (tekil karakter, ingilizce-dışı karakterler daha fazla sayılır)"
+    title_fancy_entities: "SmartyPants tarzında, konu başlıklarında ASCII karakterlerini süslü HTML öğelerine çevir: http://daringfireball.net/projects/smartypants/"
+    min_title_similar_length: "Bir başlığın benzer konular için kontrolünün yapılmasından önce sahip olması gereken minimum uzunluk."
+    min_body_similar_length: "Bir gönderi metninin benzer konular için kontrolünün yapılmasından önce sahip olması gereken minimum uzunluk."
+    category_colors: "Kategoriler için izin verilen onaltılı renk değerlerinin listesi"
+    max_image_size_kb: "KB cinsinden yüklenebilecek maksimum resim büyüklüğü. Bu nginx (client_max_body_size) / apache veya proxyde de ayarlanmalı."
+    max_attachment_size_kb: "KB cinsinden yüklenebilecek maksimum eklenti dosyası büyüklüğü. Bu nginx (client_max_body_size) / apache veya proxyde de ayarlanmalı."
+    authorized_extensions: "Yüklenebilecek dosya uzantılarının listesi (tüm dosya türlerini etkinleştirmek için '*' kullanın)"
+    max_similar_results: "Yeni bir konu oluştururken, düzenleyicinin üzerinde gösterilecek benzer konuların sayısı. Karşılaştırmalar başlık ve içerik üzerinden yapılır."
+    title_prettify: "Tümü büyük harf, ilk karakteri küçük harf, çoklu ! ve ?, sonda ekstra . kullanımı gibi, sık yapılan yazım hatalarını önle."
+    topic_views_heat_low: "Bu kadar görüntülemeden sonra, görüntülemeler alanı hafifçe vurgulanacak."
+    topic_views_heat_medium: "Bu kadar görüntülemeden sonra, görüntülemeler alanı kısmen vurgulanacak."
+    topic_views_heat_high: "Bu kadar görüntülemeden sonra, görüntülemeler alanı belirgin şekilde vurgulanacak."
+    cold_age_days_low: "Sohbet başlangıcından bu kadar süre geçtiğinde, son aktivite tarihi hafifçe vurgulanır."
+    cold_age_days_medium: "Sohbet başlangıcından bu kadar süre geçtiğinde, son aktivite tarihi kısmen vurgulanır."
+    cold_age_days_high: "Sohbet başlangıcından bu kadar süre geçtiğinde, son aktivite tarihi belirgin şekilde vurgulanır."
+    history_hours_low: "Bu kadar saat içerisinde düzenlenen bir gönderinin, düzenlendiğini belirten gösterge hafifçe vurgulanacak. "
+    history_hours_medium: "Bu kadar saat içerisinde düzenlenen bir gönderinin, düzenlendiğini belirten gösterge kısmen vurgulanacak. "
+    history_hours_high: "Bu kadar saat içerisinde düzenlenen bir gönderinin, düzenlendiğini belirten gösterge belirgin şekilde vurgulanacak. "
+    topic_post_like_heat_low: "Beğeni:gönderi oranı bu oranı geçtiğinde, gönderi sayısı alanı hafifçe vurgulanır. "
+    topic_post_like_heat_medium: "Beğeni:gönderi oranı bu oranı geçtiğinde, gönderi sayısı alanı kısmen vurgulanır."
+    topic_post_like_heat_high: "Beğeni:gönderi oranı bu oranı geçtiğinde, gönderi sayısı alanı belirgin şekilde vurgulanır."
+    faq_url: "Başka yerde barındırılan bir SSS'i kullanmak istiyorsanız, ilgili URL adresini buraya eksiksiz şekilde girin."
+    tos_url: "Başka yerde barındırılan bir Üyelik Sözleşmesi dökümanını kullanmak istiyorsanız, ilgili URL adresini buraya eksiksiz şekilde girin."
+    privacy_policy_url: "Başka yerde barındırılan bir Gizlilik Sözleşmesi dökümanını kullanmak istiyorsanız, ilgili URL adresini buraya eksiksiz şekilde girin."
+    newuser_spam_host_threshold: "Yeni bir kullanıcı, `newuser_spam_host_posts` gönderileri içerisinde aynı makineye, kaç kere bağlantı paylaşınca spam olarak algılansın."
+    white_listed_spam_host_domains: "Spam barındırma testinden hariç tutulan alan adı listesi. Yeni kullanıcıların, bu alan adlarına bağlantı içeren gönderi oluşturmaları hiç bir zaman engellenmeyecek."
+    staff_like_weight: "Görevlilerin beğenilere verilecek ekstra ağırlık faktörü."
+    levenshtein_distance_spammer_emails: "Spam emailları eşleştirilirken, bulanık eşleşme için tahammül edilecek karakter sayısı farklılığı."
+    max_new_accounts_per_registration_ip: "Eğer bu IP'den güven seviyesi 0 olan halihazırda (n) hesap varsa (hiçbiri görevli, GS2 ya da daha yüksek seviyede biri değilse), bu IP'den yeni üyelik kabul etme. "
+    min_ban_entries_for_roll_up: "Topla butonuna tıklandığında, (N) adetten fazla giriş varsa yeni bir subnet engelleme girişi yaratılacak."
+    max_age_unmatched_emails: "Taranmış email kayıtlarından karşılığı olmayanları (N) gün sonunda sil. "
+    max_age_unmatched_ips: "Taranmış IP girişlerinden karşılığı olmayanları (N) gün sonunda sil."
+    num_flaggers_to_close_topic: "Bir konunun moderatör müdahalesi için otomatik olarak durdurulmadan önce alması gereken minimum tekil bayrak sayısı"
+    num_flags_to_close_topic: "Bir konunun moderatör müdahalesi için otomatik olarak durdurulmadan önce alması gereken minimum aktif bayrak sayısı "
+    reply_by_email_enabled: "Konulara email üzerinden cevap yazmayı etkinleştir."
+    reply_by_email_address: "Email ile cevapla özelliği için gelen email adresi şablonu, örnek: %{reply_key}@reply.example.com or replies+%{reply_key}@example.com"
+    disable_emails: "Discourse'un herhangi bir email göndermesine izin verme"
+    strip_images_from_short_emails: "2800 Byte boyutundan küçük emaillardan resimleri çıkar"
+    short_email_length: "Kısa emailin uzunluğu, Byte olarak"
+    enable_email_names: "Emaillerde kullanıcının tam isminin gözükmesine izin ver. Emaillerde tam ismin gizlenmesi için bu özelliği devre dışı bırak."
+    pop3_polling_enabled: "Email cevapları için POP3 üzerinden sorgula"
+    pop3_polling_ssl: "POP3 sunucusuna bağlanırken SSL kullanın. (Tavsiye edilir)"
+    pop3_polling_period_mins: "Periyodik olarak POP3 hesabının email için kontrol edilmesinin dakika bazında sıklığı. NOT: yeniden başlatma gerektirir"
+    pop3_polling_port: "POP3 hesabının sorgulanacağı port"
+    pop3_polling_host: "POP3 üzerinden emailların sorgulanacağı sunucu"
+    pop3_polling_username: "Emailların sorgulanacağı POP3 hesabının kullanıcı adı."
+    pop3_polling_password: "Emailların sorgulanacağı POP3 hesabının şifresi."
+    email_in: "Kullanıcıların email aracılığıyla yeni konu oluşturabilmesine izin ver (pop3 sorgulaması gerektirir). Adresleri her kategorinin \"Ayarlar\" sekmesinden düzenleyin."
+    email_in_min_trust: "Bir kullanıcının email aracılığı ile yeni konu oluşturabilmesi için sahip olması gereken minimum güven seviyesi."
+    email_prefix: "Emaillerin konu bölümünü belirten [etiket]. Boş bırakılırsa 'title' yazacak."
+    email_site_title: "Bu siteden giden emaillarda gönderici olarak kullanılacak sitenin başlığı. Herhangi bir şey girilmezse varsayılan olarak 'title' yazacak. Eğer 'başlık\" içeriğinizde, email göndericisinin stringlerinde izin verilmeyen karakterler varsa, bu ayarı kullanın.  "
+    minimum_topics_similar: "Yeni konu oluşturulurken, benzer konuların gösterilmesi için sitede olması gereken konu sayısı."
+    relative_date_duration: "Gönderinin üstünden bu kadar gün geçtikten sonra, gönderi tarihi mutlak şekilde değil (20 Şubat) göreceli şekilde (7g) gösterilecek."
+    delete_user_max_post_age: "İlk gönderisini (x) günden eski olan kullanıcıların silinmesine izin verme."
+    delete_all_posts_max: "Tüm Gönderileri Sil butonuna basıldığında tek seferde silinebilecek maksimum gönderi sayısı. Eğer bir kullanıcının gönderi sayısı bu sayıdan fazlaysa, gönderilerin hepsi tek seferde silinemez ve bu kullanıcı silinemez."
+    username_change_period: "Kayıt sonrası, kullanıcı adınının değiştirilebileceği gün sayısı. (Kullanıcı adının değiştirilebilmesini devre dışı bırakmak için 0 girin)"
+    email_editable: "Kullanıcıların kayıt olduktan sonra email adreslerini değiştirmesine izin ver."
+    logout_redirect: "Çıkış yaptıktan sonra tarayıcının yönlendirileceği sayfa, ÖRN: (http://somesite.com/logout)"
+    allow_uploaded_avatars: "Kullanıcıların kendilerine özel avatarlar yüklemesine izin ver. "
+    allow_animated_avatars: "Kullanıcıların animasyonlu gif avatarları kullanmalarına izin ver. UYARI: bu ayarı değiştirdikten sonra avatars:refresh rake görevini çalıştırın."
+    allow_animated_thumbnails: "Animasyonlu giflerin, animasyonlu küçük resmini oluşturur."
+    automatically_download_gravatars: "Hesap oluşturma veya email değişikliği esnasında kullanıcılar için Gravatarları indir"
+    digest_topics: "Özet emaillarda yer alacak maksimum konu sayısı. "
+    digest_min_excerpt_length: "Özet emaillarında, gönderi alıntılarında olması gereken minimum karakter sayısı."
+    default_digest_email_frequency: "Varsayılan olarak, özet emaillar hangi sıklıkta gönderilsin? Üyeler, tercihler sayfasından bu ayarı değiştirebilir."
+    default_external_links_in_new_tab: "Dış bağlantıları yeni sekmede aç. Üyeler, tercihler sayfasından bu ayarı değiştirebilir."
+    detect_custom_avatars: "Olsun ya da olmasın kullanıcıların özel avatar yükleyip yüklemediğini kontrol et."
+    max_daily_gravatar_crawls: "Discourse'un gün içinde özel avatarlar için Gravatar'ı en fazla kaç kere kontrol edeceği."
+    public_user_custom_fields: "Kullanıcıların herkes tarafından görüntülenebilir özel alanlar oluşturmaları için beyaz liste."
+    allow_profile_backgrounds: "Kullanıcıların profillerine arkaplan eklemesine izin ver."
+    sequential_replies_threshold: "Kullanıcının ardarda çok fazla cevap gönderdiğine dair uyarı alması için, bir konuda üstüste yapması gereken gönderi sayısı. "
+    enable_mobile_theme: "Mobil cihazlar mobil uyumlu temayı kullanır, dilerse masaüstü görünüme geçebilirler. Eğer özel, duyarlı bir stil kullanıyorsanız bunu devredışı bırakın."
+    dominating_topic_minimum_percent: "Konuyu domine ettiğine dair uyarı almadan önce konudaki gönderilerin yüzde kaçının kullanıcıya ait olması gerekir."
+    suppress_uncategorized_badge: "Kategorisiz konular için olan rozeti konu listesinde gösterme."
+    global_notice: "Tüm ziyaretçilere İVEDİ ACİL DURUM global manşet uyarısı göster, saklamak için boş bırakın (HTML kullanılabilir)."
+    disable_edit_notifications: " 'download_remote_images_to_local' aktif olduğunda, sistem kullanıcısından gelen düzenleme bildirilerini devre dışı bırakır"
+    enable_names: "Kullanıcıların tam isimlerinin gözükmesine izin ver. Gizlenmesi için bu özelliği devre dışı bırak."
+    display_name_on_posts: "Gönderilerde @kullanıcıadı'na ek olarak kullanıcının tam adını da göster."
+    invites_per_page: "Varsayılan olarak kullanıcı sayfasında gösterilen davetler."
+    short_progress_text_threshold: "Bir konudaki gönderi sayısı bu sayının üzerine çıktığında, ilerleme çubuğunda sadece şu anki gönderi sayısını göster. İlerleme çubuğunun kalınlığını değiştirirseniz, bu değeri de değiştirmeniz gerekebilir."
+    default_code_lang: "GitHub kod bloklarına (lang-auto, ruby, python vs.) uygulanacak, varsayılan programlama dili sözdizimi vurgulaması."
+    warn_reviving_old_topic_age: "Herhangi bir kullanıcı, son cevabın burada belirtilen gün sayısından daha önce yazıldığı bir konuya cevap yazmaya başladığında, bir uyarı mesajı çıkacak. Bu özelliği devre dışı bırakmak için 0 girin. "
+    autohighlight_all_code: "Tüm önceden formatlanan kod bloklarına, açıkça dil seçimi yapılmamış olsa da, zorla kod vurgulaması uygula."
+    embeddable_host: "Bu Discourse forumundan yorumların yerleştirilebileceği sunucu"
+    feed_polling_enabled: "SADECE YERLEŞTİRME İÇİN: RSS/ATOM beslemesinin gönderi olarak yerleştirilip yerleştirilemeyeceği."
+    feed_polling_url: "SADECE YERLEŞTİRME İÇİN: Yerleştirilecek RSS/ATOM beslemesinin URL'i."
+    embed_by_username: "Yerleştirilmiş konuları oluşturan kullanıcıya ait Discourse kullanıcı adı. "
+    embed_username_key_from_feed: "Beslemeden Discourse kullanıcı adını çekmek için kullanılacak anahtar"
+    embed_truncate: "Yerleştirilmiş gönderileri kırp."
+    embed_category: "Yerleştirilmiş konular kategorisi."
+    embed_post_limit: "Yerleştirilecek maksimum gönderi sayısı."
+    embed_whitelist_selector: "Yerleştirmelerde kullanılmasına izin verilen öğeler için CSS seçicisi."
+    embed_blacklist_selector: "Yerleştirmelerden çıkartılmış öğeler için CSS seçicisi."
+    notify_about_flags_after: "Bu kadar saat geçmesine rağmen hala ilgilenilmemiş bayraklar varsa, contact_email adresine email gönder. Devre dışı bırakmak için 0 girin. "
+    enable_cdn_js_debugging: "/logs 'ların asli hataları tüm js içeriklerine crossorigin izinleri ekleyerek göstermesine izin ver."
+    show_create_topics_notice: "Eğer sitede herkese açık konu sayısı 5'den az ise, adminden yeni konular oluşturmasını isteyen bir uyarı mesajı göster. "
+    vacuum_db_days: "Geçiş sonra DB alanı geri kazanmak için TAM VAKUM ANALİZİ'ni çalıştırın (devre dışı bırakmak için 0 girin)"
+    prevent_anons_from_downloading_files: "Anonim kullanıcıların eklenti indirebilmesini önle. DİKKAT: Bu ayar, eklenti olarak gönderilen resim-dışı site içeriklerinin de çalışmasını engelleyebilir."
+    errors:
+      invalid_email: "Geçersiz email adresi.."
+      invalid_username: "Bu kullanıcı adı ile bir kullanıcı bulunmuyor."
+      invalid_integer_min_max: "Değer %{min} ile %{max} arasında olmalı."
+      invalid_integer_min: "Değer %{min} ya da daha fazla olmalı."
+      invalid_integer_max: "Değer en fazla %{max} olabilir."
+      invalid_integer: "Değer tam sayı olmalı."
+      regex_mismatch: "Değer istenen formatla eşleşmiyor."
+      invalid_string: "Geçersiz değer."
+      invalid_string_min_max: "%{min} ile %{max} karakter arasında olmalı."
+      invalid_string_min: "En az %{min} karakter olmalı."
+      invalid_string_max: "En fazla %{max} karakter olabilir."
+  notification_types:
+    mentioned: "%{display_username} sizden bahsetti: %{link}"
+    liked: "%{display_username} gönderinizi beğendi: %{link}"
+    replied: "%{display_username} gönderinize cevap verdi: %{link}"
+    quoted: "%{display_username} gönderinizi alıntıladı: %{link}"
+    edited: "%{display_username} gönderinizi düzenledi: %{link}"
+    posted: "%{display_username} gönderi oluşturdu %{link}"
+    moved_post: "%{display_username} gönderinizi buraya taşıdı: %{link}"
+    private_message: "%{display_username} size özel mesaj gönderi: %{link}"
+    invited_to_private_message: "%{display_username} sizi özel mesaja davet etti: %{link}"
+    invitee_accepted: "%{display_username} davetinizi kabul etti"
+    linked: "%{display_username} size %{link} sayfasında bağlantı verdi"
+    granted_badge: "%{link} kazandınız"
+  search:
+    within_post: "%{username} tarafından #%{post_number}"
+    types:
+      category: 'Kategoriler'
+      topic: 'Sonuçlar'
+      user: 'Kullanıcılar'
+  sso:
+    not_found: "Hesap aranamıyor ya da oluşturulamıyor, site admini ile iletişime geçin"
+    account_not_approved: "Hesap henüz onaylanmamış, onaylandığında email ile haberdar edileceksiniz"
+    unknown_error: "Bilgi güncellenirken hata oluştu, site admini ile iletişime geçin"
+    timeout_expired: "Seansınız zaman aşımına uğradı, lütfen tekrar giriş yapmayı deneyin"
+  original_poster: "Orjinal Poster"
+  most_posts: "En Çok Gönderi"
+  most_recent_poster: "En Son Gönderen"
+  frequent_poster: "En Sık Gönderen"
+  redirected_to_top_reasons:
+    new_user: "Hoşgeldiniz! Bunlar en popüler yeni gönderiler."
+    not_seen_in_a_month: "Hoşgeldiniz! Bir süredir yoktunuz. Bunlar sizin yokluğunuzda en popüler olan konular."
+  move_posts:
+    new_topic_moderator_post:
+      other: "%{count} gönderiyi yeni bir konuya taşıdım: %{topic_link}"
+    existing_topic_moderator_post:
+      other: "%{count} gönderiyi var olan konulardan birine taşıdım: %{topic_link}"
+  change_owner:
+    post_revision_text: "Sahiplik %{old_user} hesabından %{new_user} hesabına aktarıldı"
+  topic_statuses:
+    archived_enabled: "Konu şimdi arşivlendi. Donduruldu ve herhangi bir şekilde değişiklik yapılamaz."
+    archived_disabled: "Konu şimdi arşivden çıkarıldı. Artık donmuş değil, değiştirilebilir."
+    closed_enabled: "Konu şimdi kapatıldı. Artık yeni cevap yazılmasına izin yok. "
+    closed_disabled: "Konu şimdi açıldı. Yeni cevaplara izin var."
+    autoclosed_enabled_days:
+      other: "Bu konu %{count} gün sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+    autoclosed_enabled_hours:
+      other: "%{count} saat sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+    autoclosed_enabled_minutes:
+      other: "%{count} dakika sonunda konu otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+    autoclosed_enabled_lastpost_days:
+      other: "Bu konu son cevaptan %{count} gün sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+    autoclosed_enabled_lastpost_hours:
+      other: "Bu konu son cevaptan %{count} saat sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+    autoclosed_enabled_lastpost_minutes:
+      other: "Bu konu son cevaptan %{count} dakika sonra otomatik olarak kapatıldı. Yeni cevap girilmesine izin verilmiyor."
+    autoclosed_disabled: "Konu şimdi açıldı. Yeni cevaplara izin var."
+    autoclosed_disabled_lastpost: "Konu şimdi açıldı. Yeni cevaplara izin var."
+    pinned_enabled: "Bu konu başa tutturuldu. Görevli tarafından herkes için ya da kullanıcı tarafından kendisi için baştan kaldırılmadığı sürede bulunduğu kategorinin en üstünde yer alacak."
+    pinned_disabled: "Bu konu baştan kaldırıldı. Artık bulunduğu kategorinin en üstünde yer almayacak."
+    pinned_globally_enabled: "Bu konu global olarak başa tutturuldu. Görevliler herkes için ya da bireysel kullanıcılar kendileri için başa tutturmayı kaldırana dek, kendi kategorisinin ve tüm konu listelerinin en üstünde belirecek."
+    pinned_globally_disabled: "Bu konu baştan kaldırıldı. Artık bulunduğu kategorinin en üstünde yer almayacak."
+    visible_enabled: "Bu gönderi şimdi listelendi. Artık konu listesinde yer alacak."
+    visible_disabled: "Bu konu listeden çıkartıldı. Artık, konu listesinde yer almayacak. Bu konuya sadece kendi bağlantısından ulaşılabilir. "
+  login:
+    not_approved: "Hesabını henüz onaylanmadı. Giriş yapmak için hazır olduğunuzda email ile bilgilendirileceksiniz."
+    incorrect_username_email_or_password: "Yanlış kullanıcı adı, email ya da şifre"
+    wait_approval: "Üye olduğunuz için teşekkürler. Hesabınız onaylandığında sizi haberdar edeceğiz."
+    active: "Hesabını aktive edildi ve kullanıma hazır."
+    activate_email: "<p>Az kaldı! <b>%{email}</b> adresine bir aktivasyon emaili gönderdik. Hesabınızı aktive etmek için lütfen emaildaki yönlendirmeleri takip edin.</p><p>Eğer emaili almadıysanız, gereksiz klasörünüzü kontrol edin ya da başka bir aktivasyon emaili daha göndermek için tekrar giriş yapmayı deneyin.</p>"
+    not_activated: "Henüz giriş yapamazsınız. Size bir aktivasyon emaili gönderdik. Hesabınızı aktive etmek için lütfen emaildeki yönlendirmeleri takip edin."
+    not_allowed_from_ip_address: "Bu IP adresinden %{username} kullanıcı adı ile giriş yapamazsınız."
+    suspended: "%{date} tarihine kadar giriş yapamazsınız."
+    suspended_with_reason: "%{date} tarihine kadar giriş yapamazsınız. Uzaklaştırılma nedeniniz: %{reason}"
+    errors: "%{errors}"
+    not_available: "Uygun değil. Bunu denemeye ne dersiniz? %{suggestion}"
+    something_already_taken: "Bir şeyler ters gitti. Kullanıcı adı veya email zaten kayıtlı olabilir. Şifremi Unuttum bağlantısını deneyin."
+    omniauth_error: "Üzgünüz, %{strategy} hesabınız doğrulanırken bir hata oluştu. Doğrulama işlemini onaylamamış olabilir misiniz?"
+    omniauth_error_unknown: "Girişiniz yapılırken bir şeyler ters gitti, lütfen tekrar deneyin."
+    new_registrations_disabled: "Şu an yeni hesap oluşturulamıyor. "
+    password_too_long: "Şifreler maksimum 200 karakter olabilir."
+    missing_user_field: "Kullanıcı alanlarının tamamını doldurmadınız"
+    close_window: "Doğrulama tamamlandı. Devam etmek için bu pencereyi kapatın."
+  user:
+    no_accounts_associated: "İlgili hesap yok"
+    username:
+      short: "en az %{min} karakter olmalı"
+      long: "%{max} karakterden fazla olmamalı"
+      characters: "sadece rakam, harf ve altçizgi bulundurabilir "
+      unique: "özgün olmalı"
+      blank: "bulunmalı"
+      must_begin_with_alphanumeric: "harf ya da sayı ile başlamalı"
+    email:
+      not_allowed: "için o email sağlayıcısına izin verilmiyor. Lütfen başka bir email adresi kullanın. "
+      blocked: "için izin yok."
+    ip_address:
+      blocked: "engellenmiş."
+  invite_mailer:
+    subject_template: "%{invitee_name}  sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti. "
+    text_body_template: "%{invitee_name} sizi \n\n> %{site_title} -- %{site_description} \n\nsitesindeki\n\n> **%{topic_title}**\n>\n> %{topic_excerpt}\n\ntartışmasına davet ediyor.\n\nEğer ilgileniyorsanız, aşağıdaki bağlantıya tıklayın:\n\n%{invite_link}\n\nBu davet güvenilir bir kullanıcı tarafından gönderilmiştir, cevap yazarak tartışmaya hemen katılabilirsiniz.\n"
+  invite_forum_mailer:
+    subject_template: "%{invitee_name} sizi %{site_domain_name} sitesine katılmanız için davet etti"
+    text_body_template: |
+      %{invitee_name} sizi
+
+      > **%{site_title}**
+      >
+      > %{site_description}
+
+      sitesine katılmaya davet etti.  Eğer ilgileniyorsanız, aşağıdaki bağlantıya tıklayın:
+
+      %{invite_link}
+
+      Bu davet güvenilir bir kullanıcı tarafından gönderilmiştir. O nedenle giriş yapmanız gerekmeyecek.
+  invite_password_instructions:
+    subject_template: "%{site_name} hesabınız için şifre oluşturun"
+    text_body_template: |
+      %{site_name} sitesine olan davetinizi kabul ettiğiniz için teşekkür ederiz -- hoşgeldiniz!
+
+      Tekrar giriş yapmak için, aşağıdaki bağlantıya tıklayarak şifre seçin:
+      %{base_url}/users/password-reset/%{email_token}
+  test_mailer:
+    subject_template: "[%{site_name}] Email Ulaştırma Testi"
+    text_body_template: "Bu aşağıdaki adresten gönderilen bir test emailidir\n\n[**%{base_url}**][0]\n\nEmailların ulaştırılması karışık bir meseledir. Öncelikle dikkat etmeniz gereken bir kaç önemli nokta:\n\n- Site ayarlarınızda 'bildiri emailları' için gönderen adresini doğru ayarladığınıza emin olun. **Yolladığınız emaillarda \"gönderen\" adresi olarak belirlediğiniz alan adı, emaillarınızın doğrulanacağı alan adıdır.**\n\n- Email başlıklarındaki önemli ipuçlarını yakalayabilmek için email istemcinizde emailların kaynak kodunu nasıl görüntüleyebileceğinizi öğrenin. Gmail'da, her emailin sağ üstündeki açılır menüden \"show original\" opsiyonuna tıklayabilirsiniz.\n\n- **ÖNEMLİ:** ISP'nizde email yollamak için kullanıdığınız alan adlarıyla IP adreslerinin eşleşmesini sağlayacak bir reverse DNS kaydı var mı? Buradan [reverse PTR kayıtlarınızı test edin][2]. \n\n- Alan adınızın [SPF kaydı][8] doğru\
+      \ mu? Buradan [SPF kaydınızı test edin][1].  SPF için doğru resmi kayıt tipinin TXT olduğunu unutmayın.\n\n- Alan adınızın [DKIM kaydı][3] doğru mu? Bu emailların ulaştırılabilirliğini ciddi şekilde artıracaktır. Buradan [DKIM kaydınızı test edin][7].\n\n- Kendi email sunucunuzu kullanıyorsanız, email sunucunuzun IPlerinin [hiç bir email karalistesine][4] alınmadığına emin olun. Sunucunuzun, kesinlikle, HELLO mesajında DNS olarak çözümlenen tam tanımlanmış bilgisayar adı da gönderdiğinden emin olun. Göndermemesi, emailinizin bir çok email servisi tarafından reddedilmesine sebep olacaktır.\n\n(En kolayı, küçük topluluklar için rahat rahat yetecek sayıda bedava email yollama paketleri içeren, [Mandrill][md] veya [Mailgun][mg] veya [Mailjet][mj]'te ücretsiz hesap açmak. Tabi, gene DNS ayarlarınızda SPF ve DKIM kayıtlarını oluşturmanız gerekecek.)\n\nUmarız bu email ulaştırma testini başarıyla\
+      \ atlatmışsınızdır. \n\nİyi şanslar,\n\n[Discourse](http://www.discourse.org)'tan arkadaşlarınız\n\n[0]: %{base_url}\n[1]: http://www.kitterman.com/spf/validate.html\n[2]: http://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: http://whatismyipaddress.com/blacklist-check\n[5]: %{base_url}/unsubscribe\n[7]: http://dkimcore.org/tools/dkimrecordcheck.html\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[md]: http://mandrill.com\n[mg]: http://www.mailgun.com/\n[mj]: http://www.mailjet.com/pricing\n\n----\n\n<small>Her yolladığınız emailin altbilgisinde bir aboneliği iptal etme bağlantısı bulunması gerektiğinden dolayı hemen bir tane örnek yapalım. Bu email Şirketin Adı, 55 Main Street, Anytown, USA 12345 tarafından gönderilmiştir. İleride email almak istemiyorsanız, [buradan aboneliğinizi iptal edin][5].</small>\n"
+  new_version_mailer:
+    subject_template: "[%{site_name}] Yeni Discourse versiyonu, güncelleme var"
+    text_body_template: |2
+       [Discourse'un](http://www.discourse.org) yeni versiyonu hazır.
+
+      Sizin kullandığınız versiyon: %{installed_version}
+      Yeni versiyon: **%{new_version}**
+
+      Aşağıdakileri uygulayabilirsiniz:
+
+      - Yenilikleri [GitHub değişiklikler listesinde] görüntüleyebilirsiniz (https://github.com/discourse/discourse/commits/master).
+
+      - [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) sayfasını ziyaret ederek ve "Güncelle" butonuna basarak yeni versiyona geçebilirsiniz.
+
+      - Haberler, tartışmalar ve Discourse ile ilgili destek için burayı ziyaret edebilirsiniz: [meta.discourse.org](http://meta.discourse.org)
+  new_version_mailer_with_notes:
+    subject_template: "[%{site_name}] güncellemesi var"
+    text_body_template: |+
+      [Discourse'un](http://www.discourse.org) yeni versiyonu hazır.
+
+      Sizin kullandığınız versiyon: %{installed_version}
+      Yeni versiyon: **%{new_version}**
+
+      Aşağıdakileri uygulayabilirsiniz:
+
+      - Yenilikleri [GitHub değişiklikler listesinde] görüntüleyebilirsiniz (https://github.com/discourse/discourse/commits/master).
+
+      - [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) sayfasını ziyaret ederek ve "Güncelle" butonuna basarak yeni versiyona geçebilirsiniz.
+
+      - Haberler, tartışmalar ve Discourse ile ilgili destek için burayı ziyaret edebilirsiniz: [meta.discourse.org](http://meta.discourse.org)
+
+      ### Yeni sürüm notları
+
+      %{notes}
+
+  flags_reminder:
+    flags_were_submitted:
+      other: "Bu bayraklar %{count} saat önce verildi."
+    please_review: "Lütfen onları inceleyin."
+    post_number: "gönderi"
+    how_to_disable: '"Bayraklarla ilgili bilgilendirme süresi" ayarından bu hatırlatma emailinin gönderimini devre dışı bırakabilir ya da sıklığını değiştirebilirsiniz. '
+    subject_template:
+      other: "İlgilenilmesi gereken %{count} bayrak var"
+  flag_reasons:
+    off_topic: "Gönderiniz **konu-dışı** olarak bayraklandı: topluluk, gönderinizin konu başlığı ve ilk gönderi ile tanımlanan konu içeriğiyle uyuşmadığını düşünüyor."
+    inappropriate: "Gönderiniz **uygunsuz** olarak bayraklandı: topluluk gönderinizin saldırgan, kaba ya da [topluluk yönetmeliğine](/guidelines) aykırı olduğu fikrinde."
+    spam: "Gönderiniz **spam** olarak bayraklandı: topluluk, gönderinizin reklam içerikli olduğunu ve mevcut konuya alakası ya da faydası olmadığını düşünüyor."
+    notify_moderators: "Gönderiniz **moderatör kontrolü için** bayraklandı: topluluk, gönderinizin moderatör tarafından müdahale gerektiren bir içerik barındırdığını düşünüyor."
+  flags_dispositions:
+    agreed: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Bir sorun olduğu konusunda size katılıyoruz ve ilgileniyoruz."
+    agreed_and_deleted: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Bir sorun olduğu konusunda size katılıyoruz, gönderiyi kaldırdık. "
+    disagreed: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Konu ile ilgileniyoruz."
+    deferred: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Konu ile ilgileniyoruz."
+    deferred_and_deleted: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Gönderiyi kaldırdık."
+  temporarily_closed_due_to_flags: "Bu konu, topluluk tarafından bayraklanma sayısı çok olduğu için geçici olarak kapatıldı"
+  system_messages:
+    post_hidden:
+      subject_template: "Topluluk tarafından bayraklandığı için gönderiniz gizlendi"
+      text_body_template: "Merhaba,\n\nBu, gönderinizin gizlendiğini haber vermek için %{site_name} sitesinden gönderilmiş otomatik bir mesajdır.\n\n%{base_url}%{url}\n\n%{flag_reason}\n\nGönderiniz gizlenmeden önce birden fazla kullanıcı tarafından bayraklandı. Lütfen, bu geri bildirimler doğrultusunda gönderinizi nasıl düzelteceğinizi düşünün. **Gönderinizi %{edit_delay} dakika sonra düzenleyebilirsiniz, otomatik olarak tekrar yayına alınacaktır.** Bu sistemdeki güven seviyenizi yükseltecektir. \n\nAncak, eğer gönderiniz kullanıcılar tarafından ikinci kere gizlenirse, görevliler tarafından incelenene kadar gizli kalacaktır - ve hesabınızın askıya alınması dahil olmak üzere farklı önlemler alınabilir.\n\nDaha fazla bilgi için, lütfen [topluluk yönetmeliğine bakın](%{base_url}/guidelines).\n\n"
+    welcome_user:
+      subject_template: "%{site_name} sitesine hoşgeldiniz!"
+      text_body_template: |
+        %{site_name} sitesine katıldığınız için teşekkür ederiz ve hoşgeldiniz!
+
+        %{new_user_tips}
+
+        Her zaman [sivil toplum davranışlarının](%{base_url}/guidelines) geçerliliğine inanıyoruz.
+
+        Keyfini çıkarın!
+    welcome_invite:
+      subject_template: "%{site_name} sitesine hoşgeldiniz!"
+      text_body_template: "%{site_name} sitesine olan daveti kabul ettiğiniz için teşekkür ederiz -- hoşgeldiniz!\n\nSizin için otomatik olarak bir kullanıcı adı oluşturduk: **%{username}**, ancak [kullanıcı profil sayfasınızı][prefs] ziyaret ederek istediğiniz zaman değişiklik yapabilirsiniz.\n\nTekrar giriş yapmak için aşağıdaki seçeneklerden birini kullanabilirsiniz:\n\n1. İstediğiniz giriş seçeneğini kullanarak giriş yapın -- ancak davetiyenizin gönderildiği email adresiyle eşleşmiş olmalı. Yoksa giriş yapanın siz olduğunuzu anlamamız mümkün değil!\n\n2. [Kullanıcı profili sayfanızda][prefs] size özel şifrenizi oluşturun ve bunu kullanarak giriş yapın. \n\n%{new_user_tips}\n\n[Sivil toplum davranışlarına](%{base_url}/guidelines) olan inancımız daimidir.\n\nKaldığınız sürenin keyfini çıkarın!\n\n[prefs]: %{user_preferences_url}\n"
+    backup_succeeded:
+      subject_template: "Yedekleme başarıyla tamamlandı"
+      text_body_template: "Yedekleme başarıyla tamamlandı.\n\n[admin > backup section](/admin/backups) bölümünden yeni yedeği indirebilirsiniz."
+    backup_failed:
+      subject_template: "Yedekleme başarısız"
+      text_body_template: "Yedekleme başarısız oldu. \n\nKayıtlar burada:\n\n```\n\n%{logs}\n\n```\n\n"
+    restore_succeeded:
+      subject_template: "Geri alma başarıyla tamamlandı"
+      text_body_template: "Geri alma başarıyla tamamlandı."
+    restore_failed:
+      subject_template: "Geri alma başarısız"
+      text_body_template: |
+        Geri alma başarısız oldu.
+
+        Kayıtlar burada:
+
+        ```
+
+        %{logs}
+
+        ```
+    bulk_invite_succeeded:
+      subject_template: "Toplu davet gönderimi başarıyla tamamlandı"
+      text_body_template: "Toplu davet dosyanız işlendi, %{sent} davetiye gönderildi. "
+    bulk_invite_failed:
+      subject_template: "Toplu davet gönderiminde hata oluştu"
+      text_body_template: |
+        Toplu davet dosyanız işlendi, %{sent} davetiye %{failed} hata(lar) ile gönderildi.
+
+
+        Kayıtları aşağıda bulabilirsiniz:
+
+
+        ```
+
+        %{logs}
+
+        ```
+    csv_export_succeeded:
+      subject_template: "Veri Dışarı Aktarımı başarıyla tamamlandı"
+      text_body_template: |
+        Veri dışa aktarımı başarılı oldu.
+
+        CSV dosyasını buradan indirin:  <a class="attachment" href="%{download_link}">%{file_name}</a>
+
+        <small>CSV dosyasının indirilebileceği bağlantı 48 saat sonra yok olacak. </small>
+    csv_export_failed:
+      subject_template: "Dışarı aktarım başarısız oldu"
+      text_body_template: "Dışarı aktarım başarısız oldu. Lütfen kayıtları kontrol edin."
+    email_reject_trust_level:
+      subject_template: "Email sorunu -- Yetersiz Güven Seviyesi"
+      text_body_template: "Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız email başarısız oldu.\n\nBu email adresine yeni gönderiler oluşturmanız için, hesabınız yeterli güven seviyesine sahip değil. Bir hata olduğunu düşünüyorsanız, bir görevli ile iletişime geçin.\n \n"
+    email_reject_no_account:
+      subject_template: "Email sorunu -- Bilinmeyen Hesap "
+      text_body_template: |
+        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız email başarısız oldu.
+
+        Bu email adresine sahip bir kullanıcı bulunamadı. Başka bir email adresinden göndermeyi deneyin ya da bir görevli ile iletişime geçin.
+    email_reject_empty:
+      subject_template: "Email sorunu -- İçerik Yok"
+      text_body_template: |
+        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız email başarısız oldu.
+
+        Emailde herhangi bir içerik bulamadık. Cevabınızın emailin en üstünde yer aldığından emin olun -- aralardaki cevapları işleme alamıyoruz.
+
+        Emailinizde içerik olduğu halde bu mesajı aldıysanız, bir sefer de HTML içeriği ile göndermeyi deneyin (sadece düz metin olarak değil).
+    email_reject_parsing:
+      subject_template: "Email sorunu -- Bilinmeyen içerik"
+      text_body_template: |
+        Üzgünüz, ama  %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız email başırısız oldu.
+
+        Emailde herhangi bir cevap bulamadık. **Cevabınızın email'in en üstünde yer aldığından emin olun** -- aralardaki cevapları işleyemiyoruz.
+    email_reject_post_error:
+      subject_template: "Email sorunu -- Gönderim hatası"
+      text_body_template: |
+        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız email başarısız oldu.
+
+        Bir kaç muhtemel neden: karmaşık format, çok uzun mesaj, çok kısa mesaj. Lütfen tekrar deneyin, sorun devam ederse websitesi üzerinden gönderin.
+    email_reject_post_error_specified:
+      subject_template: "Email sorunu -- Gönderim hatası"
+      text_body_template: |
+        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız email başarısız oldu.
+
+        Sebep:
+
+        %{post_error}
+
+        Sorunu düzeltebilirseniz, lütfen tekrar deneyin.
+    email_reject_reply_key:
+      subject_template: "Email sorunu -- Bilinmeyen Cevap Anahtarı"
+      text_body_template: |
+        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız email başarısız oldu.
+
+        Cevap anahtarı geçersiz ya da bulunamıyor, bu nedenle de bu mesajın neye cevaben gönderildiğini bilemiyoruz. Bir görevli ile iletişime geçin.
+    email_reject_destination:
+      subject_template: "Email sorunu -- Bilinmeyen Alıcı Adresi"
+      text_body_template: |
+        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız email başarısız oldu.
+
+        Gönderilen adreslerinin hiçbiri bilinmiyor. Site adresinin To: kısmında olduğundan (Cc: ya da Bcc: değil) ve görevliler tarafından sağlanan doğru email adresine yolladığınızdan emin olun.
+    email_reject_topic_not_found:
+      subject_template: "Email sorunu -- Konu Bulunamadı"
+      text_body_template: |
+        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermek istediğiniz email başarısız oldu.
+
+        Konu bulunamadı, silinmiş olabilir. Yanlışlık olduğunu düşünüyorsanız, bir görevli ile iletişime geçin.
+    email_reject_topic_closed:
+      subject_template: "Email sorunu -- Konu Kapatıldı"
+      text_body_template: |
+        Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermek istediğiniz email başarısız oldu.
+
+        Konu kapatılmış. Yanlışlık olduğunu düşünüyorsanız, bir görevli ile iletişime geçin.
+    email_error_notification:
+      subject_template: "Email sorunu -- POP doğrulama hatası"
+      text_body_template: |
+        Mailler POP sunucusundan çağrılırken bir doğrulama hatası oluştu.
+
+        Lütfen, [site ayarlarında](%{base_url}/admin/site_settings/category/email) POP bilgilerinin doğru şekilde düzenlendiğinden emin olun.
+    too_many_spam_flags:
+      subject_template: "Yeni hesap engellendi"
+      text_body_template: |
+        Merhaba.
+
+        Bu, %{site_name} sitesinin, gönderilerinizin topluluk tarafından bayraklanması sonucu otomatik olarak gizlendiğini bildirmek için gönderdiği otomatik bir mesajdır.
+
+        Önlem olarak, bir görevli tarafından incelenene kadar yeni hesabınız üzerinden yeni cevap ya da konu oluşturmanız engellendi.
+
+        Daha fazla bilgi için lütfen [topluluk yönetmeliğine](%{base_url}/guidelines) bakın.
+    blocked_by_staff:
+      subject_template: "Hesap engellendi"
+      text_body_template: |
+        Merhaba.
+
+        Bu, %{site_name} sitesinin, hesabınızın bir görevli tarafından engellendiğini bildirmek için gönderdiği otomatik bir mesajdır.
+
+        Daha fazla bilgi için lütfen [topluluk yönetmeliğine](%{base_url}/guidelines) bakın.
+    user_automatically_blocked:
+      subject_template: "Topluluk bayrakları nedeniyle yeni kullanıcı %{username} engellendi"
+      text_body_template: |
+        Bu bir otomatik mesajdır.
+
+        Yeni kullanıcı [%{username}](%{base_url}%{user_url}), gönderisi(leri) farklı kullanıcılar tarafından bayrakladığı için otomatik olarak engellendi.
+
+        Lütfen [bayrakları inceleyin](%{base_url}/admin/flags). %{username} adlı kullancının haksız yere gönderi oluşturabilmesi engellendiyse, [bu kullanıcıya ait admin sayfasında](%{base_url}%{user_url}) engeli kaldır butonuna tıklayın.
+
+        Bu tür engellemeleri tetikleyen eşik, site ayarları sayfasında `block_new_user` bölümünden değiştirilebilir.
+    spam_post_blocked:
+      subject_template: "Üst üste aynı bağlantıların paylaşılmasından ötürü %{username} adlı yeni kullanıcının gönderileri engelledi"
+      text_body_template: "Bu bir otomatik mesajdır.\n\n[%{username}](%{base_url}%{user_url}) adlı yeni kullanıcı %{domains} sitelerine bağlantı içeren birçok farklı gönderi oluşturmaya çalıştı, ancak bu gönderiler spam yaratmamaları için engellendi. Kullanıcı hala %{domains} sitelerine bağlantılı içermeyen yeni gönderiler oluşturabiliyor. \n\nLütfen [kullanıcıyı inceleyin](%{base_url}%{user_url}).\n\nBu tür engellemeleri tetikleyen `newuser_spam_host_threshold` ve `white_listed_spam_host_domains` değerleri site ayarları sayfasından değiştirilebilir.\n"
+    unblocked:
+      subject_template: "Hesabın engeli kaldırıldı"
+      text_body_template: |
+        Merhaba,
+
+        Bu, %{site_name} sitesinin, görevlilerin değerlendirmeleri sonucunda hesabınızındaki engelin kaldırıldığını bildirmek için gönderdiği otomatik bir mesajdır.
+
+        Artık, eskisi gibi yeni cevaplar ve konular oluşturabilirsiniz.
+    pending_users_reminder:
+      subject_template:
+        other: "%{count} kullanıcı onay bekliyor"
+      text_body_template: "Bu foruma giriş yapabilmek için onayınızı (ya da reddinizi) bekleyen yeni kullanıcı kayıtları var. \n\n[Lütfen admin bölümünde değerlendirmenizi yapın](%{base_url}/admin/users/list/pending).\n"
+    download_remote_images_disabled:
+      subject_template: "Uzaktaki resimlerin indirilmesi devre dışı bırakıldı"
+      text_body_template: "`download_remote_images_to_local` ayarı harddisk alanı limiti `download_remote_images_threshold` aşıldığı için devre dışı bırakıldı."
+  unsubscribe_link: "Bu emaillara aboneliğinizi iptal etmek için [kullanıcı ayarları](%{user_preferences_url}) sayfanızı ziyaret edin."
+  subject_re: "Cvp:"
+  subject_pm: "[ÖM]"
+  user_notifications:
+    previous_discussion: "Önceki Cevaplar"
+    unsubscribe:
+      title: "Aboneliği İptal Et"
+      description: "Bu emaillarla ilgilenmiyor musunuz? Sorun değil! Aşağıya tıklayarak aboneliğinizi hemen iptal edebilirsiniz:"
+    reply_by_email: "Karşılık vermek için, bu emaili cevaplayın ya da %{base_url}%{url} sayfasını internet tarayıcınızda ziyaret edin."
+    visit_link_to_respond: "Karşılık vermek için, %{base_url}%{url} sayfasını internet tarayıcınızda ziyaret edin."
+    posted_by: "%{post_date} tarihinde %{username} tarafından gönderildi"
+    user_invited_to_private_message_pm:
+      subject_template: "[%{site_name}] %{username} sizi '%{topic_title}' başlıklı özel mesaja davet etti"
+      text_body_template: |
+        %{username} sizi %{site_name} sitesinde, '%{topic_title}' başlıklı bir özel mesaja davet etti:
+
+        Konuyu görüntülemek için lütfen bu bağlantıyı ziyaret edin: %{base_url}%{url}
+    user_replied:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{message}
+
+        %{context}
+
+        ---
+        %{respond_instructions}
+    user_quoted:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{message}
+
+
+        %{context}
+
+
+        ---
+
+        %{respond_instructions}
+    user_mentioned:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{message}
+
+
+        %{context}
+
+        ---
+
+        %{respond_instructions}
+    user_posted:
+      subject_template: "[%{site_name}] %{topic_title}"
+      text_body_template: |
+        %{message}
+
+
+        %{context}
+
+
+        ---
+
+        %{respond_instructions}
+    user_posted_pm:
+      subject_template: "[%{site_name}] [ÖM] %{topic_title}"
+      text_body_template: |
+        %{message}
+
+
+        %{context}
+
+
+        ---
+
+        %{respond_instructions}
+    digest:
+      why: "%{last_seen_at} tarihindeki son girişinizden beri %{site_link} sitesine olanların kısa bir özeti"
+      subject_template: "[%{site_name}] Özeti %{date}"
+      new_activity: "Konu ve gönderilerinizdeki yeni aktiviteler:"
+      top_topics: "Popüler gönderiler"
+      other_new_topics: "Popüler konular"
+      unsubscribe: "Bu özet %{site_link} sitesini bir süre ziyaret etmediğinizde gönderilir. Almak istemiyorsanız, ayrılmak için %{unsubscribe_link}."
+      click_here: "buraya tıkla"
+      from: "%{site_name} özeti"
+      read_more: "Devamını Oku"
+      more_topics: "%{new_topics_since_seen} tane daha yeni konu vardı."
+      more_topics_category: "Daha fazla yeni konu:"
+      posts:
+        other: "%{count} gönderi"
+    forgot_password:
+      subject_template: "[%{site_name}] Şifre sıfırlama"
+      text_body_template: |
+        [%{site_name}](%{base_url}) sitesinde, biri şifrenizin sıfırlanması için talepte bulundu.
+
+        Eğer talepte bulunan siz değilseniz, bu emaili görmezden gelebilirsiniz.
+
+        Yeni şifre oluşturmak için aşağıdaki bağlantıya tıklayın:
+        %{base_url}/users/password-reset/%{email_token}
+    set_password:
+      subject_template: "[%{site_name}] Şifre Oluşturun"
+      text_body_template: |
+        Biri, [%{site_name}](%{base_url}) sitesindeki hesabınıza şifre ekleme talebinde bulundu. Dilerseniz, bu doğrulanmış email hesabınızla eşleşen, desteklediğiniz herhangi bir online servisi (Google, Facebook, vs.) kullanarak da giriş yapabilirsiniz.
+
+        Eğer talepte bulunan siz değilseniz, bu emaili görmezden gelebilirsiniz.
+
+        Şifre oluşturmak için aşağıdaki bağlantıya tıklayın:
+        %{base_url}/users/password-reset/%{email_token}
+    account_created:
+      subject_template: "[%{site_name}] Yeni Hesabınız"
+      text_body_template: |
+        %{site_name} sitesinde sizin için yeni bir hesap oluşturuldu.
+
+        Yeni hesabınıza ait bir şifre oluşturmak için aşağıdaki bağlantıya tıklayın:
+        %{base_url}/users/password-reset/%{email_token}
+    authorize_email:
+      subject_template: "[%{site_name}] Yeni email adresinizi onaylayın"
+      text_body_template: |
+        Aşağıdaki bağlantıya tıklayarak %{site_name} sitesindeki yeni email adresinizi onaylayın:
+
+        %{base_url}/users/authorize-email/%{email_token}
+    signup_after_approval:
+      subject_template: "%{site_name} sitesinde hesabınız onaylandı!"
+      text_body_template: |
+        %{site_name} sitesine hoşgeldiniz!
+
+        %{site_name} sitesindeki hesabınız bir görevli tarafından onaylandı.
+
+        Aşağıdaki bağlantıya tıklayın ve yeni hesabınızı aktive edin:
+        %{base_url}/users/activate-account/%{email_token}
+
+        Eğer yukarıdaki bağlantı tıklanabilir değilse, bağlantıyı kopyalayıp tarayıcınızın adres çubuğuna yapıştırmayı deneyebilirsiniz.
+
+        %{new_user_tips}
+
+        Her zaman [sivil toplum davranışlarının](%{base_url}/guidelines) geçerliliğine inanıyoruz.
+
+        Keyfini çıkarın!
+    signup:
+      subject_template: "[%{site_name}] Yeni hesabınızı aktive edin"
+      text_body_template: |
+        %{site_name} sitesine hoşgeldiniz!
+
+        Hesabınızı onaylamak ve aktive etmek için aşağıdaki bağlantıya tıklayın:
+         %{base_url}/users/activate-account/%{email_token}
+
+        Eğer yukarıdaki bağlantı tıklanabilir değilse, bağlantıyı kopyalayıp tarayıcınızın adres çubuğuna yapıştırmayı deneyin.
+  page_not_found:
+    title: "Aradığınız sayfa bulunmuyor ya da gizli."
+    popular_topics: "Popüler"
+    recent_topics: "Yeni"
+    see_more: "Daha fazla"
+    search_title: "Bu sitede ara"
+    search_google: "Google"
+  login_required:
+    welcome_message: |
+      #[Hoşgeldiniz %{title}](#welcome)
+      Hesap oluşturmanız gerekiyor. Devam etmek için lütfen bir hesap oluşturun ya da giriş yapın.
+  terms_of_service:
+    title: "Üyelik Sözleşmesi"
+    signup_form_message: '<a href="/tos" target="_blank">Üyelik Sözleşmesini</a> okudum ve kabul ediyorum.'
+  deleted: 'silindi'
+  upload:
+    edit_reason: "resimlerin yerel kopyaları indirildi"
+    unauthorized: "Üzgünüz, yüklemeye çalıştığınız dosya izinli değil (authorized extensions: %{authorized_extensions})."
+    pasted_image_filename: "Yapıştırılan resim"
+    store_failure: "#%{user_id} kullanıcısı için yükleme #%{upload_id} kaydedilemedi."
+    attachments:
+      too_large: "Üzgünüz, yüklemeye çalıştığınız dosya çok büyük (en fazla %{max_size_kb}%kb olabilir)."
+    images:
+      too_large: "Üzgünüz, yüklemeye çalıştığınız resim çok büyük (en fazla %{max_size_kb}%kb olabilir), lütfen küçültüp tekrar deneyin."
+      fetch_failure: "Üzgünüz, resim çekilirken hata oluştu."
+      unknown_image_type: "Üzgünüz ama yüklemeye çalıştığınız dosya resim dosyası değil. "
+      size_not_found: "Üzgünüz, resminizin büyüklüğünü tespit edemedik. Dosya bozuk olabilir mi?"
+  flag_reason:
+    sockpuppet: "Yeni bir kullanıcı bir konu oluşturdu ve aynı IP adresinden başka bir yeni kullanıcı cevap yazdı. Site ayarları sayfasında flag_sockpuppets değerine göz atın."
+    spam_hosts: "Bu yeni kullanıcı aynı alan adına bağlantı içeren birden fazla gönderi oluşturmaya çalıştı. Site ayarları sayfasındaki newuser_spam_host_threshold değerine göz atın."
+  email_log:
+    no_user: "%{user_id} id'sine sahip bir kullanıcı bulunamadı"
+    suspended_not_pm: "Kullanıcı uzaklaştırıldı, özel mesaj değil"
+    seen_recently: "Kullanıcı kısa süre önce görüldü"
+    post_not_found: "%{post_id} id'sine sahip bir gönderi bulunamadı"
+    notification_already_read: "Bu emailin içerdiği bildiri önceden okundu"
+    topic_nil: "post.topic boş"
+    post_deleted: "gönderi sahibi tarafından silindi"
+    user_suspended: "kullanıcı uzaklaştırıldı"
+    already_read: "kullanıcı bu gönderiyi önceden okumuş"
+    message_blank: "mesaj boş"
+    message_to_blank: "message.to boş"
+    text_part_body_blank: "text_part.body boş"
+    body_blank: "içerik boş"
+  color_schemes:
+    base_theme_name: "Baz"
+  guidelines: "Yönetmelik"
+  privacy: "Gizlilik"
+  edit_this_page: "Bu sayfayı düzenle"
+  static_topic_first_reply: |2
+     %{page_name} sayfasının içeriğini değiştirmek için bu konuya ait ilk gönderiyi düzenleyin.
+  guidelines_topic:
+    title: "SSS/Kılavuz"
+  tos_topic:
+    title: "Üyelik Sözleşmesi"
+  privacy_topic:
+    title: "Gizlilik Sözleşmesi"
diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml
index 237fae728d..01da5f52b3 100644
--- a/config/locales/server.zh_CN.yml
+++ b/config/locales/server.zh_CN.yml
@@ -33,7 +33,7 @@ zh_CN:
   log_in: "登陆"
   via: "%{username} 自 %{site_name}"
   is_reserved: "保留权利"
-  purge_reason: "自动删除长期未使用或者未验证"
+  purge_reason: "自动删除被遗弃、未激活账户"
   disable_remote_images_download_reason: "磁盘空间不足，远程图像下载已经被禁用。"
   errors:
     messages:
@@ -570,9 +570,6 @@ zh_CN:
     title: "本站点的简短标题，用于 HTML 标题标签（title）"
     site_description: "用一句话描述这个论坛，用于 meta 描述标签。"
     contact_email: "本站关键联系人的电子邮件地址。Discourse.org 可能把重要更新的通知消息发送到该邮箱。"
-    company_full_name: "废弃。不再使用并且将被移除。运行本站点的公司全称，用于法律文档，例如服务条款 /tos 和 /privacy"
-    company_short_name: "废弃。不再使用并且将被移除。运行本站点的公司短名，用于法律文档，例如服务条款 /tos 和 /privacy"
-    company_domain: "废弃。不再使用并且将被移除。运行本站点的公司域名，用于法律文档，例如服务条款 /tos 和 /privacy"
     queue_jobs: "仅限开发者设定！警告！默认使用 sidekiq 完成队列工作。如果禁用，您的站点将无法使用。"
     crawl_images: "允许从第三方 URL 获取图片来插入宽、高数值"
     download_remote_images_to_local: "下载一份主题中链接的外部图片到本地；以防图片损坏。"
@@ -673,6 +670,7 @@ zh_CN:
     min_password_length: "最小密码长度。"
     block_common_passwords: "不允许使用 10,000 个最常用的密码。"
     enable_sso: "启用外部站点单点登录（注意：禁用邀请功能）"
+    enable_sso_provider: "在 /session/sso_provider endpoint 实现 Discourse SSO 协议，要求设置 sso_secret"
     sso_url: "单点登录 URL 入口点"
     sso_secret: "秘密字符串，用于加密/解密 SSO 信息，请保证有 10 个字符或者更长"
     sso_overrides_email: "用 SSO 信息中的外部邮件地址覆盖本地邮件地址（警告：因为对本地邮件的统一处理，这个邮件地址可能不同）"
@@ -719,7 +717,7 @@ zh_CN:
     clean_up_uploads: "移除孤立的已上传资料。警告：您可能想要在启用这个设定前备份一下 /uploads 目录。"
     clean_orphan_uploads_grace_period_hours: "删除孤立上传资料的宽限期（单位：小时）"
     purge_deleted_uploads_grace_period_days: "移除已删除的孤立上传资料的宽限期（单位：小时）"
-    purge_inactive_users_grace_period_days: "删除不活跃用户账户的宽限期（单位：天）。"
+    purge_unactivated_users_grace_period_days: "删除未激活用户账户的宽限期（单位：天）。"
     enable_s3_uploads: "上传至 Amazon S3 存储的地址。重要：需要有效的 S3 验证资料（包括 access key id & secret access key）。"
     s3_use_iam_profile: '使用 AWS EC2 IAM 角色来获得 key。注意：启用这个会覆盖“S3 access key id”和“S3 secret access key” 设置。'
     s3_upload_bucket: "上传文件保存于 Amazon S3 的 bucket 名字。警告：必须为小写，无句点，无下划线。"
@@ -794,6 +792,11 @@ zh_CN:
     staff_like_weight: "职员赞时的额外权重。"
     levenshtein_distance_spammer_emails: "当匹配广告邮件时，模糊匹配判断差异的字符数。"
     max_new_accounts_per_registration_ip: "如果已经有了从这个 IP 创建的(n)个信任等级0的账户（并且没有一个是职员或者是信任等级2以上的用户），不再允许来自该 IP 地址的注册请求。"
+    min_ban_entries_for_roll_up: "当点击折叠按钮时，且至少 (N) 条记录时，将会创建一个子网封禁记录"
+    max_age_unmatched_emails: "在 (N) 天后删除不匹配的邮件地址。"
+    max_age_unmatched_ips: "在 (N) 天后删除不匹配的 IP 记录。"
+    num_flaggers_to_close_topic: "要自动终止一个主题的讨论并介入时所需的最小数量的独立标记者"
+    num_flags_to_close_topic: "要自动终止一个主题的讨论并介入时所需的最小数量的有效标记"
     reply_by_email_enabled: "启用通过邮件回复。"
     reply_by_email_address: "通过邮件回复的回复地址模板，例如：%{reply_key}@reply.example.com 或 replies+%{reply_key}@example.com"
     disable_emails: "禁止 Discourse 发送任何邮件"
@@ -889,6 +892,11 @@ zh_CN:
       category: '分类'
       topic: '结果'
       user: '用户'
+  sso:
+    not_found: "无法找到或创建账户，联系站点管理员"
+    account_not_approved: "账户正在等待验证，完成后您将收到一封邮件提醒"
+    unknown_error: "更新信息时错误，联系站点管理员"
+    timeout_expired: "账户登录超时，请重试登录"
   original_poster: "原始作者"
   most_posts: "大部分帖子"
   most_recent_poster: "当前大部分帖子作者"
@@ -1098,6 +1106,7 @@ zh_CN:
     disagreed: "感谢通知我们。我们正在了解情况。"
     deferred: "感谢通知我们。我们正在调查情况。"
     deferred_and_deleted: "感谢通知我们。我们已经删除了帖子。"
+  temporarily_closed_due_to_flags: "帖子因为多次社群标记暂时关闭"
   system_messages:
     post_hidden:
       subject_template: "%{site_name} 提示：由于论坛用户标记，系统隐藏了您的帖子"
@@ -1758,9 +1767,9 @@ zh_CN:
       <h2>小技巧</h2>
       <p>
       <ul>
-        <li>标题匹配优先，所以有疑问时，搜索标题</li>
+        <li>匹配有优先级。所以有疑问时，搜索标题</li>
         <li>独一无二的、不常见的单词将总是产生最好的结果</li>
-        <li>无论何时，限制您的搜索范围至一个特定的分类、用户或主题</li>
+        <li>只要有可能，限制您的搜索范围至一个特定的分类、用户或主题</li>
       </ul>
       </p>
       <h2>选项</h2>
@@ -1769,9 +1778,9 @@ zh_CN:
         <tr><td><code>order:views</code></td><td><code>order:latest</code></td><td colspan=3></td></tr>
         <tr><td><code>status:open</code></td><td><code>status:closed</code></td><td><code>status:archived</code></td><td><code>status:noreplies</code></td><td><code>status:singleuser</code></td></tr>
         <tr><td><code>category:foo</code></td><td><code>user:foo</code></td><td colspan=3></td></tr>
-        <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td></td></tr>
+        <tr><td><code>in:likes</code></td><td><code>in:posted</code></td><td><code>in:watching</code></td><td><code>in:tracking</code></td><td><code>in:private</code></td></tr>
         </table>
       </p>
       <p>
-        <code>彩虹 category:公园 status:open order:latest</code>将搜索在“公园”分类中没有关闭或存档中的包含“彩虹”的主题，并按最后一个帖子的日期来排序。
+        <code>彩虹 category:公园 status:open order:latest</code> 将搜索在“公园”分类中没有关闭或存档中的包含“彩虹”的主题，并按最后一个帖子的日期来排序。
       </p>
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index 39a02ef632..f13a987a12 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -59,6 +59,11 @@ server {
   # use dates, it solves the problem fine even cross server
   etag off;
 
+  # prevent direct download of backups
+  location ^~ /backups/ {
+    internal;
+  }
+
   location / {
     root $public;
     add_header ETag "";
@@ -74,9 +79,15 @@ server {
       # asset pipeline enables this
       gzip_static on;
       add_header Cache-Control public;
+      # TODO I don't think this break is needed, it just breaks out of rewrite
       break;
     }
 
+    location ~ ^/plugins/ {
+      expires 1y;
+      add_header Cache-Control public;
+    }
+
     location ~ ^/uploads/ {
 
       # NOTE: it is really annoying that we can't just define headers
diff --git a/config/routes.rb b/config/routes.rb
index f694e87d90..7846e50830 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -164,8 +164,7 @@ Discourse::Application.routes.draw do
 
     resources :export_csv, constraints: AdminConstraint.new do
       collection do
-        get "users" => "export_csv#export_user_list"
-        get "screened_ips" => "export_csv#export_screened_ips_list"
+        get "export_entity" => "export_csv#export_entity"
       end
       member do
         get "" => "export_csv#show", constraints: { id: /[^\/]+/ }
@@ -181,6 +180,7 @@ Discourse::Application.routes.draw do
     end
 
     get "memory_stats"=> "diagnostics#memory_stats", constraints: AdminConstraint.new
+    get "dump_heap"=> "diagnostics#dump_heap", constraints: AdminConstraint.new
 
   end # admin namespace
 
@@ -243,15 +243,12 @@ Discourse::Application.routes.draw do
   put "users/:username/preferences/badge_title" => "users#badge_title", constraints: {username: USERNAME_ROUTE_FORMAT}
   get "users/:username/preferences/username" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}
   put "users/:username/preferences/username" => "users#username", constraints: {username: USERNAME_ROUTE_FORMAT}
-  get "users/:username/avatar(/:size)" => "users#avatar", constraints: {username: USERNAME_ROUTE_FORMAT} # LEGACY ROUTE
-  post "users/:username/preferences/avatar" => "users#upload_avatar", constraints: {username: USERNAME_ROUTE_FORMAT} # LEGACY ROUTE
   post "users/:username/preferences/user_image" => "users#upload_user_image", constraints: {username: USERNAME_ROUTE_FORMAT}
   delete "users/:username/preferences/user_image" => "users#destroy_user_image", constraints: {username: USERNAME_ROUTE_FORMAT}
   put "users/:username/preferences/avatar/pick" => "users#pick_avatar", constraints: {username: USERNAME_ROUTE_FORMAT}
   get "users/:username/preferences/card-badge" => "users#card_badge", constraints: {username: USERNAME_ROUTE_FORMAT}
   put "users/:username/preferences/card-badge" => "users#update_card_badge", constraints: {username: USERNAME_ROUTE_FORMAT}
 
-
   get "users/:username/invited" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT}
   post "users/action/send_activation_email" => "users#send_activation_email"
   get "users/:username/activity" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 7bde8b1e45..90b031808c 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -285,6 +285,10 @@ users:
     default: false
   email_token_valid_hours: 24
   email_token_grace_period_hours: 0
+  purge_unactivated_users_grace_period_days: 7
+  public_user_custom_fields:
+    type: list
+    default: ''
 
 posting:
   min_post_length:
@@ -391,7 +395,9 @@ posting:
     type: list
 
 email:
-  email_time_window_mins: 10
+  email_time_window_mins:
+    default: 10
+    client: true
   email_posts_context: 5
   digest_min_excerpt_length: 100
   digest_topics: 20
@@ -581,6 +587,8 @@ spam:
   min_ban_entries_for_roll_up: 5
   max_age_unmatched_emails: 365
   max_age_unmatched_ips: 365
+  num_flaggers_to_close_topic: 5
+  num_flags_to_close_topic: 12
 
 rate_limits:
   unique_posts_mins:
@@ -645,9 +653,11 @@ developer:
     default: false
     client: true
   posts_chunksize:
-    client: true
     default: 20
     min: 1
+  posts_slow_chunksize:
+    default: 10
+    min: 1
 
 embedding:
   embeddable_host: ''
@@ -790,10 +800,6 @@ uncategorized:
 
   notify_about_flags_after: 48
 
-  public_user_custom_fields:
-    type: list
-    default: ''
-
   enable_cdn_js_debugging: false
 
   show_create_topics_notice:
@@ -805,11 +811,6 @@ uncategorized:
     default: true
 
   disable_edit_notifications: false
-  purge_inactive_users_grace_period_days: 7
-
-  company_full_name: 'My Unconfigured Forum Ltd.'
-  company_short_name: 'Unconfigured Forum'
-  company_domain: 'www.example.com'
 
   vacuum_db_days: 90
   last_vacuum:
diff --git a/db/fixtures/999_topics.rb b/db/fixtures/999_topics.rb
index cf46ccc6e1..1ab472c300 100644
--- a/db/fixtures/999_topics.rb
+++ b/db/fixtures/999_topics.rb
@@ -27,9 +27,9 @@ unless Rails.env.test?
   end
 
   create_static_page_topic('tos_topic_id', 'tos_topic.title', "tos_topic.body", nil, staff, "terms of service", {
-    company_domain: SiteSetting.company_domain,
-    company_full_name: SiteSetting.company_full_name,
-    company_name: SiteSetting.company_short_name
+    company_domain: "company_domain",
+    company_full_name: "company_full_name",
+    company_name: "company_short_name"
   })
 
   create_static_page_topic('guidelines_topic_id', 'guidelines_topic.title', "guidelines_topic.body",
diff --git a/db/migrate/20141211114517_fix_emoji_path.rb b/db/migrate/20141211114517_fix_emoji_path.rb
new file mode 100644
index 0000000000..03c5cd9bdd
--- /dev/null
+++ b/db/migrate/20141211114517_fix_emoji_path.rb
@@ -0,0 +1,19 @@
+class FixEmojiPath < ActiveRecord::Migration
+  BASE_URL = '/plugins/emoji/images/'
+
+  def up
+    execute <<-SQL
+      UPDATE posts
+         SET cooked = REPLACE(cooked, '#{BASE_URL}', '#{BASE_URL}emoji_one/')
+       WHERE cooked LIKE '%#{BASE_URL}%'
+    SQL
+  end
+
+  def down
+    execute <<-SQL
+      UPDATE posts
+         SET cooked = REPLACE(cooked, '#{BASE_URL}emoji_one/', '#{BASE_URL}')
+       WHERE cooked LIKE '%#{BASE_URL}emoji_one/%'
+    SQL
+  end
+end
diff --git a/docs/ADMIN-QUICK-START-GUIDE.md b/docs/ADMIN-QUICK-START-GUIDE.md
index b07a46c1d6..05a97baae6 100644
--- a/docs/ADMIN-QUICK-START-GUIDE.md
+++ b/docs/ADMIN-QUICK-START-GUIDE.md
@@ -230,7 +230,8 @@ The invite area on your profile page also includes advanced Staff methods of [se
    - [Import and Export your data](https://meta.discourse.org/t/move-your-discourse-instance-to-a-different-server/15721)
    - [Change the domain name](https://meta.discourse.org/t/how-do-i-change-the-domain-name/16098)
    - [Multiple Discourse instances on the same server](https://meta.discourse.org/t/multisite-configuration-with-docker/14084)
-   - [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc?](https://github.com/discourse/discourse/tree/master/script/import_scripts)?
+   - [Import old content from vBulletin, PHPbb, Vanilla, Drupal, BBPress, etc](https://github.com/discourse/discourse/tree/master/script/import_scripts)
+   - Embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](http://eviltrout.com/2014/01/22/embedding-discourse.html)?
 
 ### Need more Help?
 
diff --git a/docs/INSTALL-digital-ocean.md b/docs/INSTALL-digital-ocean.md
index be7e008c83..2f298694d7 100644
--- a/docs/INSTALL-digital-ocean.md
+++ b/docs/INSTALL-digital-ocean.md
@@ -161,6 +161,8 @@ Do you want...
 
 - A firewall on your server? [Configure firewall](https://meta.discourse.org/t/configure-a-firewall-for-discourse/20584)
 
+- To embed Discourse [in your WordPress install](https://github.com/discourse/wp-discourse), or [on your static HTML site](http://eviltrout.com/2014/01/22/embedding-discourse.html)?
+
 If anything needs to be improved in this guide, feel free to ask on [meta.discourse.org][meta], or even better, submit a pull request.
 
    [dd]: https://github.com/discourse/discourse_docker
diff --git a/lib/admin_user_index_query.rb b/lib/admin_user_index_query.rb
index f8ac8a8ca8..052e8f0602 100644
--- a/lib/admin_user_index_query.rb
+++ b/lib/admin_user_index_query.rb
@@ -43,12 +43,13 @@ class AdminUserIndexQuery
     where_conds = []
 
     # One signal: no reading yet the user has bio text
-    where_conds << "user_stats.posts_read_count = 0 AND user_stats.topics_entered = 0"
+    where_conds << "user_stats.posts_read_count <= 1 AND user_stats.topics_entered <= 1"
 
     @query.activated
           .references(:user_stats)
           .includes(:user_profile)
           .where("COALESCE(user_profiles.bio_raw, '') != ''")
+          .where('users.created_at <= ?', 1.day.ago)
           .where(where_conds.map {|c| "(#{c})"}.join(" OR "))
   end
 
diff --git a/lib/auth/facebook_authenticator.rb b/lib/auth/facebook_authenticator.rb
index 3b5ddf5036..b4c48ae674 100644
--- a/lib/auth/facebook_authenticator.rb
+++ b/lib/auth/facebook_authenticator.rb
@@ -12,7 +12,7 @@ class Auth::FacebookAuthenticator < Auth::Authenticator
     facebook_hash = session_info[:facebook]
 
     result.email = email = session_info[:email]
-    result.email_valid = true
+    result.email_valid = !email.blank?
     result.name = facebook_hash[:name]
 
     result.extra_data = facebook_hash
diff --git a/lib/discourse_plugin_registry.rb b/lib/discourse_plugin_registry.rb
index d85eba6a52..af605b2770 100644
--- a/lib/discourse_plugin_registry.rb
+++ b/lib/discourse_plugin_registry.rb
@@ -4,23 +4,27 @@
 class DiscoursePluginRegistry
 
   class << self
-    attr_accessor :javascripts
-    attr_accessor :server_side_javascripts
-    attr_accessor :admin_javascripts
-    attr_accessor :stylesheets
-    attr_accessor :mobile_stylesheets
-    attr_accessor :desktop_stylesheets
-    attr_accessor :sass_variables
-    attr_accessor :handlebars
-    attr_accessor :custom_html
-    attr_accessor :serialized_current_user_fields
+    attr_writer :javascripts
+    attr_writer :server_side_javascripts
+    attr_writer :admin_javascripts
+    attr_writer :stylesheets
+    attr_writer :mobile_stylesheets
+    attr_writer :desktop_stylesheets
+    attr_writer :sass_variables
+    attr_writer :handlebars
+    attr_writer :serialized_current_user_fields
 
+    attr_accessor :custom_html
 
     # Default accessor values
     def javascripts
       @javascripts ||= Set.new
     end
 
+    def asset_globs
+      @asset_globs ||= Set.new
+    end
+
     def admin_javascripts
       @admin_javascripts ||= Set.new
     end
@@ -68,6 +72,38 @@ class DiscoursePluginRegistry
     Archetype.register(name, options)
   end
 
+  def self.register_glob(root, extension)
+    self.asset_globs << [root, extension]
+  end
+
+  def self.register_asset(asset, opts=nil)
+    if asset =~ /\.js$|\.js\.erb$|\.js\.es6$/
+      if opts == :admin
+        self.admin_javascripts << asset
+      else
+        if opts == :server_side
+          self.server_side_javascripts << asset
+        end
+        self.javascripts << asset
+      end
+    elsif asset =~ /\.css$|\.scss$/
+      if opts == :mobile
+        self.mobile_stylesheets << asset
+      elsif opts == :desktop
+        self.desktop_stylesheets << asset
+      elsif opts == :variables
+        self.sass_variables << asset
+      else
+        self.stylesheets << asset
+      end
+
+    elsif asset =~ /\.hbs$/
+      self.handlebars << asset
+    elsif asset =~ /\.js\.handlebars$/
+      self.handlebars << asset
+    end
+  end
+
   def javascripts
     self.class.javascripts
   end
@@ -106,6 +142,18 @@ class DiscoursePluginRegistry
     self.handlebars = nil
   end
 
+  def self.reset!
+    javascripts.clear
+    admin_javascripts.clear
+    server_side_javascripts.clear
+    stylesheets.clear
+    mobile_stylesheets.clear
+    desktop_stylesheets.clear
+    sass_variables.clear
+    serialized_current_user_fields
+    asset_globs.clear
+  end
+
   def self.setup(plugin_class)
     registry = DiscoursePluginRegistry.new
     plugin = plugin_class.new(registry)
diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb
index 5d2dfcfa11..8c9e7bec89 100644
--- a/lib/email/receiver.rb
+++ b/lib/email/receiver.rb
@@ -41,6 +41,7 @@ module Email
       end
 
       raise BadDestinationAddress if dest_info[:type] == :invalid
+      raise TopicNotFoundError if message.header.to_s =~ /auto-generated/ || message.header.to_s =~ /auto-replied/
 
       # TODO get to a state where we can remove this
       @message = message
@@ -117,9 +118,9 @@ module Email
       if message.multipart?
         html = fix_charset message.html_part
         text = fix_charset message.text_part
-        # TODO picking text if available may be better
-        # in case of email reply from MS Outlook client, prefer text
-        if (text && !html) || (text && (message.header.to_s =~ /X-MS-Has-Attach/ || message.header.to_s =~ /Microsoft Outlook/))
+
+        # prefer plain text
+        if text
           return text
         end
       elsif message.content_type =~ /text\/html/
diff --git a/lib/email/styles.rb b/lib/email/styles.rb
index b3cbeac05a..1d421dd529 100644
--- a/lib/email/styles.rb
+++ b/lib/email/styles.rb
@@ -136,7 +136,7 @@ module Email
       style('pre', 'word-wrap: break-word; max-width: 694px;')
       style('code', 'background-color: #f1f1ff; padding: 2px 5px;')
       style('pre code', 'display: block; background-color: #f1f1ff; padding: 5px;')
-      style('.featured-topic a', 'text-decoration: none; font-weight: bold; color: #006699; margin-right: 5px')
+      style('.featured-topic a', 'text-decoration: none; font-weight: bold; color: #006699; line-height:1.5em;')
 
       onebox_styles
       plugin_styles
diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb
index 511daa7d87..4d4a107b99 100644
--- a/lib/excerpt_parser.rb
+++ b/lib/excerpt_parser.rb
@@ -17,16 +17,15 @@ class ExcerptParser < Nokogiri::XML::SAX::Document
 
   def self.get_excerpt(html, length, options)
     html ||= ''
-    if (html.include? 'excerpt') && (SPAN_REGEX === html)
-      length = html.length
-    end
+    length = html.length if html.include?('excerpt') && SPAN_REGEX === html
     me = self.new(length, options)
     parser = Nokogiri::HTML::SAX::Parser.new(me)
     catch(:done) do
       parser.parse(html)
     end
-    me.excerpt.strip!
-    me.excerpt
+    excerpt = me.excerpt.strip
+    excerpt = CGI.unescapeHTML(excerpt) if options[:text_entities] == true
+    excerpt
   end
 
   def escape_attribute(v)
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index e040350ceb..2211015300 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -13,6 +13,7 @@ module JsLocaleHelper
     Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file|
       plugin_translations.deep_merge! YAML::load(File.open(file))
     end
+
     # merge translations (plugin translations overwrite default translations)
     translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['js']
 
@@ -22,7 +23,7 @@ module JsLocaleHelper
     # For now, let's leave it split out in the translation file in case we want to split
     # it again later, so we'll merge the JSON ourselves.
     admin_contents = translations[locale_str].delete('admin_js')
-    translations[locale_str]['js'].merge!(admin_contents) if admin_contents.present?
+    translations[locale_str]['js'].deep_merge!(admin_contents) if admin_contents.present?
     translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['admin_js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['admin_js']
     message_formats = strip_out_message_formats!(translations[locale_str]['js'])
 
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index a3e008d734..66e9ccb37d 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -25,15 +25,12 @@ class Plugin::Instance
     @assets = []
     @color_schemes = []
 
-    # Automatically include all ES6 JS files
     if @path
-      dir = File.dirname(@path)
-      Dir.glob("#{dir}/assets/javascripts/**/*.js.es6") do |f|
-        relative = f.sub("#{dir}/assets/", "")
-        register_asset(relative)
-      end
+      # Automatically include all ES6 JS and hbs files
+      root_path = "#{File.dirname(@path)}/assets/javascripts"
+      DiscoursePluginRegistry.register_glob(root_path, 'js.es6')
+      DiscoursePluginRegistry.register_glob(root_path, 'hbs')
     end
-
   end
 
   def name
@@ -98,6 +95,11 @@ class Plugin::Instance
     end
   end
 
+  def listen_for(event_name)
+    return unless self.respond_to?(event_name)
+    DiscourseEvent.on(event_name, &self.method(event_name))
+  end
+
   def register_css(style)
     @styles ||= []
     @styles << style
@@ -179,7 +181,6 @@ class Plugin::Instance
       Rails.configuration.assets.paths << File.dirname(path) + "/assets"
     end
 
-
     public_data = File.dirname(path) + "/public"
     if Dir.exists?(public_data)
       target = Rails.root.to_s + "/public/plugins/"
@@ -236,31 +237,7 @@ class Plugin::Instance
 
   def register_assets!
     assets.each do |asset, opts|
-      if asset =~ /\.js$|\.js\.erb$|\.js\.es6$/
-        if opts == :admin
-          DiscoursePluginRegistry.admin_javascripts << asset
-        else
-          if opts == :server_side
-            DiscoursePluginRegistry.server_side_javascripts << asset
-          end
-          DiscoursePluginRegistry.javascripts << asset
-        end
-      elsif asset =~ /\.css$|\.scss$/
-        if opts == :mobile
-          DiscoursePluginRegistry.mobile_stylesheets << asset
-        elsif opts == :desktop
-          DiscoursePluginRegistry.desktop_stylesheets << asset
-        elsif opts == :variables
-          DiscoursePluginRegistry.sass_variables << asset
-        else
-          DiscoursePluginRegistry.stylesheets << asset
-        end
-
-      elsif asset =~ /\.hbs$/
-        DiscoursePluginRegistry.handlebars << asset
-      elsif asset =~ /\.js\.handlebars$/
-        DiscoursePluginRegistry.handlebars << asset
-      end
+      DiscoursePluginRegistry.register_asset(asset, opts)
     end
   end
 
diff --git a/lib/sass/discourse_stylesheets.rb b/lib/sass/discourse_stylesheets.rb
index 028def076e..ca0c5a9d63 100644
--- a/lib/sass/discourse_stylesheets.rb
+++ b/lib/sass/discourse_stylesheets.rb
@@ -56,10 +56,17 @@ class DiscourseStylesheets
   end
 
   def self.max_file_mtime
-    [ "#{Rails.root}/app/assets/stylesheets/**/*.*css",
-      "#{Rails.root}/plugins/**/*.*css",
-      "#{Rails.root}/plugins/**/plugin.rb" ].map do |pattern|
-        Dir.glob(pattern).map { |x| File.mtime(x) }.max
+    globs = ["#{Rails.root}/app/assets/stylesheets/**/*.*css"]
+
+    for path in (Discourse.plugins || []).map { |plugin| File.dirname(plugin.path) }
+      globs += [
+        "#{path}/plugin.rb",
+        "#{path}/**/*.*css",
+      ]
+    end
+
+    globs.map do |pattern|
+      Dir.glob(pattern).map { |x| File.mtime(x) }.max
     end.compact.max.to_i
   end
 
diff --git a/lib/search.rb b/lib/search.rb
index 2330ddc694..31b0f270f5 100644
--- a/lib/search.rb
+++ b/lib/search.rb
@@ -17,7 +17,7 @@ class Search
   end
 
   def self.facets
-    %w(topic category user)
+    %w(topic category user private_messages)
   end
 
   def self.long_locale
@@ -106,6 +106,12 @@ class Search
     @search_context = @opts[:search_context]
     @include_blurbs = @opts[:include_blurbs] || false
     @limit = Search.per_facet
+
+    if @search_pms && @guardian.user
+      @opts[:type_filter] = "private_messages"
+      @search_context = @guardian.user
+    end
+
     if @opts[:type_filter].present?
       @limit = Search.per_filter
     end
@@ -183,6 +189,9 @@ class Search
         elsif word == 'in:tracking'
           @notification_level = TopicUser.notification_levels[:tracking]
           nil
+        elsif word == 'in:private'
+          @search_pms = true
+          nil
         else
           word
         end
@@ -277,10 +286,20 @@ class Search
     def posts_query(limit, opts=nil)
       opts ||= {}
       posts = Post
-                  .joins(:post_search_data, {:topic => :category})
+                  .joins(:post_search_data, :topic)
+                  .joins("LEFT JOIN categories ON categories.id = topics.category_id")
                   .where("topics.deleted_at" => nil)
                   .where("topics.visible")
-                  .where("topics.archetype <> ?", Archetype.private_message)
+
+      if opts[:private_messages]
+         posts = posts.where("topics.archetype =  ?", Archetype.private_message)
+
+         unless @guardian.is_admin?
+            posts = posts.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = ?)", @guardian.user.id)
+         end
+      else
+         posts = posts.where("topics.archetype <> ?", Archetype.private_message)
+      end
 
       if @search_context.present? && @search_context.is_a?(Topic)
         posts = posts.joins('JOIN users u ON u.id = posts.user_id')
@@ -336,7 +355,13 @@ class Search
       if @search_context.present?
 
         if @search_context.is_a?(User)
-          posts = posts.where("posts.user_id = #{@search_context.id}")
+
+          if opts[:private_messages]
+            posts = posts.where("topics.id IN (SELECT topic_id FROM topic_allowed_users WHERE user_id = ?)", @search_context.id)
+          else
+            posts = posts.where("posts.user_id = #{@search_context.id}")
+          end
+
         elsif @search_context.is_a?(Category)
           posts = posts.where("topics.category_id = #{@search_context.id}")
         elsif @search_context.is_a?(Topic)
@@ -407,9 +432,10 @@ class Search
       end
     end
 
-    def aggregate_search
+    def aggregate_search(opts = {})
 
-      post_sql = posts_query(@limit, aggregate_search: true)
+      post_sql = posts_query(@limit, aggregate_search: true,
+                                     private_messages: opts[:private_messages])
         .select('topics.id', 'min(post_number) post_number')
         .group('topics.id')
         .to_sql
@@ -417,6 +443,10 @@ class Search
       # double wrapping so we get correct row numbers
       post_sql = "SELECT *, row_number() over() row_number FROM (#{post_sql}) xxx"
 
+      # p Topic.exec_sql(post_sql).to_a
+      # puts post_sql
+      # p Topic.exec_sql("SELECT topic_id FROM topic_allowed_users WHERE user_id = 2").to_a
+
       posts = Post.includes(:topic => :category)
                   .joins("JOIN (#{post_sql}) x ON x.id = posts.topic_id AND x.post_number = posts.post_number")
                   .order('row_number')
@@ -426,6 +456,12 @@ class Search
       end
     end
 
+    def private_messages_search
+      raise Discourse::InvalidAccess.new("anonymous can not search PMs") unless @guardian.user
+
+      aggregate_search(private_messages: true)
+    end
+
     def topic_search
       if @search_context.is_a?(Topic)
         posts = posts_query(@limit).where('posts.topic_id = ?', @search_context.id).includes(:topic => :category)
diff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rb
index ec8b7c16df..7f7466b62b 100644
--- a/lib/site_setting_extension.rb
+++ b/lib/site_setting_extension.rb
@@ -177,7 +177,6 @@ module SiteSettingExtension
     end
   end
 
-
   def ensure_listen_for_changes
     unless @subscribed
       MessageBus.subscribe("/site_settings") do |message|
@@ -273,7 +272,7 @@ module SiteSettingExtension
       }
       value = domain_array.join("|")
     end
-    return value
+    value
   end
 
   def set(name, value)
@@ -356,7 +355,6 @@ module SiteSettingExtension
 
 
   def setup_methods(name, current_value)
-
     clean_name = name.to_s.sub("?", "")
 
     eval "define_singleton_method :#{clean_name} do
@@ -388,8 +386,7 @@ module SiteSettingExtension
       url = "http://#{url}" if URI.parse(url).scheme.nil?
       url = URI.parse(url).host
     end
-    return url
+    url
   end
 
 end
-
diff --git a/lib/suggested_topics_builder.rb b/lib/suggested_topics_builder.rb
index 3051fdf34b..73158495f8 100644
--- a/lib/suggested_topics_builder.rb
+++ b/lib/suggested_topics_builder.rb
@@ -70,14 +70,6 @@ class SuggestedTopicsBuilder
     SiteSetting.suggested_topics - @results.count{|r| r.category_id == @category_id}
   end
 
-  def category_full?
-    if @category_id
-
-    else
-      full?
-    end
-  end
-
   def size
     @results.size
   end
diff --git a/lib/summarize.rb b/lib/summarize.rb
deleted file mode 100644
index d6e23595f4..0000000000
--- a/lib/summarize.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# Summarize a HTML field into regular text. Used currently
-# for meta tags
-
-require 'sanitize'
-
-class Summarize
-
-  def initialize(text)
-    @text = text
-  end
-
-  def self.max_length
-    500
-  end
-
-  def summary
-    return nil if @text.blank?
-
-    result = Sanitize.clean(@text)
-    result.gsub!(/\n/, ' ')
-    result.strip!
-
-    return result if result.length <= Summarize.max_length
-    "#{result[0..Summarize.max_length]}..."
-  end
-
-end
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 1c0ac999bc..968ed95fdd 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -11,6 +11,12 @@ task 'assets:precompile:before' do
   puts "Purging temp files"
   `rm -fr #{Rails.root}/tmp/cache`
 
+  if Rails.configuration.assets.js_compressor == :uglifier
+    ENV["UGLIFY"] = "1"
+  end
+
+  puts "Bundling assets"
+
   # in the past we applied a patch that removed asset postfixes, but it is terrible practice
   # leaving very complicated build issues
   # https://github.com/rails/sprockets-rails/issues/49
@@ -19,46 +25,44 @@ task 'assets:precompile:before' do
   require 'sprockets'
   require 'digest/sha1'
 
-  module ::Sprockets
 
-    def self.redis
-      @redis ||=
-        (
-          redis_url = GlobalSetting.asset_redis_url
-          if redis_url.present?
-            uri = URI.parse(redis_url)
-            options = {}
-            options[:password] = uri.password if uri.password.present?
-            options[:host] = uri.host
-            options[:port] = uri.port || 6379
-            Redis.new(options)
-          else
-            DiscourseRedis.raw_connection
-          end
-        )
-    end
+  # monkey patch asset pipeline not to gzip, compress: false is broken
+  class ::Sprockets::Asset
+    # Save asset to disk.
+    def write_to(filename, options = {})
+      # Gzip contents if filename has '.gz'
+      return if File.extname(filename) == '.gz'
 
-    def self.cache_compiled(type, data)
-      # add cache breaker here if uglifier options change
-      digest = Digest::SHA1.hexdigest(data) << "v1"
-      key = "SPROCKETS_#{type}_#{digest}"
-      if compiled = redis.get(key)
-        redis.expire(key, 1.week)
-      else
-        compiled = yield
-        redis.setex(key, 1.week, compiled)
+      begin
+        FileUtils.mkdir_p File.dirname(filename)
+
+        File.open("#{filename}+", 'wb') do |f|
+          f.write to_s
+        end
+
+        # Atomic write
+        FileUtils.mv("#{filename}+", filename)
+
+        # Set mtime correctly
+        File.utime(mtime, mtime, filename)
+
+        nil
+      ensure
+        # Ensure tmp file gets cleaned up
+        FileUtils.rm("#{filename}+") if File.exist?("#{filename}+")
       end
-      compiled
     end
 
+
+  end
+
+  module ::Sprockets
+
     class UglifierCompressor
 
       def evaluate(context, locals, &block)
-        ::Sprockets.cache_compiled("uglifier", data) do
-           Uglifier.new(:comments => :none,
-                        :screw_ie8 => false,
-                        :output => {max_line_len: 1024}).compile(data)
-        end
+        # monkey patch cause we do this later, no idea how to cleanly disable
+        data
       end
 
     end
@@ -79,7 +83,77 @@ task 'assets:precompile:css' => 'environment' do
   end
 end
 
+def assets_path
+  "#{Rails.root}/public/assets"
+end
+
+def compress_node(from,to)
+  to_path = "#{assets_path}/#{to}"
+
+  source_map_root = (d=File.dirname(from)) == "." ? "/assets" : "/assets/#{d}"
+
+  STDERR.puts `uglifyjs '#{assets_path}/#{from}' -p relative -c -m -o '#{to_path}' --source-map-root '#{source_map_root}' --source-map '#{assets_path}/#{to}.map' --source-map-url '/assets/#{to}.map'`
+end
+
+def compress_ruby(from,to)
+  data = File.read("#{assets_path}/#{from}")
+
+  uglified, map = Uglifier.new(comments: :none,
+                               screw_ie8: false,
+                               source_filename: File.basename(from),
+                               output_filename: File.basename(to)
+                              )
+                          .compile_with_map(data)
+  dest = "#{assets_path}/#{to}"
+
+  File.write(dest, uglified << "\n//# sourceMappingURL=/assets/#{to}.map")
+  File.write(dest + ".map", map)
+end
+
+def gzip(path)
+  STDERR.puts "gzip #{path}"
+  STDERR.puts `gzip -f -k -9 #{path}`
+end
+
+def compress(from,to)
+  if @has_uglifyjs ||= !`which uglifyjs`.empty?
+    compress_node(from,to)
+  else
+    compress_ruby(from,to)
+  end
+end
+
 task 'assets:precompile' => 'assets:precompile:before' do
   # Run after assets:precompile
   Rake::Task["assets:precompile:css"].invoke
+
+  if ENV["UGLIFY"]
+    puts "Compressing Javascript and Generating Source Maps"
+    manifest = Sprockets::Manifest.new(assets_path)
+    manifest.files
+            .select{|k,v| k =~ /\.js$/}
+            .each do |file, info|
+
+        path = "#{assets_path}/#{file}"
+        _file = (d = File.dirname(file)) == "." ? "_#{file}" : "#{d}/_#{File.basename(file)}"
+        _path = "#{assets_path}/#{_file}"
+
+        if File.exists?(_path)
+          STDERR.puts "Skipping: #{file} already compressed"
+        else
+          STDERR.puts "Compressing: #{file}"
+          FileUtils.mv(path, _path)
+          compress(_file,file)
+
+          info["size"] = File.size(path)
+          info["mtime"] = File.mtime(path).iso8601
+          gzip(path)
+        end
+
+    end
+
+    # protected
+    manifest.send :save
+
+  end
 end
diff --git a/lib/topic_query.rb b/lib/topic_query.rb
index 0fa638475e..159c1e838c 100644
--- a/lib/topic_query.rb
+++ b/lib/topic_query.rb
@@ -56,9 +56,9 @@ class TopicQuery
     # When logged in we start with different results
     if @user
       builder.add_results(unread_results(topic: topic, per_page: builder.results_left), :high)
-      builder.add_results(new_results(topic: topic, per_page: builder.category_results_left), :high) unless builder.category_full?
+      builder.add_results(new_results(topic: topic, per_page: builder.category_results_left)) unless builder.full?
     end
-    builder.add_results(random_suggested(topic, builder.results_left, builder.excluded_topic_ids), :low) unless builder.full?
+    builder.add_results(random_suggested(topic, builder.results_left, builder.excluded_topic_ids)) unless builder.full?
 
     create_list(:suggested, {}, builder.results)
   end
diff --git a/lib/topic_view.rb b/lib/topic_view.rb
index a0f6b072b6..ed9f2ea306 100644
--- a/lib/topic_view.rb
+++ b/lib/topic_view.rb
@@ -1,12 +1,11 @@
 require_dependency 'guardian'
 require_dependency 'topic_query'
 require_dependency 'filter_best_posts'
-require_dependency 'summarize'
 require_dependency 'gaps'
 
 class TopicView
 
-  attr_reader :topic, :posts, :guardian, :filtered_posts
+  attr_reader :topic, :posts, :guardian, :filtered_posts, :chunk_size
   attr_accessor :draft, :draft_key, :draft_sequence, :user_custom_fields
 
   def initialize(topic_id, user=nil, options={})
@@ -21,7 +20,8 @@ class TopicView
 
     @page = @page.to_i
     @page = 1 if @page.zero?
-    @limit ||= SiteSetting.posts_chunksize
+    @chunk_size = options[:slow_platform] ? SiteSetting.posts_slow_chunksize : SiteSetting.posts_chunksize
+    @limit ||= @chunk_size
 
     setup_filtered_posts
 
@@ -115,7 +115,8 @@ class TopicView
   def summary
     return nil if desired_post.blank?
     # TODO, this is actually quite slow, should be cached in the post table
-    Summarize.new(desired_post.cooked).summary
+    excerpt = desired_post.excerpt(500, strip_links: true, text_entities: true)
+    (excerpt || "").gsub(/\n/, ' ').strip
   end
 
   def image_url
diff --git a/lib/trust_level.rb b/lib/trust_level.rb
index 6fba142eb3..a81f5fb383 100644
--- a/lib/trust_level.rb
+++ b/lib/trust_level.rb
@@ -24,7 +24,7 @@ class TrustLevel
     end
 
     def valid?(level)
-    valid_range === level
+      valid_range === level
     end
 
     def valid_range
diff --git a/lib/version.rb b/lib/version.rb
index 2a87a0cc27..2797f8ea88 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 1
       MINOR = 2
       TINY  = 0
-      PRE   = 'beta3'
+      PRE   = 'beta4'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/plugins/.gitkeep b/plugins/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/plugins/emoji/Rakefile b/plugins/emoji/Rakefile
deleted file mode 100644
index 56bb7292a1..0000000000
--- a/plugins/emoji/Rakefile
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env rake
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:test) do |spec|
-    spec.pattern = 'spec/*_spec.rb'
-end
diff --git a/plugins/emoji/app/models/emoji_set_site_setting.rb b/plugins/emoji/app/models/emoji_set_site_setting.rb
new file mode 100644
index 0000000000..15a8bc4aa4
--- /dev/null
+++ b/plugins/emoji/app/models/emoji_set_site_setting.rb
@@ -0,0 +1,22 @@
+require 'enum_site_setting'
+
+class EmojiSetSiteSetting < EnumSiteSetting
+
+  def self.valid_value?(val)
+    values.any? { |v| v[:value] == val.to_s }
+  end
+
+  def self.values
+    @values ||= [
+      { name: 'apple_international', value: 'apple' },
+      { name: 'google', value: 'google' },
+      { name: 'twitter', value: 'twitter' },
+      { name: 'emoji_one', value: 'emoji_one' },
+    ]
+  end
+
+  def self.translate_names?
+    true
+  end
+
+end
diff --git a/plugins/emoji/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs b/plugins/emoji/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
new file mode 100644
index 0000000000..2692f10ea8
--- /dev/null
+++ b/plugins/emoji/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
@@ -0,0 +1,35 @@
+<div class='emoji-modal'>
+  <ul class='toolbar'>
+    {{#each toolbarItems}}<li><a {{#if selected}}class='selected'{{/if}} data-group-id='{{groupId}}'><img src='{{src}}' class='emoji'></a></li>{{/each}}
+  </ul>
+  <div class='emoji-table-wrapper'>
+  <table class='emoji-page'>
+    {{#each rows}}
+      <tr>
+        {{#each this}}
+          <td><a title='{{title}}'><img src='{{src}}' class='emoji'></a></td>
+        {{/each}}
+      </tr>
+    {{/each}}
+  </table>
+  </div>
+
+  <div class='info'></div>
+  <div class='nav'>
+    <span class='prev'>
+      {{#if prevDisabled}}
+        <i class='fa fa-fast-backward'></i>
+      {{else}}
+        <a><i class='fa fa-fast-backward'></i></a>
+      {{/if}}
+    </span>
+    <span class='next'>
+      {{#if nextDisabled}}
+        <i class='fa fa-fast-forward'></i>
+      {{else}}
+        <a><i class='fa fa-fast-forward'></i></a>
+      {{/if}}
+    </span>
+  </div>
+  <div class='clearfix'></div>
+</div>
diff --git a/plugins/emoji/assets/javascripts/emoji-autocomplete.js b/plugins/emoji/assets/javascripts/emoji-autocomplete.js
new file mode 100644
index 0000000000..cb3b1df1f1
--- /dev/null
+++ b/plugins/emoji/assets/javascripts/emoji-autocomplete.js
@@ -0,0 +1,47 @@
+
+// TODO: Make this a proper ES6 import
+var ComposerView = require('discourse/views/composer').default;
+
+ComposerView.on("initWmdEditor", function(){
+  if (!Discourse.SiteSettings.enable_emoji) { return; }
+
+  var template = Handlebars.compile(
+    "<div class='autocomplete'>" +
+      "<ul>" +
+        "{{#each options}}" +
+            "<li>" +
+              "<a href='#'><img src='{{src}}' class='emoji'> {{code}}</a>" +
+            "</li>" +
+        "{{/each}}" +
+      "</ul>" +
+    "</div>"
+  );
+
+  $('#wmd-input').autocomplete({
+    template: template,
+    key: ":",
+    transformComplete: function(v){ return v.code + ":"; },
+    dataSource: function(term){
+      return new Ember.RSVP.Promise(function(resolve) {
+        var full = ":" + term;
+        term = term.toLowerCase();
+
+        if (term === "") {
+          return resolve(["smile", "smiley", "wink", "sunny", "blush"]);
+        }
+
+        if (Discourse.Emoji.translations[full]) {
+          return resolve([Discourse.Emoji.translations[full]]);
+        }
+
+        var options = Discourse.Emoji.search(term, {maxResults: 5});
+
+        return resolve(options);
+      }).then(function(list) {
+        return list.map(function(i) {
+          return {code: i, src: Discourse.Emoji.urlFor(i)};
+        });
+      });
+    }
+  });
+});
diff --git a/plugins/emoji/assets/javascripts/emoji-toolbar.js b/plugins/emoji/assets/javascripts/emoji-toolbar.js
new file mode 100644
index 0000000000..c8c6b772c0
--- /dev/null
+++ b/plugins/emoji/assets/javascripts/emoji-toolbar.js
@@ -0,0 +1,162 @@
+
+var _groups = [
+  {
+    name: "emoticons",
+    icons: ["smile","smiley","grinning","blush","relaxed","wink","heart_eyes","kissing_heart","kissing_closed_eyes","kissing","kissing_smiling_eyes","stuck_out_tongue_winking_eye","stuck_out_tongue_closed_eyes","stuck_out_tongue","flushed","grin","pensive","relieved","unamused","disappointed","persevere","cry","joy","sob","sleepy","disappointed_relieved","cold_sweat","sweat_smile","sweat","weary","tired_face","fearful","scream","angry","rage","triumph","confounded","laughing","yum","mask","sunglasses","sleeping","dizzy_face","astonished","worried","frowning","anguished","smiling_imp","imp","open_mouth","grimacing","neutral_face","confused","hushed","no_mouth","innocent","smirk","expressionless","man_with_gua_pi_mao","man_with_turban","cop","construction_worker","guardsman","baby","boy","girl","man","woman","older_man","older_woman","person_with_blond_hair","angel","princess","smiley_cat","smile_cat","heart_eyes_cat","kissing_cat","smirk_cat","scream_cat","crying_cat_face","joy_cat","pouting_cat","japanese_ogre","japanese_goblin","see_no_evil","hear_no_evil","speak_no_evil","skull","alien","poop","fire","sparkles","star2","dizzy","boom","anger","sweat_drops","droplet","zzz","dash","ear","eyes","nose","tongue","lips","thumbsup","thumbsdown","ok_hand","punch","fist","v","wave","raised_hand","open_hands","point_up_2","point_down","point_right","point_left","raised_hands","pray","point_up","clap","muscle","walking","runner","dancer","couple","family","two_men_holding_hands","two_women_holding_hands","couplekiss","couple_with_heart","dancers","ok_woman","no_good","information_desk_person","raising_hand","massage","haircut","nail_care","bride_with_veil","person_with_pouting_face","person_frowning","bow","tophat","crown","womans_hat","athletic_shoe","mans_shoe","sandal","high_heel","boot","shirt","necktie","womans_clothes","dress","running_shirt_with_sash","jeans","kimono","bikini","briefcase","handbag","pouch","purse","eyeglasses","ribbon","closed_umbrella","lipstick","yellow_heart","blue_heart","purple_heart","green_heart","heart","broken_heart","heartpulse","heartbeat","two_hearts","sparkling_heart","revolving_hearts","cupid","love_letter","kiss","ring","gem","bust_in_silhouette","busts_in_silhouette","speech_balloon","footprints","thought_balloon"]
+  },
+  {
+    name: "nature",
+    icons: ["dog","wolf","cat","mouse","hamster","rabbit","frog","tiger","koala","bear","pig","pig_nose","cow","boar","monkey_face","monkey","horse","sheep","elephant","panda_face","penguin","bird","baby_chick","hatched_chick","hatching_chick","chicken","snake","turtle","bug","bee","ant","beetle","snail","octopus","shell","tropical_fish","fish","dolphin","whale","whale2","cow2","ram","rat","water_buffalo","tiger2","rabbit2","dragon","racehorse","goat","rooster","dog2","pig2","mouse2","ox","dragon_face","blowfish","crocodile","camel","dromedary_camel","leopard","cat2","poodle","feet","bouquet","cherry_blossom","tulip","four_leaf_clover","rose","sunflower","hibiscus","maple_leaf","leaves","fallen_leaf","herb","ear_of_rice","mushroom","cactus","palm_tree","evergreen_tree","deciduous_tree","chestnut","seedling","blossom","globe_with_meridians","sun_with_face","full_moon_with_face","new_moon_with_face","new_moon","waxing_crescent_moon","first_quarter_moon","waxing_gibbous_moon","full_moon","waning_gibbous_moon","last_quarter_moon","waning_crescent_moon","last_quarter_moon_with_face","first_quarter_moon_with_face","crescent_moon","earth_africa","earth_americas","earth_asia","volcano","milky_way","stars","star","sunny","partly_sunny","cloud","zap","umbrella","snowflake","snowman","cyclone","foggy","rainbow","ocean"]
+  },
+  {
+    name: "objects",
+    icons: ["bamboo","gift_heart","dolls","school_satchel","mortar_board","flags","fireworks","sparkler","wind_chime","rice_scene","jack_o_lantern","ghost","santa","christmas_tree","gift","tanabata_tree","tada","confetti_ball","balloon","crossed_flags","crystal_ball","movie_camera","camera","video_camera","vhs","cd","dvd","minidisc","floppy_disk","computer","iphone","telephone","telephone_receiver","pager","fax","satellite","tv","radio","loud_sound","sound","speaker","mute","bell","no_bell","loudspeaker","mega","hourglass_flowing_sand","hourglass","alarm_clock","watch","unlock","lock","lock_with_ink_pen","closed_lock_with_key","key","mag_right","bulb","flashlight","high_brightness","low_brightness","electric_plug","battery","mag","bathtub","bath","shower","toilet","wrench","nut_and_bolt","hammer","door","smoking","bomb","gun","knife","pill","syringe","moneybag","yen","dollar","pound","euro","credit_card","money_with_wings","calling","e-mail","inbox_tray","outbox_tray","envelope","envelope_with_arrow","incoming_envelope","postal_horn","mailbox","mailbox_closed","mailbox_with_mail","mailbox_with_no_mail","postbox","package","pencil","page_facing_up","page_with_curl","bookmark_tabs","bar_chart","chart_with_upwards_trend","chart_with_downwards_trend","scroll","clipboard","date","calendar","card_index","file_folder","open_file_folder","scissors","pushpin","paperclip","black_nib","pencil2","straight_ruler","triangular_ruler","closed_book","green_book","blue_book","orange_book","notebook","notebook_with_decorative_cover","ledger","books","book","bookmark","name_badge","microscope","telescope","newspaper","art","clapper","microphone","headphones","musical_score","musical_note","notes","musical_keyboard","violin","trumpet","saxophone","guitar","space_invader","video_game","black_joker","flower_playing_cards","mahjong","game_die","dart","football","basketball","soccer","baseball","tennis","8ball","rugby_football","bowling","golf","mountain_bicyclist","bicyclist","checkered_flag","horse_racing","trophy","ski","snowboarder","swimmer","surfer","fishing_pole_and_fish"]
+  },
+  {
+    name: "foods",
+    icons: ["coffee","tea","sake","baby_bottle","beer","beers","cocktail","tropical_drink","wine_glass","fork_and_knife","pizza","hamburger","fries","poultry_leg","meat_on_bone","spaghetti","curry","fried_shrimp","bento","sushi","fish_cake","rice_ball","rice_cracker","rice","ramen","stew","oden","dango","egg","bread","doughnut","custard","icecream","ice_cream","shaved_ice","birthday","cake","cookie","chocolate_bar","candy","lollipop","honey_pot","apple","green_apple","tangerine","lemon","cherries","grapes","watermelon","strawberry","peach","melon","banana","pear","pineapple","sweet_potato","eggplant","tomato","corn"]
+  },
+  {
+    name: "places",
+    icons: ["house","house_with_garden","school","office","post_office","hospital","bank","convenience_store","love_hotel","hotel","wedding","church","department_store","european_post_office","city_sunset","city_dusk","japanese_castle","european_castle","tent","factory","tokyo_tower","japan","mount_fuji","sunrise_over_mountains","sunrise","night_with_stars","statue_of_liberty","bridge_at_night","carousel_horse","ferris_wheel","fountain","roller_coaster","ship","sailboat","speedboat","rowboat","anchor","rocket","airplane","seat","helicopter","steam_locomotive","tram","station","mountain_railway","train2","bullettrain_side","bullettrain_front","light_rail","metro","monorail","train","railway_car","trolleybus","bus","oncoming_bus","blue_car","oncoming_automobile","red_car","taxi","oncoming_taxi","articulated_lorry","truck","rotating_light","police_car","oncoming_police_car","fire_engine","ambulance","minibus","bike","aerial_tramway","suspension_railway","mountain_cableway","tractor","barber","busstop","ticket","vertical_traffic_light","traffic_light","warning","construction","beginner","fuelpump","izakaya_lantern","slot_machine","hotsprings","moyai","circus_tent","performing_arts","round_pushpin","triangular_flag_on_post","cn","us","in","jp","br","ru","de","ng","gb","fr","mx","kr","id","ph","eg","vn","tr","it","es","ca","pl","ar","co","ir","za","my","pk","au","th","ma","tw","nl","ua","sa","ke","ve","pe","ro","cl","uz","bd","kz","be","se","cz","sd","hu","pt","ch","at","tz"]
+  },
+  {
+    name: "symbols",
+    icons: ["hash","one","two","three","four","five","six","seven","eight","nine","zero","keycap_ten","1234","symbols","arrow_up","arrow_down","arrow_left","arrow_right","capital_abcd","abcd","abc","arrow_upper_right","arrow_upper_left","arrow_lower_right","arrow_lower_left","left_right_arrow","arrow_up_down","arrows_counterclockwise","arrow_backward","arrow_forward","arrow_up_small","arrow_down_small","leftwards_arrow_with_hook","arrow_right_hook","information_source","rewind","fast_forward","arrow_double_up","arrow_double_down","arrow_heading_down","arrow_heading_up","ok","twisted_rightwards_arrows","repeat","repeat_one","new","up","cool","free","ng","signal_strength","cinema","koko","u6307","u7a7a","u6e80","u5408","u7981","ideograph_advantage","u5272","u55b6","u6709","u7121","restroom","mens","womens","baby_symbol","wc","potable_water","put_litter_in_its_place","parking","wheelchair","no_smoking","u6708","u7533","sa","m","passport_control","baggage_claim","left_luggage","customs","accept","secret","congratulations","cl","sos","id","no_entry_sign","underage","no_mobile_phones","do_not_litter","non-potable_water","no_bicycles","no_pedestrians","children_crossing","no_entry","eight_spoked_asterisk","sparkle","negative_squared_cross_mark","white_check_mark","eight_pointed_black_star","heart_decoration","vs","vibration_mode","mobile_phone_off","a","b","ab","o2","diamond_shape_with_a_dot_inside","loop","recycle","aries","taurus","gemini","cancer","leo","virgo","libra","scorpius","sagittarius","capricorn","aquarius","pisces","ophiuchus","six_pointed_star","atm","chart","heavy_dollar_sign","currency_exchange","copyright","registered","tm","part_alternation_mark","wavy_dash","top","end","back","on","soon","x","o","exclamation","question","grey_exclamation","grey_question","bangbang","interrobang","arrows_clockwise","clock12","clock1230","clock1","clock130","clock2","clock230","clock3","clock330","clock4","clock430","clock5","clock530","clock6","clock7","clock8","clock9","clock10","clock11","clock630","clock730","clock830","clock930","clock1030","clock1130","heavy_multiplication_x","heavy_plus_sign","heavy_minus_sign","heavy_division_sign","spades","hearts","clubs","diamonds","white_flower","100","heavy_check_mark","ballot_box_with_check","radio_button","link","curly_loop","trident","black_square_button","white_square_button","black_medium_square","white_medium_square","black_medium_small_square","white_medium_small_square","black_small_square","white_small_square","small_red_triangle","white_large_square","black_large_square","black_circle","white_circle","red_circle","large_blue_circle","small_red_triangle_down","large_orange_diamond","large_blue_diamond","small_orange_diamond","small_blue_diamond"]
+  }
+];
+
+// scrub groups
+_groups.forEach(function(group){
+  group.icons = _.reject(group.icons, function(obj){
+    return !Discourse.Emoji.exists(obj);
+  });
+});
+
+// export so others can modify
+Discourse.Emoji.groups = _groups;
+
+var closeSelector = function(){
+  $('.emoji-modal, .emoji-modal-wrapper').remove();
+  $('body, textarea').off('keydown.emoji');
+};
+
+var _ungroupedIcons;
+
+var toolbar = function(selected){
+
+  if(!_ungroupedIcons){
+    _ungroupedIcons = [];
+    var groupedIcons = {};
+
+    _.each(_groups, function(group){
+      _.each(group.icons, function(icon){
+        groupedIcons[icon] = true;
+      });
+    });
+
+    var emojis = Discourse.Emoji.list();
+    _.each(emojis,function(emoji){
+      if(groupedIcons[emoji] !== true){
+        _ungroupedIcons.push(emoji);
+      }
+    });
+
+    if(_ungroupedIcons.length > 0){
+      _groups.push({name: 'ungrouped', icons: _ungroupedIcons});
+    }
+  }
+
+  return _.map(_groups, function(g, i){
+    var row = {src: Discourse.Emoji.urlFor(g.icons[0]), groupId: i};
+    if(i===selected){
+      row.selected = true;
+    }
+    return row;
+  });
+};
+
+var PER_ROW = 12, PER_PAGE = 60;
+
+var bindEvents = function(page,offset){
+  var composerController = Discourse.__container__.lookup('controller:composer');
+
+  $('.emoji-page a').click(function(){
+     composerController.appendTextAtCursor(":" + $(this).attr('title') + ":", {space: true});
+     closeSelector();
+     return false;
+  }).hover(function(){
+    var title = $(this).attr('title');
+    var html = "<img src='" + Discourse.Emoji.urlFor(title) + "' class='emoji'> <span>:" + title + ":<span>";
+    $('.emoji-modal .info').html(html);
+  },function(){
+    $('.emoji-modal .info').html("");
+  });
+
+  $('.emoji-modal .nav .next a').click(function(){
+    render(page, offset+PER_PAGE);
+  });
+
+  $('.emoji-modal .nav .prev a').click(function(){
+    render(page, offset-PER_PAGE);
+  });
+
+  $('.emoji-modal .toolbar a').click(function(){
+    var page = parseInt($(this).data('group-id'));
+    render(page,0);
+    return false;
+  });
+};
+
+var render = function(page, offset){
+  var rows = [];
+  var row = [];
+  var icons = _groups[page].icons;
+
+  for(var i=offset; i<(offset+PER_PAGE); i++){
+    if(!icons[i]){ break; }
+    if(row.length === PER_ROW){
+      rows.push(row);
+      row = [];
+    }
+    row.push({src: Discourse.Emoji.urlFor(icons[i]), title: icons[i]});
+  }
+  rows.push(row);
+
+  var model = {
+    toolbarItems: toolbar(page),
+    rows: rows,
+    prevDisabled: offset === 0,
+    nextDisabled: (offset + PER_PAGE + 1) > icons.length
+  };
+
+  $('body .emoji-modal').remove();
+  var rendered = Ember.TEMPLATES["javascripts/emoji-toolbar.raw"](model);
+  $('body').append(rendered);
+
+  bindEvents(page,offset);
+};
+
+var showSelector = function(){
+  $('body').append('<div class="emoji-modal-wrapper"></div>');
+
+  $('.emoji-modal-wrapper').click(function(){
+    closeSelector();
+  });
+
+  render(0,0);
+
+  $('body, textarea').on('keydown.emoji', function(e){
+    if(e.which === 27){
+      closeSelector();
+      return false;
+    }
+  });
+};
+
+window.PagedownCustom.appendButtons.push({
+  id: 'wmd-emoji-button',
+  description: I18n.t("composer.emoji"),
+  execute: showSelector,
+  shortcut: 'e'
+});
diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index 147f91ca34..532dac1bc3 100644
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@@ -1,186 +1,191 @@
-(function() {
-  var emoji = <%= Dir.glob(File.expand_path("../../../public/images/*.png", __FILE__)).map{|f| File.basename(f).split(".")[0]}.inspect %>;
+// TODO @robin to move this whole thing to es6
+Discourse.Emoji = {};
+// bump up this number to expire all emojis
+Discourse.Emoji.ImageVersion = "0"
 
-  var _extendedEmoji = {};
-  Discourse.Dialect.registerEmoji = function(code, url) {
-    _extendedEmoji[code] = url;
-  };
+var _emoji = <%= Emoji.all.map { |e| e["aliases"] }.flatten.inspect %>;
 
-  function urlFor(code) {
-    var url = _extendedEmoji[code];
-    if (!url && emoji.indexOf(code) !== -1) {
-      url = Discourse.getURL('/plugins/emoji/images/' + code + '.png');
-    }
-    return url;
+var _extendedEmoji = {};
+Discourse.Dialect.registerEmoji = function(code, url) {
+  _extendedEmoji[code] = url;
+};
+
+Discourse.Emoji.list = function(){
+  var copy = _emoji.slice(0);
+  _.each(_extendedEmoji, function(v,k){
+    copy.push(k);
+  });
+  return copy;
+};
+
+var _toSearch;
+
+var search = function(term, options) {
+  var maxResults = (options && options["maxResults"]) || -1;
+
+  _toSearch = _toSearch || _emoji.concat(Object.keys(_extendedEmoji));
+
+  if(maxResults === 0) { return []; }
+
+  var i, results = [];
+
+  var done = function(){
+    return maxResults > 0 && results.length >= maxResults;
   }
 
-  function imageFor(code) {
-    var url = urlFor(code);
-    if (url) {
-      return ['img', {href: url, title: ':' + code + ':', 'class': 'emoji', alt: code}];
+  for (i=0; i < _toSearch.length; i++) {
+    if (_toSearch[i].indexOf(term) === 0) {
+      results.push(_toSearch[i]);
+      if(done()) { break; }
     }
   }
 
-  // Also support default emotions
-  var translations = {
-    ':)'   : 'smile',
-    ':-)'   : 'smile',
-    ':('   : 'frowning',
-    ':-('   : 'frowning',
-    ';)'   : 'wink',
-    ';-)'   : 'wink',
-    ':\'(' : 'cry',
-    ':\'-(' : 'cry',
-    ':-\'(' : 'cry',
-    ':p'   : 'stuck_out_tongue',
-    ':P'   : 'stuck_out_tongue',
-    ':-P'   : 'stuck_out_tongue',
-    ':O'   : 'open_mouth',
-    ':-O'   : 'open_mouth',
-    ':D'   : 'smiley',
-    ':-D'   : 'smiley',
-    ':|'   : 'expressionless',
-    ':-|'   : 'expressionless',
-    ";P"   : 'stuck_out_tongue_winking_eye',
-    ";-P"   : 'stuck_out_tongue_winking_eye',
-    ';)'   : 'wink',
-    ';-)'   : 'wink',
-    ":$"   : 'blush',
-    ":-$"   : 'blush'
-  };
-
-  function checkPrev(prev) {
-    if (prev && prev.length) {
-      var lastToken = prev[prev.length-1];
-      if (lastToken && lastToken.charAt) {
-        var lastChar = lastToken.charAt(lastToken.length-1);
-        if (lastChar !== ' ' && lastChar !== "\n") return false;
+  if(!done()){
+    for (i=0; i < _toSearch.length; i++) {
+      if (_toSearch[i].indexOf(term) > 0) {
+        results.push(_toSearch[i]);
+        if(done()) { break; }
       }
     }
-    return true;
   }
 
-  var translationsWithColon = {};
-  Object.keys(translations).forEach(function (t) {
-    if (t[0] === ':') {
-      translationsWithColon[t] = translations[t];
-    } else {
-      var replacement = translations[t];
-      Discourse.Dialect.inlineReplace(t, function (token, match, prev) {
-        if (!Discourse.SiteSettings.enable_emoji) { return token; }
-        return checkPrev(prev) ? imageFor(replacement) : token;
-      });
-    }
-  });
+  return results;
+}
 
-  function escapeRegExp(s) {
-    return s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&')
+Discourse.Emoji.search = search;
+
+var _emojiHash = {};
+_emoji.forEach(function(code){
+  _emojiHash[code] = true;
+});
+
+var urlFor = function(code) {
+  var url, set = Discourse.SiteSettings.emoji_set;
+
+  if(_extendedEmoji.hasOwnProperty(code)) {
+    url = _extendedEmoji[code];
   }
 
-  var translationColonRegexp = new RegExp(Object.keys(translationsWithColon).map(function (t) {
-                                             return "(" + escapeRegExp(t) + ")";
-                                           }).join("|"));
+  if(!url && _emojiHash.hasOwnProperty(code)) {
+    url = Discourse.getURL('/plugins/emoji/images/' + set + '/' + code + '.png');
+  }
 
-  Discourse.Dialect.registerInline(':', function(text, match, prev) {
-    if (!Discourse.SiteSettings.enable_emoji) { return; }
+  if(url && url[0] !== 'h' && Discourse.CDN) {
+    url = Discourse.CDN + url;
+  }
 
-    var endPos = text.indexOf(':', 1),
-        firstSpace = text.search(/\s/),
-        contents;
+  if(url){
+    url = url + "?v=" + Discourse.Emoji.ImageVersion;
+  }
 
-    if (!checkPrev(prev)) { return; }
+  return url;
+}
 
-    // If there is no trailing colon, check our translations that begin with colons
-    if (endPos === -1 || (firstSpace !== -1 && endPos > firstSpace)) {
-      translationColonRegexp.lastIndex = 0;
-      var m = translationColonRegexp.exec(text);
-      if (m && m[0] && text.indexOf(m[0]) === 0) {
+Discourse.Emoji.urlFor = urlFor;
 
-        // Check outer edge
-        var lastChar = text.charAt(m[0].length);
-        if (lastChar && (lastChar !== ' ' && lastChar !== "\n")) return;
-        contents = imageFor(translationsWithColon[m[0]]);
-        if (contents) {
-          return [m[0].length, contents];
-        }
-      }
-      return;
+Discourse.Emoji.exists = function(code){
+ return !!(_extendedEmoji.hasOwnProperty(code) || _emojiHash.hasOwnProperty(code));
+}
+
+function imageFor(code) {
+  var url = urlFor(code);
+  if (url) {
+    return ['img', { href: url, title: ':' + code + ':', 'class': 'emoji', alt: code }];
+  }
+}
+
+// Also support default emotions
+var translations = {
+  ':)'   : 'smile',
+  ':-)'   : 'smile',
+  ':('   : 'frowning',
+  ':-('   : 'frowning',
+  ';)'   : 'wink',
+  ';-)'   : 'wink',
+  ':\'(' : 'cry',
+  ':\'-(' : 'cry',
+  ':-\'(' : 'cry',
+  ':p'   : 'stuck_out_tongue',
+  ':P'   : 'stuck_out_tongue',
+  ':-P'   : 'stuck_out_tongue',
+  ':O'   : 'open_mouth',
+  ':-O'   : 'open_mouth',
+  ':D'   : 'smiley',
+  ':-D'   : 'smiley',
+  ':|'   : 'expressionless',
+  ':-|'   : 'expressionless',
+  ";P"   : 'stuck_out_tongue_winking_eye',
+  ";-P"   : 'stuck_out_tongue_winking_eye',
+  ":$"   : 'blush',
+  ":-$"   : 'blush'
+};
+
+Discourse.Emoji.translations = translations;
+
+function checkPrev(prev) {
+  if (prev && prev.length) {
+    var lastToken = prev[prev.length-1];
+    if (lastToken && lastToken.charAt) {
+      var lastChar = lastToken.charAt(lastToken.length-1);
+      if (lastChar !== ' ' && lastChar !== "\n") return false;
     }
+  }
+  return true;
+}
 
-    // Simple find and replace from our array
-    var between = text.slice(1, endPos);
-    contents = imageFor(between);
-    if (contents) {
-      return [endPos+1, contents];
-    }
-  });
-
-  // TODO: Make this a proper ES6 import
-  var ComposerView = (Discourse && Discourse.ComposerView) || (typeof require !== "undefined" && require('discourse/views/composer').default);
-  if (ComposerView) {
-    ComposerView.on("initWmdEditor", function(event){
-      if (!Discourse.SiteSettings.enable_emoji) { return; }
-
-      var baseUrl = Discourse.getURL("/");
-
-      template = Handlebars.compile("<div class='autocomplete'>" +
-                                       "<ul>" +
-                                          "{{#each options}}" +
-                                              "<li>" +
-                                                "<a href='#'>" +
-                                                "<img src='{{src}}' class='emoji'> " +
-                                                "{{code}}</a>" +
-                                              "</li>" +
-                                          "{{/each}}" +
-                                       "</ul>" +
-                                    "</div>");
-
-      var toSearch = emoji.concat(Object.keys(_extendedEmoji));
-      $('#wmd-input').autocomplete({
-        template: template,
-        key: ":",
-        transformComplete: function(v){  return v.code + ":"; },
-        dataSource: function(term){
-          return new Ember.RSVP.Promise(function(resolve) {
-            var full = ":" + term;
-            term = term.toLowerCase();
-
-            if (term === "") {
-              return resolve(["smile", "smiley", "wink", "sunny", "blush"]);
-            }
-
-            if (translations[full]) {
-              return resolve([translations[full]]);
-            }
-
-            var options = [];
-            var i;
-            for (i=0; i < toSearch.length; i++) {
-              if (toSearch[i].indexOf(term) === 0) {
-                options.push(toSearch[i]);
-                if(options.length > 4) { break; }
-              }
-            }
-
-            if (options.length <= 4) {
-              for (i=0; i < toSearch.length; i++) {
-                if (toSearch[i].indexOf(term) > 0) {
-                  options.push(toSearch[i]);
-                  if(options.length > 4) { break; }
-                }
-              }
-            }
-
-            return resolve(options);
-          }).then(function(list) {
-            return list.map(function(i) {
-              return {code: i, src: urlFor(i)};
-            });
-          });
-        }
-      });
+var translationsWithColon = {};
+Object.keys(translations).forEach(function (t) {
+  if (t[0] === ':') {
+    translationsWithColon[t] = translations[t];
+  } else {
+    var replacement = translations[t];
+    Discourse.Dialect.inlineReplace(t, function (token, match, prev) {
+      if (!Discourse.SiteSettings.enable_emoji) { return token; }
+      return checkPrev(prev) ? imageFor(replacement) : token;
     });
   }
+});
 
-  Discourse.Markdown.whiteListTag('img', 'class', 'emoji');
-}).call(this);
+function escapeRegExp(s) {
+  return s.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
+}
+
+var translationColonRegexp = new RegExp(Object.keys(translationsWithColon).map(function (t) {
+                                           return "(" + escapeRegExp(t) + ")";
+                                         }).join("|"));
+
+Discourse.Dialect.registerInline(':', function(text, match, prev) {
+  if (!Discourse.SiteSettings.enable_emoji) { return; }
+
+  var endPos = text.indexOf(':', 1),
+      firstSpace = text.search(/\s/),
+      contents;
+
+  if (!checkPrev(prev)) { return; }
+
+  // If there is no trailing colon, check our translations that begin with colons
+  if (endPos === -1 || (firstSpace !== -1 && endPos > firstSpace)) {
+    translationColonRegexp.lastIndex = 0;
+    var m = translationColonRegexp.exec(text);
+    if (m && m[0] && text.indexOf(m[0]) === 0) {
+
+      // Check outer edge
+      var lastChar = text.charAt(m[0].length);
+      if (lastChar && (lastChar !== ' ' && lastChar !== "\n")) return;
+      contents = imageFor(translationsWithColon[m[0]]);
+      if (contents) {
+        return [m[0].length, contents];
+      }
+    }
+    return;
+  }
+
+  // Simple find and replace from our array
+  var between = text.slice(1, endPos);
+  contents = imageFor(between);
+  if (contents) {
+    return [endPos+1, contents];
+  }
+});
+
+Discourse.Markdown.whiteListTag('img', 'class', 'emoji');
diff --git a/plugins/emoji/assets/stylesheets/emoji.css b/plugins/emoji/assets/stylesheets/emoji.css
index a7e070e28c..843309b69e 100644
--- a/plugins/emoji/assets/stylesheets/emoji.css
+++ b/plugins/emoji/assets/stylesheets/emoji.css
@@ -3,3 +3,104 @@ body img.emoji {
   height: 20px;
   vertical-align: middle;
 }
+
+#wmd-emoji-button:before {
+  content:  "\f118";
+}
+
+.emoji-modal {
+  z-index: 10000;
+  position: fixed;
+  margin-left: -195px;
+  margin-top: -100px;
+  left: 50%;
+  top: 50%;
+  background-color: white;
+}
+
+.emoji-page td {
+  border: 1px solid #eee;
+}
+
+.emoji-page a {
+  padding: 8px;
+  display: block;
+}
+
+.emoji-page a:hover {
+  background-color: rgb(210, 236, 252);
+}
+
+.emoji-table-wrapper {
+  min-width: 444px;
+  min-height: 185px;
+}
+
+.emoji-page {
+  border-collapse: collapse;
+  margin: 3px;
+}
+
+.emoji-modal-wrapper {
+  z-index: 9999;
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  opacity: 0.8;
+  background-color: black;
+}
+
+
+.emoji-modal .toolbar {
+  margin: 0;
+  padding: 0;
+  margin-top: 10px;
+  margin-left: 5px;
+  margin-bottom: 5px
+}
+
+.emoji-modal .toolbar li {
+  display: inline;
+  margin: 0;
+  padding: 0;
+}
+
+.emoji-modal .toolbar li a {
+  padding: 8px;
+  background-color: #dadada;
+}
+
+.emoji-modal .toolbar li a.selected {
+  background-color: #fff;
+}
+
+.emoji-modal .info {
+  height: 30px;
+  margin-left: 8px;
+  margin-top: 15px;
+  margin-bottom: 0px;
+}
+
+.emoji-modal .info span {
+  margin-left: 5px;
+  font-weight: bold;
+}
+
+.emoji-modal .info {
+  float: left;
+}
+.emoji-modal .nav {
+  float: right;
+  margin-top: 15px;
+}
+
+.emoji-modal .nav span {
+  color: #aaa;
+  margin-right: 10px;
+}
+
+.emoji-modal .nav a {
+  color: #333;
+}
diff --git a/plugins/emoji/bin/rails b/plugins/emoji/bin/rails
new file mode 100644
index 0000000000..b396883dd6
--- /dev/null
+++ b/plugins/emoji/bin/rails
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/emoji/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'
diff --git a/plugins/emoji/config/locales/client.de.yml b/plugins/emoji/config/locales/client.de.yml
new file mode 100644
index 0000000000..b4bff1ce09
--- /dev/null
+++ b/plugins/emoji/config/locales/client.de.yml
@@ -0,0 +1,6 @@
+de:
+  admin_js:
+    admin:
+      site_settings:
+        categories:
+          plugins: "Plug-ins"
diff --git a/plugins/emoji/config/locales/client.en.yml b/plugins/emoji/config/locales/client.en.yml
index 6315b630f8..0c26c3288c 100644
--- a/plugins/emoji/config/locales/client.en.yml
+++ b/plugins/emoji/config/locales/client.en.yml
@@ -1,4 +1,13 @@
 en:
+  js:
+    composer:
+      emoji: "Emoji :smile: CTRL+ E"
+
+    apple_international: "Apple/International"
+    google: "Google"
+    twitter: "Twitter"
+    emoji_one: "Emoji One"
+
   admin_js:
     admin:
       site_settings:
diff --git a/plugins/emoji/config/locales/server.de.yml b/plugins/emoji/config/locales/server.de.yml
new file mode 100644
index 0000000000..2d581e409b
--- /dev/null
+++ b/plugins/emoji/config/locales/server.de.yml
@@ -0,0 +1,3 @@
+de:
+  site_settings:
+    enable_emoji: "das Emoji-Plug-in aktivieren"
diff --git a/plugins/emoji/config/locales/server.en.yml b/plugins/emoji/config/locales/server.en.yml
index 5da8351cf6..f3cb04a479 100644
--- a/plugins/emoji/config/locales/server.en.yml
+++ b/plugins/emoji/config/locales/server.en.yml
@@ -1,3 +1,4 @@
 en:
   site_settings:
     enable_emoji: "Enable the emoji plugin"
+    emoji_set: "How would you like your emoji?"
diff --git a/plugins/emoji/config/settings.yml b/plugins/emoji/config/settings.yml
index 10896b1013..d87034fb8b 100644
--- a/plugins/emoji/config/settings.yml
+++ b/plugins/emoji/config/settings.yml
@@ -2,3 +2,7 @@ plugins:
   enable_emoji:
     default: true
     client: true
+  emoji_set:
+    default: 'emoji_one'
+    client: true
+    enum: 'EmojiSetSiteSetting'
diff --git a/plugins/emoji/db.json b/plugins/emoji/db.json
new file mode 100644
index 0000000000..536a025cfc
--- /dev/null
+++ b/plugins/emoji/db.json
@@ -0,0 +1,8122 @@
+[
+  {
+    "emoji": "😄"
+  , "description": "smiling face with open mouth and smiling eyes"
+  , "aliases": [
+      "smile"
+    ]
+  , "tags": [
+      "happy"
+    , "joy"
+    , "pleased"
+    ]
+  }
+, {
+    "emoji": "😃"
+  , "description": "smiling face with open mouth"
+  , "aliases": [
+      "smiley"
+    ]
+  , "tags": [
+      "happy"
+    , "joy"
+    , "haha"
+    ]
+  }
+, {
+    "emoji": "😀"
+  , "description": "grinning face"
+  , "aliases": [
+      "grinning"
+    ]
+  , "tags": [
+      "smile"
+    , "happy"
+    ]
+  }
+, {
+    "emoji": "😊"
+  , "description": "smiling face with smiling eyes"
+  , "aliases": [
+      "blush"
+    ]
+  , "tags": [
+      "proud"
+    ]
+  }
+, {
+    "emoji": "☺️"
+  , "description": "white smiling face"
+  , "aliases": [
+      "relaxed"
+    ]
+  , "tags": [
+      "blush"
+    , "pleased"
+    ]
+  }
+, {
+    "emoji": "😉"
+  , "description": "winking face"
+  , "aliases": [
+      "wink"
+    ]
+  , "tags": [
+      "flirt"
+    ]
+  }
+, {
+    "emoji": "😍"
+  , "description": "smiling face with heart-shaped eyes"
+  , "aliases": [
+      "heart_eyes"
+    ]
+  , "tags": [
+      "love"
+    , "crush"
+    ]
+  }
+, {
+    "emoji": "😘"
+  , "description": "face throwing a kiss"
+  , "aliases": [
+      "kissing_heart"
+    ]
+  , "tags": [
+      "flirt"
+    ]
+  }
+, {
+    "emoji": "😚"
+  , "description": "kissing face with closed eyes"
+  , "aliases": [
+      "kissing_closed_eyes"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😗"
+  , "description": "kissing face"
+  , "aliases": [
+      "kissing"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😙"
+  , "description": "kissing face with smiling eyes"
+  , "aliases": [
+      "kissing_smiling_eyes"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😜"
+  , "description": "face with stuck-out tongue and winking eye"
+  , "aliases": [
+      "stuck_out_tongue_winking_eye"
+    ]
+  , "tags": [
+      "prank"
+    , "silly"
+    ]
+  }
+, {
+    "emoji": "😝"
+  , "description": "face with stuck-out tongue and tightly-closed eyes"
+  , "aliases": [
+      "stuck_out_tongue_closed_eyes"
+    ]
+  , "tags": [
+      "prank"
+    ]
+  }
+, {
+    "emoji": "😛"
+  , "description": "face with stuck-out tongue"
+  , "aliases": [
+      "stuck_out_tongue"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😳"
+  , "description": "flushed face"
+  , "aliases": [
+      "flushed"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😁"
+  , "description": "grinning face with smiling eyes"
+  , "aliases": [
+      "grin"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😔"
+  , "description": "pensive face"
+  , "aliases": [
+      "pensive"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😌"
+  , "description": "relieved face"
+  , "aliases": [
+      "relieved"
+    ]
+  , "tags": [
+      "whew"
+    ]
+  }
+, {
+    "emoji": "😒"
+  , "description": "unamused face"
+  , "aliases": [
+      "unamused"
+    ]
+  , "tags": [
+      "meh"
+    ]
+  }
+, {
+    "emoji": "😞"
+  , "description": "disappointed face"
+  , "aliases": [
+      "disappointed"
+    ]
+  , "tags": [
+      "sad"
+    ]
+  }
+, {
+    "emoji": "😣"
+  , "description": "persevering face"
+  , "aliases": [
+      "persevere"
+    ]
+  , "tags": [
+      "struggling"
+    ]
+  }
+, {
+    "emoji": "😢"
+  , "description": "crying face"
+  , "aliases": [
+      "cry"
+    ]
+  , "tags": [
+      "sad"
+    , "tear"
+    ]
+  }
+, {
+    "emoji": "😂"
+  , "description": "face with tears of joy"
+  , "aliases": [
+      "joy"
+    ]
+  , "tags": [
+      "tears"
+    ]
+  }
+, {
+    "emoji": "😭"
+  , "description": "loudly crying face"
+  , "aliases": [
+      "sob"
+    ]
+  , "tags": [
+      "sad"
+    , "cry"
+    , "bawling"
+    ]
+  }
+, {
+    "emoji": "😪"
+  , "description": "sleepy face"
+  , "aliases": [
+      "sleepy"
+    ]
+  , "tags": [
+      "tired"
+    ]
+  }
+, {
+    "emoji": "😥"
+  , "description": "disappointed but relieved face"
+  , "aliases": [
+      "disappointed_relieved"
+    ]
+  , "tags": [
+      "phew"
+    , "sweat"
+    , "nervous"
+    ]
+  }
+, {
+    "emoji": "😰"
+  , "description": "face with open mouth and cold sweat"
+  , "aliases": [
+      "cold_sweat"
+    ]
+  , "tags": [
+      "nervous"
+    ]
+  }
+, {
+    "emoji": "😅"
+  , "description": "smiling face with open mouth and cold sweat"
+  , "aliases": [
+      "sweat_smile"
+    ]
+  , "tags": [
+      "hot"
+    ]
+  }
+, {
+    "emoji": "😓"
+  , "description": "face with cold sweat"
+  , "aliases": [
+      "sweat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😩"
+  , "description": "weary face"
+  , "aliases": [
+      "weary"
+    ]
+  , "tags": [
+      "tired"
+    ]
+  }
+, {
+    "emoji": "😫"
+  , "description": "tired face"
+  , "aliases": [
+      "tired_face"
+    ]
+  , "tags": [
+      "upset"
+    , "whine"
+    ]
+  }
+, {
+    "emoji": "😨"
+  , "description": "fearful face"
+  , "aliases": [
+      "fearful"
+    ]
+  , "tags": [
+      "scared"
+    , "shocked"
+    , "oops"
+    ]
+  }
+, {
+    "emoji": "😱"
+  , "description": "face screaming in fear"
+  , "aliases": [
+      "scream"
+    ]
+  , "tags": [
+      "horror"
+    , "shocked"
+    ]
+  }
+, {
+    "emoji": "😠"
+  , "description": "angry face"
+  , "aliases": [
+      "angry"
+    ]
+  , "tags": [
+      "mad"
+    , "annoyed"
+    ]
+  }
+, {
+    "emoji": "😡"
+  , "description": "pouting face"
+  , "aliases": [
+      "rage"
+    ]
+  , "tags": [
+      "angry"
+    ]
+  }
+, {
+    "emoji": "😤"
+  , "description": "face with look of triumph"
+  , "aliases": [
+      "triumph"
+    ]
+  , "tags": [
+      "smug"
+    ]
+  }
+, {
+    "emoji": "😖"
+  , "description": "confounded face"
+  , "aliases": [
+      "confounded"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😆"
+  , "description": "smiling face with open mouth and tightly-closed eyes"
+  , "aliases": [
+      "laughing"
+    , "satisfied"
+    ]
+  , "tags": [
+      "happy"
+    , "haha"
+    ]
+  }
+, {
+    "emoji": "😋"
+  , "description": "face savouring delicious food"
+  , "aliases": [
+      "yum"
+    ]
+  , "tags": [
+      "tongue"
+    , "lick"
+    ]
+  }
+, {
+    "emoji": "😷"
+  , "description": "face with medical mask"
+  , "aliases": [
+      "mask"
+    ]
+  , "tags": [
+      "sick"
+    , "ill"
+    ]
+  }
+, {
+    "emoji": "😎"
+  , "description": "smiling face with sunglasses"
+  , "aliases": [
+      "sunglasses"
+    ]
+  , "tags": [
+      "cool"
+    ]
+  }
+, {
+    "emoji": "😴"
+  , "description": "sleeping face"
+  , "aliases": [
+      "sleeping"
+    ]
+  , "tags": [
+      "zzz"
+    ]
+  }
+, {
+    "emoji": "😵"
+  , "description": "dizzy face"
+  , "aliases": [
+      "dizzy_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😲"
+  , "description": "astonished face"
+  , "aliases": [
+      "astonished"
+    ]
+  , "tags": [
+      "amazed"
+    , "gasp"
+    ]
+  }
+, {
+    "emoji": "😟"
+  , "description": "worried face"
+  , "aliases": [
+      "worried"
+    ]
+  , "tags": [
+      "nervous"
+    ]
+  }
+, {
+    "emoji": "😦"
+  , "description": "frowning face with open mouth"
+  , "aliases": [
+      "frowning"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😧"
+  , "description": "anguished face"
+  , "aliases": [
+      "anguished"
+    ]
+  , "tags": [
+      "stunned"
+    ]
+  }
+, {
+    "emoji": "😈"
+  , "description": "smiling face with horns"
+  , "aliases": [
+      "smiling_imp"
+    ]
+  , "tags": [
+      "devil"
+    , "evil"
+    , "horns"
+    ]
+  }
+, {
+    "emoji": "👿"
+  , "description": "imp"
+  , "aliases": [
+      "imp"
+    ]
+  , "tags": [
+      "angry"
+    , "devil"
+    , "evil"
+    , "horns"
+    ]
+  }
+, {
+    "emoji": "😮"
+  , "description": "face with open mouth"
+  , "aliases": [
+      "open_mouth"
+    ]
+  , "tags": [
+      "surprise"
+    , "impressed"
+    , "wow"
+    ]
+  }
+, {
+    "emoji": "😬"
+  , "description": "grimacing face"
+  , "aliases": [
+      "grimacing"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😐"
+  , "description": "neutral face"
+  , "aliases": [
+      "neutral_face"
+    ]
+  , "tags": [
+      "meh"
+    ]
+  }
+, {
+    "emoji": "😕"
+  , "description": "confused face"
+  , "aliases": [
+      "confused"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😯"
+  , "description": "hushed face"
+  , "aliases": [
+      "hushed"
+    ]
+  , "tags": [
+      "silence"
+    , "speechless"
+    ]
+  }
+, {
+    "emoji": "😶"
+  , "description": "face without mouth"
+  , "aliases": [
+      "no_mouth"
+    ]
+  , "tags": [
+      "mute"
+    , "silence"
+    ]
+  }
+, {
+    "emoji": "😇"
+  , "description": "smiling face with halo"
+  , "aliases": [
+      "innocent"
+    ]
+  , "tags": [
+      "angel"
+    ]
+  }
+, {
+    "emoji": "😏"
+  , "description": "smirking face"
+  , "aliases": [
+      "smirk"
+    ]
+  , "tags": [
+      "smug"
+    ]
+  }
+, {
+    "emoji": "😑"
+  , "description": "expressionless face"
+  , "aliases": [
+      "expressionless"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👲"
+  , "description": "man with gua pi mao"
+  , "aliases": [
+      "man_with_gua_pi_mao"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👳"
+  , "description": "man with turban"
+  , "aliases": [
+      "man_with_turban"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👮"
+  , "description": "police officer"
+  , "aliases": [
+      "cop"
+    ]
+  , "tags": [
+      "police"
+    , "law"
+    ]
+  }
+, {
+    "emoji": "👷"
+  , "description": "construction worker"
+  , "aliases": [
+      "construction_worker"
+    ]
+  , "tags": [
+      "helmet"
+    ]
+  }
+, {
+    "emoji": "💂"
+  , "description": "guardsman"
+  , "aliases": [
+      "guardsman"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👶"
+  , "description": "baby"
+  , "aliases": [
+      "baby"
+    ]
+  , "tags": [
+      "child"
+    , "newborn"
+    ]
+  }
+, {
+    "emoji": "👦"
+  , "description": "boy"
+  , "aliases": [
+      "boy"
+    ]
+  , "tags": [
+      "child"
+    ]
+  }
+, {
+    "emoji": "👧"
+  , "description": "girl"
+  , "aliases": [
+      "girl"
+    ]
+  , "tags": [
+      "child"
+    ]
+  }
+, {
+    "emoji": "👨"
+  , "description": "man"
+  , "aliases": [
+      "man"
+    ]
+  , "tags": [
+      "mustache"
+    , "father"
+    , "dad"
+    ]
+  }
+, {
+    "emoji": "👩"
+  , "description": "woman"
+  , "aliases": [
+      "woman"
+    ]
+  , "tags": [
+      "girls"
+    ]
+  }
+, {
+    "emoji": "👴"
+  , "description": "older man"
+  , "aliases": [
+      "older_man"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👵"
+  , "description": "older woman"
+  , "aliases": [
+      "older_woman"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👱"
+  , "description": "person with blond hair"
+  , "aliases": [
+      "person_with_blond_hair"
+    ]
+  , "tags": [
+      "boy"
+    ]
+  }
+, {
+    "emoji": "👼"
+  , "description": "baby angel"
+  , "aliases": [
+      "angel"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👸"
+  , "description": "princess"
+  , "aliases": [
+      "princess"
+    ]
+  , "tags": [
+      "blonde"
+    , "crown"
+    , "royal"
+    ]
+  }
+, {
+    "emoji": "😺"
+  , "description": "smiling cat face with open mouth"
+  , "aliases": [
+      "smiley_cat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😸"
+  , "description": "grinning cat face with smiling eyes"
+  , "aliases": [
+      "smile_cat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😻"
+  , "description": "smiling cat face with heart-shaped eyes"
+  , "aliases": [
+      "heart_eyes_cat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😽"
+  , "description": "kissing cat face with closed eyes"
+  , "aliases": [
+      "kissing_cat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😼"
+  , "description": "cat face with wry smile"
+  , "aliases": [
+      "smirk_cat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙀"
+  , "description": "weary cat face"
+  , "aliases": [
+      "scream_cat"
+    ]
+  , "tags": [
+      "horror"
+    ]
+  }
+, {
+    "emoji": "😿"
+  , "description": "crying cat face"
+  , "aliases": [
+      "crying_cat_face"
+    ]
+  , "tags": [
+      "sad"
+    , "tear"
+    ]
+  }
+, {
+    "emoji": "😹"
+  , "description": "cat face with tears of joy"
+  , "aliases": [
+      "joy_cat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "😾"
+  , "description": "pouting cat face"
+  , "aliases": [
+      "pouting_cat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👹"
+  , "description": "japanese ogre"
+  , "aliases": [
+      "japanese_ogre"
+    ]
+  , "tags": [
+      "monster"
+    ]
+  }
+, {
+    "emoji": "👺"
+  , "description": "japanese goblin"
+  , "aliases": [
+      "japanese_goblin"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙈"
+  , "description": "see-no-evil monkey"
+  , "aliases": [
+      "see_no_evil"
+    ]
+  , "tags": [
+      "monkey"
+    , "blind"
+    , "ignore"
+    ]
+  }
+, {
+    "emoji": "🙉"
+  , "description": "hear-no-evil monkey"
+  , "aliases": [
+      "hear_no_evil"
+    ]
+  , "tags": [
+      "monkey"
+    , "deaf"
+    ]
+  }
+, {
+    "emoji": "🙊"
+  , "description": "speak-no-evil monkey"
+  , "aliases": [
+      "speak_no_evil"
+    ]
+  , "tags": [
+      "monkey"
+    , "mute"
+    , "hush"
+    ]
+  }
+, {
+    "emoji": "💀"
+  , "description": "skull"
+  , "aliases": [
+      "skull"
+    ]
+  , "tags": [
+      "dead"
+    , "danger"
+    , "poison"
+    ]
+  }
+, {
+    "emoji": "👽"
+  , "description": "extraterrestrial alien"
+  , "aliases": [
+      "alien"
+    ]
+  , "tags": [
+      "ufo"
+    ]
+  }
+, {
+    "emoji": "💩"
+  , "description": "pile of poo"
+  , "aliases": [
+      "hankey"
+    , "poop"
+    , "shit"
+    ]
+  , "tags": [
+      "crap"
+    ]
+  }
+, {
+    "emoji": "🔥"
+  , "description": "fire"
+  , "aliases": [
+      "fire"
+    ]
+  , "tags": [
+      "burn"
+    ]
+  }
+, {
+    "emoji": "✨"
+  , "description": "sparkles"
+  , "aliases": [
+      "sparkles"
+    ]
+  , "tags": [
+      "shiny"
+    ]
+  }
+, {
+    "emoji": "🌟"
+  , "description": "glowing star"
+  , "aliases": [
+      "star2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💫"
+  , "description": "dizzy symbol"
+  , "aliases": [
+      "dizzy"
+    ]
+  , "tags": [
+      "star"
+    ]
+  }
+, {
+    "emoji": "💥"
+  , "description": "collision symbol"
+  , "aliases": [
+      "boom"
+    , "collision"
+    ]
+  , "tags": [
+      "explode"
+    ]
+  }
+, {
+    "emoji": "💢"
+  , "description": "anger symbol"
+  , "aliases": [
+      "anger"
+    ]
+  , "tags": [
+      "angry"
+    ]
+  }
+, {
+    "emoji": "💦"
+  , "description": "splashing sweat symbol"
+  , "aliases": [
+      "sweat_drops"
+    ]
+  , "tags": [
+      "water"
+    , "workout"
+    ]
+  }
+, {
+    "emoji": "💧"
+  , "description": "droplet"
+  , "aliases": [
+      "droplet"
+    ]
+  , "tags": [
+      "water"
+    ]
+  }
+, {
+    "emoji": "💤"
+  , "description": "sleeping symbol"
+  , "aliases": [
+      "zzz"
+    ]
+  , "tags": [
+      "sleeping"
+    ]
+  }
+, {
+    "emoji": "💨"
+  , "description": "dash symbol"
+  , "aliases": [
+      "dash"
+    ]
+  , "tags": [
+      "wind"
+    , "blow"
+    , "fast"
+    ]
+  }
+, {
+    "emoji": "👂"
+  , "description": "ear"
+  , "aliases": [
+      "ear"
+    ]
+  , "tags": [
+      "hear"
+    , "sound"
+    , "listen"
+    ]
+  }
+, {
+    "emoji": "👀"
+  , "description": "eyes"
+  , "aliases": [
+      "eyes"
+    ]
+  , "tags": [
+      "look"
+    , "see"
+    , "watch"
+    ]
+  }
+, {
+    "emoji": "👃"
+  , "description": "nose"
+  , "aliases": [
+      "nose"
+    ]
+  , "tags": [
+      "smell"
+    ]
+  }
+, {
+    "emoji": "👅"
+  , "description": "tongue"
+  , "aliases": [
+      "tongue"
+    ]
+  , "tags": [
+      "taste"
+    ]
+  }
+, {
+    "emoji": "👄"
+  , "description": "mouth"
+  , "aliases": [
+      "lips"
+    ]
+  , "tags": [
+      "kiss"
+    ]
+  }
+, {
+    "emoji": "👍"
+  , "description": "thumbs up sign"
+  , "aliases": [
+      "+1"
+    , "thumbsup"
+    ]
+  , "tags": [
+      "approve"
+    , "ok"
+    ]
+  }
+, {
+    "emoji": "👎"
+  , "description": "thumbs down sign"
+  , "aliases": [
+      "-1"
+    , "thumbsdown"
+    ]
+  , "tags": [
+      "disapprove"
+    , "bury"
+    ]
+  }
+, {
+    "emoji": "👌"
+  , "description": "ok hand sign"
+  , "aliases": [
+      "ok_hand"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👊"
+  , "description": "fisted hand sign"
+  , "aliases": [
+      "facepunch"
+    , "punch"
+    ]
+  , "tags": [
+      "attack"
+    ]
+  }
+, {
+    "emoji": "✊"
+  , "description": "raised fist"
+  , "aliases": [
+      "fist"
+    ]
+  , "tags": [
+      "power"
+    ]
+  }
+, {
+    "emoji": "✌️"
+  , "description": "victory hand"
+  , "aliases": [
+      "v"
+    ]
+  , "tags": [
+      "victory"
+    , "peace"
+    ]
+  }
+, {
+    "emoji": "👋"
+  , "description": "waving hand sign"
+  , "aliases": [
+      "wave"
+    ]
+  , "tags": [
+      "goodbye"
+    ]
+  }
+, {
+    "emoji": "✋"
+  , "description": "raised hand"
+  , "aliases": [
+      "hand"
+    , "raised_hand"
+    ]
+  , "tags": [
+      "highfive"
+    , "stop"
+    ]
+  }
+, {
+    "emoji": "👐"
+  , "description": "open hands sign"
+  , "aliases": [
+      "open_hands"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👆"
+  , "description": "white up pointing backhand index"
+  , "aliases": [
+      "point_up_2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👇"
+  , "description": "white down pointing backhand index"
+  , "aliases": [
+      "point_down"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👉"
+  , "description": "white right pointing backhand index"
+  , "aliases": [
+      "point_right"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👈"
+  , "description": "white left pointing backhand index"
+  , "aliases": [
+      "point_left"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙌"
+  , "description": "person raising both hands in celebration"
+  , "aliases": [
+      "raised_hands"
+    ]
+  , "tags": [
+      "hooray"
+    ]
+  }
+, {
+    "emoji": "🙏"
+  , "description": "person with folded hands"
+  , "aliases": [
+      "pray"
+    ]
+  , "tags": [
+      "please"
+    , "hope"
+    , "wish"
+    ]
+  }
+, {
+    "emoji": "☝️"
+  , "description": "white up pointing index"
+  , "aliases": [
+      "point_up"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👏"
+  , "description": "clapping hands sign"
+  , "aliases": [
+      "clap"
+    ]
+  , "tags": [
+      "praise"
+    , "applause"
+    ]
+  }
+, {
+    "emoji": "💪"
+  , "description": "flexed biceps"
+  , "aliases": [
+      "muscle"
+    ]
+  , "tags": [
+      "flex"
+    , "bicep"
+    , "strong"
+    , "workout"
+    ]
+  }
+, {
+    "emoji": "🚶"
+  , "description": "pedestrian"
+  , "aliases": [
+      "walking"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏃"
+  , "description": "runner"
+  , "aliases": [
+      "runner"
+    , "running"
+    ]
+  , "tags": [
+      "exercise"
+    , "workout"
+    , "marathon"
+    ]
+  }
+, {
+    "emoji": "💃"
+  , "description": "dancer"
+  , "aliases": [
+      "dancer"
+    ]
+  , "tags": [
+      "dress"
+    ]
+  }
+, {
+    "emoji": "👫"
+  , "description": "man and woman holding hands"
+  , "aliases": [
+      "couple"
+    ]
+  , "tags": [
+      "date"
+    ]
+  }
+, {
+    "emoji": "👪"
+  , "description": "family"
+  , "aliases": [
+      "family"
+    ]
+  , "tags": [
+      "home"
+    , "parents"
+    , "child"
+    ]
+  }
+, {
+    "emoji": "👬"
+  , "description": "two men holding hands"
+  , "aliases": [
+      "two_men_holding_hands"
+    ]
+  , "tags": [
+      "couple"
+    , "date"
+    ]
+  }
+, {
+    "emoji": "👭"
+  , "description": "two women holding hands"
+  , "aliases": [
+      "two_women_holding_hands"
+    ]
+  , "tags": [
+      "couple"
+    , "date"
+    ]
+  }
+, {
+    "emoji": "💏"
+  , "description": "kiss"
+  , "aliases": [
+      "couplekiss"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💑"
+  , "description": "couple with heart"
+  , "aliases": [
+      "couple_with_heart"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👯"
+  , "description": "woman with bunny ears"
+  , "aliases": [
+      "dancers"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  }
+, {
+    "emoji": "🙆"
+  , "description": "face with ok gesture"
+  , "aliases": [
+      "ok_woman"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙅"
+  , "description": "face with no good gesture"
+  , "aliases": [
+      "no_good"
+    ]
+  , "tags": [
+      "stop"
+    , "halt"
+    ]
+  }
+, {
+    "emoji": "💁"
+  , "description": "information desk person"
+  , "aliases": [
+      "information_desk_person"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙋"
+  , "description": "happy person raising one hand"
+  , "aliases": [
+      "raising_hand"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💆"
+  , "description": "face massage"
+  , "aliases": [
+      "massage"
+    ]
+  , "tags": [
+      "spa"
+    ]
+  }
+, {
+    "emoji": "💇"
+  , "description": "haircut"
+  , "aliases": [
+      "haircut"
+    ]
+  , "tags": [
+      "beauty"
+    ]
+  }
+, {
+    "emoji": "💅"
+  , "description": "nail polish"
+  , "aliases": [
+      "nail_care"
+    ]
+  , "tags": [
+      "beauty"
+    , "manicure"
+    ]
+  }
+, {
+    "emoji": "👰"
+  , "description": "bride with veil"
+  , "aliases": [
+      "bride_with_veil"
+    ]
+  , "tags": [
+      "marriage"
+    , "wedding"
+    ]
+  }
+, {
+    "emoji": "🙎"
+  , "description": "person with pouting face"
+  , "aliases": [
+      "person_with_pouting_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🙍"
+  , "description": "person frowning"
+  , "aliases": [
+      "person_frowning"
+    ]
+  , "tags": [
+      "sad"
+    ]
+  }
+, {
+    "emoji": "🙇"
+  , "description": "person bowing deeply"
+  , "aliases": [
+      "bow"
+    ]
+  , "tags": [
+      "respect"
+    , "thanks"
+    ]
+  }
+, {
+    "emoji": "🎩"
+  , "description": "top hat"
+  , "aliases": [
+      "tophat"
+    ]
+  , "tags": [
+      "hat"
+    , "classy"
+    ]
+  }
+, {
+    "emoji": "👑"
+  , "description": "crown"
+  , "aliases": [
+      "crown"
+    ]
+  , "tags": [
+      "king"
+    , "queen"
+    , "royal"
+    ]
+  }
+, {
+    "emoji": "👒"
+  , "description": "womans hat"
+  , "aliases": [
+      "womans_hat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👟"
+  , "description": "athletic shoe"
+  , "aliases": [
+      "athletic_shoe"
+    ]
+  , "tags": [
+      "sneaker"
+    , "sport"
+    , "running"
+    ]
+  }
+, {
+    "emoji": "👞"
+  , "description": "mans shoe"
+  , "aliases": [
+      "mans_shoe"
+    , "shoe"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👡"
+  , "description": "womans sandal"
+  , "aliases": [
+      "sandal"
+    ]
+  , "tags": [
+      "shoe"
+    ]
+  }
+, {
+    "emoji": "👠"
+  , "description": "high-heeled shoe"
+  , "aliases": [
+      "high_heel"
+    ]
+  , "tags": [
+      "shoe"
+    ]
+  }
+, {
+    "emoji": "👢"
+  , "description": "womans boots"
+  , "aliases": [
+      "boot"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👕"
+  , "description": "t-shirt"
+  , "aliases": [
+      "shirt"
+    , "tshirt"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👔"
+  , "description": "necktie"
+  , "aliases": [
+      "necktie"
+    ]
+  , "tags": [
+      "shirt"
+    , "formal"
+    ]
+  }
+, {
+    "emoji": "👚"
+  , "description": "womans clothes"
+  , "aliases": [
+      "womans_clothes"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👗"
+  , "description": "dress"
+  , "aliases": [
+      "dress"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎽"
+  , "description": "running shirt with sash"
+  , "aliases": [
+      "running_shirt_with_sash"
+    ]
+  , "tags": [
+      "marathon"
+    ]
+  }
+, {
+    "emoji": "👖"
+  , "description": "jeans"
+  , "aliases": [
+      "jeans"
+    ]
+  , "tags": [
+      "pants"
+    ]
+  }
+, {
+    "emoji": "👘"
+  , "description": "kimono"
+  , "aliases": [
+      "kimono"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👙"
+  , "description": "bikini"
+  , "aliases": [
+      "bikini"
+    ]
+  , "tags": [
+      "beach"
+    ]
+  }
+, {
+    "emoji": "💼"
+  , "description": "briefcase"
+  , "aliases": [
+      "briefcase"
+    ]
+  , "tags": [
+      "business"
+    ]
+  }
+, {
+    "emoji": "👜"
+  , "description": "handbag"
+  , "aliases": [
+      "handbag"
+    ]
+  , "tags": [
+      "bag"
+    ]
+  }
+, {
+    "emoji": "👝"
+  , "description": "pouch"
+  , "aliases": [
+      "pouch"
+    ]
+  , "tags": [
+      "bag"
+    ]
+  }
+, {
+    "emoji": "👛"
+  , "description": "purse"
+  , "aliases": [
+      "purse"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "👓"
+  , "description": "eyeglasses"
+  , "aliases": [
+      "eyeglasses"
+    ]
+  , "tags": [
+      "glasses"
+    ]
+  }
+, {
+    "emoji": "🎀"
+  , "description": "ribbon"
+  , "aliases": [
+      "ribbon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌂"
+  , "description": "closed umbrella"
+  , "aliases": [
+      "closed_umbrella"
+    ]
+  , "tags": [
+      "weather"
+    , "rain"
+    ]
+  }
+, {
+    "emoji": "💄"
+  , "description": "lipstick"
+  , "aliases": [
+      "lipstick"
+    ]
+  , "tags": [
+      "makeup"
+    ]
+  }
+, {
+    "emoji": "💛"
+  , "description": "yellow heart"
+  , "aliases": [
+      "yellow_heart"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💙"
+  , "description": "blue heart"
+  , "aliases": [
+      "blue_heart"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💜"
+  , "description": "purple heart"
+  , "aliases": [
+      "purple_heart"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💚"
+  , "description": "green heart"
+  , "aliases": [
+      "green_heart"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "❤️"
+  , "description": "heavy black heart"
+  , "aliases": [
+      "heart"
+    ]
+  , "tags": [
+      "love"
+    ]
+  }
+, {
+    "emoji": "💔"
+  , "description": "broken heart"
+  , "aliases": [
+      "broken_heart"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💗"
+  , "description": "growing heart"
+  , "aliases": [
+      "heartpulse"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💓"
+  , "description": "beating heart"
+  , "aliases": [
+      "heartbeat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💕"
+  , "description": "two hearts"
+  , "aliases": [
+      "two_hearts"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💖"
+  , "description": "sparkling heart"
+  , "aliases": [
+      "sparkling_heart"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💞"
+  , "description": "revolving hearts"
+  , "aliases": [
+      "revolving_hearts"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💘"
+  , "description": "heart with arrow"
+  , "aliases": [
+      "cupid"
+    ]
+  , "tags": [
+      "love"
+    , "heart"
+    ]
+  }
+, {
+    "emoji": "💌"
+  , "description": "love letter"
+  , "aliases": [
+      "love_letter"
+    ]
+  , "tags": [
+      "email"
+    , "envelope"
+    ]
+  }
+, {
+    "emoji": "💋"
+  , "description": "kiss mark"
+  , "aliases": [
+      "kiss"
+    ]
+  , "tags": [
+      "lipstick"
+    ]
+  }
+, {
+    "emoji": "💍"
+  , "description": "ring"
+  , "aliases": [
+      "ring"
+    ]
+  , "tags": [
+      "wedding"
+    , "marriage"
+    , "engaged"
+    ]
+  }
+, {
+    "emoji": "💎"
+  , "description": "gem stone"
+  , "aliases": [
+      "gem"
+    ]
+  , "tags": [
+      "diamond"
+    ]
+  }
+, {
+    "emoji": "👤"
+  , "description": "bust in silhouette"
+  , "aliases": [
+      "bust_in_silhouette"
+    ]
+  , "tags": [
+      "user"
+    ]
+  }
+, {
+    "emoji": "👥"
+  , "description": "busts in silhouette"
+  , "aliases": [
+      "busts_in_silhouette"
+    ]
+  , "tags": [
+      "users"
+    , "group"
+    , "team"
+    ]
+  }
+, {
+    "emoji": "💬"
+  , "description": "speech balloon"
+  , "aliases": [
+      "speech_balloon"
+    ]
+  , "tags": [
+      "comment"
+    ]
+  }
+, {
+    "emoji": "👣"
+  , "description": "footprints"
+  , "aliases": [
+      "footprints"
+    ]
+  , "tags": [
+      "feet"
+    , "tracks"
+    ]
+  }
+, {
+    "emoji": "💭"
+  , "description": "thought balloon"
+  , "aliases": [
+      "thought_balloon"
+    ]
+  , "tags": [
+      "thinking"
+    ]
+  }
+, {
+    "emoji": "🐶"
+  , "description": "dog face"
+  , "aliases": [
+      "dog"
+    ]
+  , "tags": [
+      "pet"
+    ]
+  }
+, {
+    "emoji": "🐺"
+  , "description": "wolf face"
+  , "aliases": [
+      "wolf"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐱"
+  , "description": "cat face"
+  , "aliases": [
+      "cat"
+    ]
+  , "tags": [
+      "pet"
+    ]
+  }
+, {
+    "emoji": "🐭"
+  , "description": "mouse face"
+  , "aliases": [
+      "mouse"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐹"
+  , "description": "hamster face"
+  , "aliases": [
+      "hamster"
+    ]
+  , "tags": [
+      "pet"
+    ]
+  }
+, {
+    "emoji": "🐰"
+  , "description": "rabbit face"
+  , "aliases": [
+      "rabbit"
+    ]
+  , "tags": [
+      "bunny"
+    ]
+  }
+, {
+    "emoji": "🐸"
+  , "description": "frog face"
+  , "aliases": [
+      "frog"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐯"
+  , "description": "tiger face"
+  , "aliases": [
+      "tiger"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐨"
+  , "description": "koala"
+  , "aliases": [
+      "koala"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐻"
+  , "description": "bear face"
+  , "aliases": [
+      "bear"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐷"
+  , "description": "pig face"
+  , "aliases": [
+      "pig"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐽"
+  , "description": "pig nose"
+  , "aliases": [
+      "pig_nose"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐮"
+  , "description": "cow face"
+  , "aliases": [
+      "cow"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐗"
+  , "description": "boar"
+  , "aliases": [
+      "boar"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐵"
+  , "description": "monkey face"
+  , "aliases": [
+      "monkey_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐒"
+  , "description": "monkey"
+  , "aliases": [
+      "monkey"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐴"
+  , "description": "horse face"
+  , "aliases": [
+      "horse"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐑"
+  , "description": "sheep"
+  , "aliases": [
+      "sheep"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐘"
+  , "description": "elephant"
+  , "aliases": [
+      "elephant"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐼"
+  , "description": "panda face"
+  , "aliases": [
+      "panda_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐧"
+  , "description": "penguin"
+  , "aliases": [
+      "penguin"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐦"
+  , "description": "bird"
+  , "aliases": [
+      "bird"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐤"
+  , "description": "baby chick"
+  , "aliases": [
+      "baby_chick"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐥"
+  , "description": "front-facing baby chick"
+  , "aliases": [
+      "hatched_chick"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐣"
+  , "description": "hatching chick"
+  , "aliases": [
+      "hatching_chick"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐔"
+  , "description": "chicken"
+  , "aliases": [
+      "chicken"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐍"
+  , "description": "snake"
+  , "aliases": [
+      "snake"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐢"
+  , "description": "turtle"
+  , "aliases": [
+      "turtle"
+    ]
+  , "tags": [
+      "slow"
+    ]
+  }
+, {
+    "emoji": "🐛"
+  , "description": "bug"
+  , "aliases": [
+      "bug"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐝"
+  , "description": "honeybee"
+  , "aliases": [
+      "bee"
+    , "honeybee"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐜"
+  , "description": "ant"
+  , "aliases": [
+      "ant"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐞"
+  , "description": "lady beetle"
+  , "aliases": [
+      "beetle"
+    ]
+  , "tags": [
+      "bug"
+    ]
+  }
+, {
+    "emoji": "🐌"
+  , "description": "snail"
+  , "aliases": [
+      "snail"
+    ]
+  , "tags": [
+      "slow"
+    ]
+  }
+, {
+    "emoji": "🐙"
+  , "description": "octopus"
+  , "aliases": [
+      "octopus"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐚"
+  , "description": "spiral shell"
+  , "aliases": [
+      "shell"
+    ]
+  , "tags": [
+      "sea"
+    , "beach"
+    ]
+  }
+, {
+    "emoji": "🐠"
+  , "description": "tropical fish"
+  , "aliases": [
+      "tropical_fish"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐟"
+  , "description": "fish"
+  , "aliases": [
+      "fish"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐬"
+  , "description": "dolphin"
+  , "aliases": [
+      "dolphin"
+    , "flipper"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐳"
+  , "description": "spouting whale"
+  , "aliases": [
+      "whale"
+    ]
+  , "tags": [
+      "sea"
+    ]
+  }
+, {
+    "emoji": "🐋"
+  , "description": "whale"
+  , "aliases": [
+      "whale2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐄"
+  , "description": "cow"
+  , "aliases": [
+      "cow2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐏"
+  , "description": "ram"
+  , "aliases": [
+      "ram"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐀"
+  , "description": "rat"
+  , "aliases": [
+      "rat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐃"
+  , "description": "water buffalo"
+  , "aliases": [
+      "water_buffalo"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐅"
+  , "description": "tiger"
+  , "aliases": [
+      "tiger2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐇"
+  , "description": "rabbit"
+  , "aliases": [
+      "rabbit2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐉"
+  , "description": "dragon"
+  , "aliases": [
+      "dragon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐎"
+  , "description": "horse"
+  , "aliases": [
+      "racehorse"
+    ]
+  , "tags": [
+      "speed"
+    ]
+  }
+, {
+    "emoji": "🐐"
+  , "description": "goat"
+  , "aliases": [
+      "goat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐓"
+  , "description": "rooster"
+  , "aliases": [
+      "rooster"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐕"
+  , "description": "dog"
+  , "aliases": [
+      "dog2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐖"
+  , "description": "pig"
+  , "aliases": [
+      "pig2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐁"
+  , "description": "mouse"
+  , "aliases": [
+      "mouse2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐂"
+  , "description": "ox"
+  , "aliases": [
+      "ox"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐲"
+  , "description": "dragon face"
+  , "aliases": [
+      "dragon_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐡"
+  , "description": "blowfish"
+  , "aliases": [
+      "blowfish"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐊"
+  , "description": "crocodile"
+  , "aliases": [
+      "crocodile"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐫"
+  , "description": "bactrian camel"
+  , "aliases": [
+      "camel"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐪"
+  , "description": "dromedary camel"
+  , "aliases": [
+      "dromedary_camel"
+    ]
+  , "tags": [
+      "desert"
+    ]
+  }
+, {
+    "emoji": "🐆"
+  , "description": "leopard"
+  , "aliases": [
+      "leopard"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐈"
+  , "description": "cat"
+  , "aliases": [
+      "cat2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🐩"
+  , "description": "poodle"
+  , "aliases": [
+      "poodle"
+    ]
+  , "tags": [
+      "dog"
+    ]
+  }
+, {
+    "emoji": "🐾"
+  , "description": "paw prints"
+  , "aliases": [
+      "feet"
+    , "paw_prints"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💐"
+  , "description": "bouquet"
+  , "aliases": [
+      "bouquet"
+    ]
+  , "tags": [
+      "flowers"
+    ]
+  }
+, {
+    "emoji": "🌸"
+  , "description": "cherry blossom"
+  , "aliases": [
+      "cherry_blossom"
+    ]
+  , "tags": [
+      "flower"
+    , "spring"
+    ]
+  }
+, {
+    "emoji": "🌷"
+  , "description": "tulip"
+  , "aliases": [
+      "tulip"
+    ]
+  , "tags": [
+      "flower"
+    ]
+  }
+, {
+    "emoji": "🍀"
+  , "description": "four leaf clover"
+  , "aliases": [
+      "four_leaf_clover"
+    ]
+  , "tags": [
+      "luck"
+    ]
+  }
+, {
+    "emoji": "🌹"
+  , "description": "rose"
+  , "aliases": [
+      "rose"
+    ]
+  , "tags": [
+      "flower"
+    ]
+  }
+, {
+    "emoji": "🌻"
+  , "description": "sunflower"
+  , "aliases": [
+      "sunflower"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌺"
+  , "description": "hibiscus"
+  , "aliases": [
+      "hibiscus"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍁"
+  , "description": "maple leaf"
+  , "aliases": [
+      "maple_leaf"
+    ]
+  , "tags": [
+      "canada"
+    ]
+  }
+, {
+    "emoji": "🍃"
+  , "description": "leaf fluttering in wind"
+  , "aliases": [
+      "leaves"
+    ]
+  , "tags": [
+      "leaf"
+    ]
+  }
+, {
+    "emoji": "🍂"
+  , "description": "fallen leaf"
+  , "aliases": [
+      "fallen_leaf"
+    ]
+  , "tags": [
+      "autumn"
+    ]
+  }
+, {
+    "emoji": "🌿"
+  , "description": "herb"
+  , "aliases": [
+      "herb"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌾"
+  , "description": "ear of rice"
+  , "aliases": [
+      "ear_of_rice"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍄"
+  , "description": "mushroom"
+  , "aliases": [
+      "mushroom"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌵"
+  , "description": "cactus"
+  , "aliases": [
+      "cactus"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌴"
+  , "description": "palm tree"
+  , "aliases": [
+      "palm_tree"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌲"
+  , "description": "evergreen tree"
+  , "aliases": [
+      "evergreen_tree"
+    ]
+  , "tags": [
+      "wood"
+    ]
+  }
+, {
+    "emoji": "🌳"
+  , "description": "deciduous tree"
+  , "aliases": [
+      "deciduous_tree"
+    ]
+  , "tags": [
+      "wood"
+    ]
+  }
+, {
+    "emoji": "🌰"
+  , "description": "chestnut"
+  , "aliases": [
+      "chestnut"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌱"
+  , "description": "seedling"
+  , "aliases": [
+      "seedling"
+    ]
+  , "tags": [
+      "plant"
+    ]
+  }
+, {
+    "emoji": "🌼"
+  , "description": "blossom"
+  , "aliases": [
+      "blossom"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌐"
+  , "description": "globe with meridians"
+  , "aliases": [
+      "globe_with_meridians"
+    ]
+  , "tags": [
+      "world"
+    , "global"
+    , "international"
+    ]
+  }
+, {
+    "emoji": "🌞"
+  , "description": "sun with face"
+  , "aliases": [
+      "sun_with_face"
+    ]
+  , "tags": [
+      "summer"
+    ]
+  }
+, {
+    "emoji": "🌝"
+  , "description": "full moon with face"
+  , "aliases": [
+      "full_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌚"
+  , "description": "new moon with face"
+  , "aliases": [
+      "new_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌑"
+  , "description": "new moon symbol"
+  , "aliases": [
+      "new_moon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌒"
+  , "description": "waxing crescent moon symbol"
+  , "aliases": [
+      "waxing_crescent_moon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌓"
+  , "description": "first quarter moon symbol"
+  , "aliases": [
+      "first_quarter_moon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌔"
+  , "description": "waxing gibbous moon symbol"
+  , "aliases": [
+      "moon"
+    , "waxing_gibbous_moon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌕"
+  , "description": "full moon symbol"
+  , "aliases": [
+      "full_moon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌖"
+  , "description": "waning gibbous moon symbol"
+  , "aliases": [
+      "waning_gibbous_moon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌗"
+  , "description": "last quarter moon symbol"
+  , "aliases": [
+      "last_quarter_moon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌘"
+  , "description": "waning crescent moon symbol"
+  , "aliases": [
+      "waning_crescent_moon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌜"
+  , "description": "last quarter moon with face"
+  , "aliases": [
+      "last_quarter_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌛"
+  , "description": "first quarter moon with face"
+  , "aliases": [
+      "first_quarter_moon_with_face"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌙"
+  , "description": "crescent moon"
+  , "aliases": [
+      "crescent_moon"
+    ]
+  , "tags": [
+      "night"
+    ]
+  }
+, {
+    "emoji": "🌍"
+  , "description": "earth globe europe-africa"
+  , "aliases": [
+      "earth_africa"
+    ]
+  , "tags": [
+      "globe"
+    , "world"
+    , "international"
+    ]
+  }
+, {
+    "emoji": "🌎"
+  , "description": "earth globe americas"
+  , "aliases": [
+      "earth_americas"
+    ]
+  , "tags": [
+      "globe"
+    , "world"
+    , "international"
+    ]
+  }
+, {
+    "emoji": "🌏"
+  , "description": "earth globe asia-australia"
+  , "aliases": [
+      "earth_asia"
+    ]
+  , "tags": [
+      "globe"
+    , "world"
+    , "international"
+    ]
+  }
+, {
+    "emoji": "🌋"
+  , "description": "volcano"
+  , "aliases": [
+      "volcano"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌌"
+  , "description": "milky way"
+  , "aliases": [
+      "milky_way"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌠"
+  , "description": "shooting star"
+  , "aliases": [
+      "stars"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⭐"
+  , "description": "white medium star"
+  , "aliases": [
+      "star"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "☀️"
+  , "description": "black sun with rays"
+  , "aliases": [
+      "sunny"
+    ]
+  , "tags": [
+      "weather"
+    ]
+  }
+, {
+    "emoji": "⛅"
+  , "description": "sun behind cloud"
+  , "aliases": [
+      "partly_sunny"
+    ]
+  , "tags": [
+      "weather"
+    , "cloud"
+    ]
+  }
+, {
+    "emoji": "☁️"
+  , "description": "cloud"
+  , "aliases": [
+      "cloud"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⚡"
+  , "description": "high voltage sign"
+  , "aliases": [
+      "zap"
+    ]
+  , "tags": [
+      "lightning"
+    , "thunder"
+    ]
+  }
+, {
+    "emoji": "☔"
+  , "description": "umbrella with rain drops"
+  , "aliases": [
+      "umbrella"
+    ]
+  , "tags": [
+      "rain"
+    , "weather"
+    ]
+  }
+, {
+    "emoji": "❄️"
+  , "description": "snowflake"
+  , "aliases": [
+      "snowflake"
+    ]
+  , "tags": [
+      "winter"
+    , "cold"
+    , "weather"
+    ]
+  }
+, {
+    "emoji": "⛄"
+  , "description": "snowman without snow"
+  , "aliases": [
+      "snowman"
+    ]
+  , "tags": [
+      "winter"
+    , "christmas"
+    ]
+  }
+, {
+    "emoji": "🌀"
+  , "description": "cyclone"
+  , "aliases": [
+      "cyclone"
+    ]
+  , "tags": [
+      "swirl"
+    ]
+  }
+, {
+    "emoji": "🌁"
+  , "description": "foggy"
+  , "aliases": [
+      "foggy"
+    ]
+  , "tags": [
+      "karl"
+    ]
+  }
+, {
+    "emoji": "🌈"
+  , "description": "rainbow"
+  , "aliases": [
+      "rainbow"
+    ]
+  , "tags": [
+      "pride"
+    ]
+  }
+, {
+    "emoji": "🌊"
+  , "description": "water wave"
+  , "aliases": [
+      "ocean"
+    ]
+  , "tags": [
+      "sea"
+    ]
+  }
+, {
+    "emoji": "🎍"
+  , "description": "pine decoration"
+  , "aliases": [
+      "bamboo"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💝"
+  , "description": "heart with ribbon"
+  , "aliases": [
+      "gift_heart"
+    ]
+  , "tags": [
+      "chocolates"
+    ]
+  }
+, {
+    "emoji": "🎎"
+  , "description": "japanese dolls"
+  , "aliases": [
+      "dolls"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎒"
+  , "description": "school satchel"
+  , "aliases": [
+      "school_satchel"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎓"
+  , "description": "graduation cap"
+  , "aliases": [
+      "mortar_board"
+    ]
+  , "tags": [
+      "education"
+    , "college"
+    , "university"
+    , "graduation"
+    ]
+  }
+, {
+    "emoji": "🎏"
+  , "description": "carp streamer"
+  , "aliases": [
+      "flags"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎆"
+  , "description": "fireworks"
+  , "aliases": [
+      "fireworks"
+    ]
+  , "tags": [
+      "festival"
+    , "celebration"
+    ]
+  }
+, {
+    "emoji": "🎇"
+  , "description": "firework sparkler"
+  , "aliases": [
+      "sparkler"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎐"
+  , "description": "wind chime"
+  , "aliases": [
+      "wind_chime"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎑"
+  , "description": "moon viewing ceremony"
+  , "aliases": [
+      "rice_scene"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎃"
+  , "description": "jack-o-lantern"
+  , "aliases": [
+      "jack_o_lantern"
+    ]
+  , "tags": [
+      "halloween"
+    ]
+  }
+, {
+    "emoji": "👻"
+  , "description": "ghost"
+  , "aliases": [
+      "ghost"
+    ]
+  , "tags": [
+      "halloween"
+    ]
+  }
+, {
+    "emoji": "🎅"
+  , "description": "father christmas"
+  , "aliases": [
+      "santa"
+    ]
+  , "tags": [
+      "christmas"
+    ]
+  }
+, {
+    "emoji": "🎄"
+  , "description": "christmas tree"
+  , "aliases": [
+      "christmas_tree"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎁"
+  , "description": "wrapped present"
+  , "aliases": [
+      "gift"
+    ]
+  , "tags": [
+      "present"
+    , "birthday"
+    , "christmas"
+    ]
+  }
+, {
+    "emoji": "🎋"
+  , "description": "tanabata tree"
+  , "aliases": [
+      "tanabata_tree"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎉"
+  , "description": "party popper"
+  , "aliases": [
+      "tada"
+    ]
+  , "tags": [
+      "party"
+    ]
+  }
+, {
+    "emoji": "🎊"
+  , "description": "confetti ball"
+  , "aliases": [
+      "confetti_ball"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎈"
+  , "description": "balloon"
+  , "aliases": [
+      "balloon"
+    ]
+  , "tags": [
+      "party"
+    , "birthday"
+    ]
+  }
+, {
+    "emoji": "🎌"
+  , "description": "crossed flags"
+  , "aliases": [
+      "crossed_flags"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔮"
+  , "description": "crystal ball"
+  , "aliases": [
+      "crystal_ball"
+    ]
+  , "tags": [
+      "fortune"
+    ]
+  }
+, {
+    "emoji": "🎥"
+  , "description": "movie camera"
+  , "aliases": [
+      "movie_camera"
+    ]
+  , "tags": [
+      "film"
+    , "video"
+    ]
+  }
+, {
+    "emoji": "📷"
+  , "description": "camera"
+  , "aliases": [
+      "camera"
+    ]
+  , "tags": [
+      "photo"
+    ]
+  }
+, {
+    "emoji": "📹"
+  , "description": "video camera"
+  , "aliases": [
+      "video_camera"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📼"
+  , "description": "videocassette"
+  , "aliases": [
+      "vhs"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💿"
+  , "description": "optical disc"
+  , "aliases": [
+      "cd"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📀"
+  , "description": "dvd"
+  , "aliases": [
+      "dvd"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💽"
+  , "description": "minidisc"
+  , "aliases": [
+      "minidisc"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💾"
+  , "description": "floppy disk"
+  , "aliases": [
+      "floppy_disk"
+    ]
+  , "tags": [
+      "save"
+    ]
+  }
+, {
+    "emoji": "💻"
+  , "description": "personal computer"
+  , "aliases": [
+      "computer"
+    ]
+  , "tags": [
+      "desktop"
+    , "screen"
+    ]
+  }
+, {
+    "emoji": "📱"
+  , "description": "mobile phone"
+  , "aliases": [
+      "iphone"
+    ]
+  , "tags": [
+      "smartphone"
+    , "mobile"
+    ]
+  }
+, {
+    "emoji": "☎️"
+  , "description": "black telephone"
+  , "aliases": [
+      "phone"
+    , "telephone"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📞"
+  , "description": "telephone receiver"
+  , "aliases": [
+      "telephone_receiver"
+    ]
+  , "tags": [
+      "phone"
+    , "call"
+    ]
+  }
+, {
+    "emoji": "📟"
+  , "description": "pager"
+  , "aliases": [
+      "pager"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📠"
+  , "description": "fax machine"
+  , "aliases": [
+      "fax"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📡"
+  , "description": "satellite antenna"
+  , "aliases": [
+      "satellite"
+    ]
+  , "tags": [
+      "signal"
+    ]
+  }
+, {
+    "emoji": "📺"
+  , "description": "television"
+  , "aliases": [
+      "tv"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📻"
+  , "description": "radio"
+  , "aliases": [
+      "radio"
+    ]
+  , "tags": [
+      "podcast"
+    ]
+  }
+, {
+    "emoji": "🔊"
+  , "description": "speaker with three sound waves"
+  , "aliases": [
+      "loud_sound"
+    ]
+  , "tags": [
+      "volume"
+    ]
+  }
+, {
+    "emoji": "🔉"
+  , "description": "speaker with one sound wave"
+  , "aliases": [
+      "sound"
+    ]
+  , "tags": [
+      "volume"
+    ]
+  }
+, {
+    "emoji": "🔈"
+  , "description": "speaker"
+  , "aliases": [
+      "speaker"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔇"
+  , "description": "speaker with cancellation stroke"
+  , "aliases": [
+      "mute"
+    ]
+  , "tags": [
+      "sound"
+    , "volume"
+    ]
+  }
+, {
+    "emoji": "🔔"
+  , "description": "bell"
+  , "aliases": [
+      "bell"
+    ]
+  , "tags": [
+      "sound"
+    , "notification"
+    ]
+  }
+, {
+    "emoji": "🔕"
+  , "description": "bell with cancellation stroke"
+  , "aliases": [
+      "no_bell"
+    ]
+  , "tags": [
+      "volume"
+    , "off"
+    ]
+  }
+, {
+    "emoji": "📢"
+  , "description": "public address loudspeaker"
+  , "aliases": [
+      "loudspeaker"
+    ]
+  , "tags": [
+      "announcement"
+    ]
+  }
+, {
+    "emoji": "📣"
+  , "description": "cheering megaphone"
+  , "aliases": [
+      "mega"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⏳"
+  , "description": "hourglass with flowing sand"
+  , "aliases": [
+      "hourglass_flowing_sand"
+    ]
+  , "tags": [
+      "time"
+    ]
+  }
+, {
+    "emoji": "⌛"
+  , "description": "hourglass"
+  , "aliases": [
+      "hourglass"
+    ]
+  , "tags": [
+      "time"
+    ]
+  }
+, {
+    "emoji": "⏰"
+  , "description": "alarm clock"
+  , "aliases": [
+      "alarm_clock"
+    ]
+  , "tags": [
+      "morning"
+    ]
+  }
+, {
+    "emoji": "⌚"
+  , "description": "watch"
+  , "aliases": [
+      "watch"
+    ]
+  , "tags": [
+      "time"
+    ]
+  }
+, {
+    "emoji": "🔓"
+  , "description": "open lock"
+  , "aliases": [
+      "unlock"
+    ]
+  , "tags": [
+      "security"
+    ]
+  }
+, {
+    "emoji": "🔒"
+  , "description": "lock"
+  , "aliases": [
+      "lock"
+    ]
+  , "tags": [
+      "security"
+    , "private"
+    ]
+  }
+, {
+    "emoji": "🔏"
+  , "description": "lock with ink pen"
+  , "aliases": [
+      "lock_with_ink_pen"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔐"
+  , "description": "closed lock with key"
+  , "aliases": [
+      "closed_lock_with_key"
+    ]
+  , "tags": [
+      "security"
+    ]
+  }
+, {
+    "emoji": "🔑"
+  , "description": "key"
+  , "aliases": [
+      "key"
+    ]
+  , "tags": [
+      "lock"
+    , "password"
+    ]
+  }
+, {
+    "emoji": "🔎"
+  , "description": "right-pointing magnifying glass"
+  , "aliases": [
+      "mag_right"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💡"
+  , "description": "electric light bulb"
+  , "aliases": [
+      "bulb"
+    ]
+  , "tags": [
+      "idea"
+    , "light"
+    ]
+  }
+, {
+    "emoji": "🔦"
+  , "description": "electric torch"
+  , "aliases": [
+      "flashlight"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔆"
+  , "description": "high brightness symbol"
+  , "aliases": [
+      "high_brightness"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔅"
+  , "description": "low brightness symbol"
+  , "aliases": [
+      "low_brightness"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔌"
+  , "description": "electric plug"
+  , "aliases": [
+      "electric_plug"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔋"
+  , "description": "battery"
+  , "aliases": [
+      "battery"
+    ]
+  , "tags": [
+      "power"
+    ]
+  }
+, {
+    "emoji": "🔍"
+  , "description": "left-pointing magnifying glass"
+  , "aliases": [
+      "mag"
+    ]
+  , "tags": [
+      "search"
+    , "zoom"
+    ]
+  }
+, {
+    "emoji": "🛁"
+  , "description": "bathtub"
+  , "aliases": [
+      "bathtub"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🛀"
+  , "description": "bath"
+  , "aliases": [
+      "bath"
+    ]
+  , "tags": [
+      "shower"
+    ]
+  }
+, {
+    "emoji": "🚿"
+  , "description": "shower"
+  , "aliases": [
+      "shower"
+    ]
+  , "tags": [
+      "bath"
+    ]
+  }
+, {
+    "emoji": "🚽"
+  , "description": "toilet"
+  , "aliases": [
+      "toilet"
+    ]
+  , "tags": [
+      "wc"
+    ]
+  }
+, {
+    "emoji": "🔧"
+  , "description": "wrench"
+  , "aliases": [
+      "wrench"
+    ]
+  , "tags": [
+      "tool"
+    ]
+  }
+, {
+    "emoji": "🔩"
+  , "description": "nut and bolt"
+  , "aliases": [
+      "nut_and_bolt"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔨"
+  , "description": "hammer"
+  , "aliases": [
+      "hammer"
+    ]
+  , "tags": [
+      "tool"
+    ]
+  }
+, {
+    "emoji": "🚪"
+  , "description": "door"
+  , "aliases": [
+      "door"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚬"
+  , "description": "smoking symbol"
+  , "aliases": [
+      "smoking"
+    ]
+  , "tags": [
+      "cigarette"
+    ]
+  }
+, {
+    "emoji": "💣"
+  , "description": "bomb"
+  , "aliases": [
+      "bomb"
+    ]
+  , "tags": [
+      "boom"
+    ]
+  }
+, {
+    "emoji": "🔫"
+  , "description": "pistol"
+  , "aliases": [
+      "gun"
+    ]
+  , "tags": [
+      "shoot"
+    , "weapon"
+    ]
+  }
+, {
+    "emoji": "🔪"
+  , "description": "hocho"
+  , "aliases": [
+      "hocho"
+    , "knife"
+    ]
+  , "tags": [
+      "cut"
+    , "chop"
+    ]
+  }
+, {
+    "emoji": "💊"
+  , "description": "pill"
+  , "aliases": [
+      "pill"
+    ]
+  , "tags": [
+      "health"
+    , "medicine"
+    ]
+  }
+, {
+    "emoji": "💉"
+  , "description": "syringe"
+  , "aliases": [
+      "syringe"
+    ]
+  , "tags": [
+      "health"
+    , "hospital"
+    , "needle"
+    ]
+  }
+, {
+    "emoji": "💰"
+  , "description": "money bag"
+  , "aliases": [
+      "moneybag"
+    ]
+  , "tags": [
+      "dollar"
+    , "cream"
+    ]
+  }
+, {
+    "emoji": "💴"
+  , "description": "banknote with yen sign"
+  , "aliases": [
+      "yen"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💵"
+  , "description": "banknote with dollar sign"
+  , "aliases": [
+      "dollar"
+    ]
+  , "tags": [
+      "money"
+    ]
+  }
+, {
+    "emoji": "💷"
+  , "description": "banknote with pound sign"
+  , "aliases": [
+      "pound"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💶"
+  , "description": "banknote with euro sign"
+  , "aliases": [
+      "euro"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💳"
+  , "description": "credit card"
+  , "aliases": [
+      "credit_card"
+    ]
+  , "tags": [
+      "subscription"
+    ]
+  }
+, {
+    "emoji": "💸"
+  , "description": "money with wings"
+  , "aliases": [
+      "money_with_wings"
+    ]
+  , "tags": [
+      "dollar"
+    ]
+  }
+, {
+    "emoji": "📲"
+  , "description": "mobile phone with rightwards arrow at left"
+  , "aliases": [
+      "calling"
+    ]
+  , "tags": [
+      "call"
+    , "incoming"
+    ]
+  }
+, {
+    "emoji": "📧"
+  , "description": "e-mail symbol"
+  , "aliases": [
+      "e-mail"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📥"
+  , "description": "inbox tray"
+  , "aliases": [
+      "inbox_tray"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📤"
+  , "description": "outbox tray"
+  , "aliases": [
+      "outbox_tray"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "✉️"
+  , "description": "envelope"
+  , "aliases": [
+      "email"
+    , "envelope"
+    ]
+  , "tags": [
+      "letter"
+    ]
+  }
+, {
+    "emoji": "📩"
+  , "description": "envelope with downwards arrow above"
+  , "aliases": [
+      "envelope_with_arrow"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📨"
+  , "description": "incoming envelope"
+  , "aliases": [
+      "incoming_envelope"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📯"
+  , "description": "postal horn"
+  , "aliases": [
+      "postal_horn"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📫"
+  , "description": "closed mailbox with raised flag"
+  , "aliases": [
+      "mailbox"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📪"
+  , "description": "closed mailbox with lowered flag"
+  , "aliases": [
+      "mailbox_closed"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📬"
+  , "description": "open mailbox with raised flag"
+  , "aliases": [
+      "mailbox_with_mail"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📭"
+  , "description": "open mailbox with lowered flag"
+  , "aliases": [
+      "mailbox_with_no_mail"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📮"
+  , "description": "postbox"
+  , "aliases": [
+      "postbox"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📦"
+  , "description": "package"
+  , "aliases": [
+      "package"
+    ]
+  , "tags": [
+      "shipping"
+    ]
+  }
+, {
+    "emoji": "📝"
+  , "description": "memo"
+  , "aliases": [
+      "memo"
+    , "pencil"
+    ]
+  , "tags": [
+      "document"
+    , "note"
+    ]
+  }
+, {
+    "emoji": "📄"
+  , "description": "page facing up"
+  , "aliases": [
+      "page_facing_up"
+    ]
+  , "tags": [
+      "document"
+    ]
+  }
+, {
+    "emoji": "📃"
+  , "description": "page with curl"
+  , "aliases": [
+      "page_with_curl"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📑"
+  , "description": "bookmark tabs"
+  , "aliases": [
+      "bookmark_tabs"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📊"
+  , "description": "bar chart"
+  , "aliases": [
+      "bar_chart"
+    ]
+  , "tags": [
+      "stats"
+    , "metrics"
+    ]
+  }
+, {
+    "emoji": "📈"
+  , "description": "chart with upwards trend"
+  , "aliases": [
+      "chart_with_upwards_trend"
+    ]
+  , "tags": [
+      "graph"
+    , "metrics"
+    ]
+  }
+, {
+    "emoji": "📉"
+  , "description": "chart with downwards trend"
+  , "aliases": [
+      "chart_with_downwards_trend"
+    ]
+  , "tags": [
+      "graph"
+    , "metrics"
+    ]
+  }
+, {
+    "emoji": "📜"
+  , "description": "scroll"
+  , "aliases": [
+      "scroll"
+    ]
+  , "tags": [
+      "document"
+    ]
+  }
+, {
+    "emoji": "📋"
+  , "description": "clipboard"
+  , "aliases": [
+      "clipboard"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📅"
+  , "description": "calendar"
+  , "aliases": [
+      "date"
+    ]
+  , "tags": [
+      "calendar"
+    , "schedule"
+    ]
+  }
+, {
+    "emoji": "📆"
+  , "description": "tear-off calendar"
+  , "aliases": [
+      "calendar"
+    ]
+  , "tags": [
+      "schedule"
+    ]
+  }
+, {
+    "emoji": "📇"
+  , "description": "card index"
+  , "aliases": [
+      "card_index"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📁"
+  , "description": "file folder"
+  , "aliases": [
+      "file_folder"
+    ]
+  , "tags": [
+      "directory"
+    ]
+  }
+, {
+    "emoji": "📂"
+  , "description": "open file folder"
+  , "aliases": [
+      "open_file_folder"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "✂️"
+  , "description": "black scissors"
+  , "aliases": [
+      "scissors"
+    ]
+  , "tags": [
+      "cut"
+    ]
+  }
+, {
+    "emoji": "📌"
+  , "description": "pushpin"
+  , "aliases": [
+      "pushpin"
+    ]
+  , "tags": [
+      "location"
+    ]
+  }
+, {
+    "emoji": "📎"
+  , "description": "paperclip"
+  , "aliases": [
+      "paperclip"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "✒️"
+  , "description": "black nib"
+  , "aliases": [
+      "black_nib"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "✏️"
+  , "description": "pencil"
+  , "aliases": [
+      "pencil2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📏"
+  , "description": "straight ruler"
+  , "aliases": [
+      "straight_ruler"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📐"
+  , "description": "triangular ruler"
+  , "aliases": [
+      "triangular_ruler"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📕"
+  , "description": "closed book"
+  , "aliases": [
+      "closed_book"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📗"
+  , "description": "green book"
+  , "aliases": [
+      "green_book"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📘"
+  , "description": "blue book"
+  , "aliases": [
+      "blue_book"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📙"
+  , "description": "orange book"
+  , "aliases": [
+      "orange_book"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📓"
+  , "description": "notebook"
+  , "aliases": [
+      "notebook"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📔"
+  , "description": "notebook with decorative cover"
+  , "aliases": [
+      "notebook_with_decorative_cover"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📒"
+  , "description": "ledger"
+  , "aliases": [
+      "ledger"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📚"
+  , "description": "books"
+  , "aliases": [
+      "books"
+    ]
+  , "tags": [
+      "library"
+    ]
+  }
+, {
+    "emoji": "📖"
+  , "description": "open book"
+  , "aliases": [
+      "book"
+    , "open_book"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔖"
+  , "description": "bookmark"
+  , "aliases": [
+      "bookmark"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📛"
+  , "description": "name badge"
+  , "aliases": [
+      "name_badge"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔬"
+  , "description": "microscope"
+  , "aliases": [
+      "microscope"
+    ]
+  , "tags": [
+      "science"
+    , "laboratory"
+    , "investigate"
+    ]
+  }
+, {
+    "emoji": "🔭"
+  , "description": "telescope"
+  , "aliases": [
+      "telescope"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📰"
+  , "description": "newspaper"
+  , "aliases": [
+      "newspaper"
+    ]
+  , "tags": [
+      "press"
+    ]
+  }
+, {
+    "emoji": "🎨"
+  , "description": "artist palette"
+  , "aliases": [
+      "art"
+    ]
+  , "tags": [
+      "design"
+    , "paint"
+    ]
+  }
+, {
+    "emoji": "🎬"
+  , "description": "clapper board"
+  , "aliases": [
+      "clapper"
+    ]
+  , "tags": [
+      "film"
+    ]
+  }
+, {
+    "emoji": "🎤"
+  , "description": "microphone"
+  , "aliases": [
+      "microphone"
+    ]
+  , "tags": [
+      "sing"
+    ]
+  }
+, {
+    "emoji": "🎧"
+  , "description": "headphone"
+  , "aliases": [
+      "headphones"
+    ]
+  , "tags": [
+      "music"
+    , "earphones"
+    ]
+  }
+, {
+    "emoji": "🎼"
+  , "description": "musical score"
+  , "aliases": [
+      "musical_score"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎵"
+  , "description": "musical note"
+  , "aliases": [
+      "musical_note"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎶"
+  , "description": "multiple musical notes"
+  , "aliases": [
+      "notes"
+    ]
+  , "tags": [
+      "music"
+    ]
+  }
+, {
+    "emoji": "🎹"
+  , "description": "musical keyboard"
+  , "aliases": [
+      "musical_keyboard"
+    ]
+  , "tags": [
+      "piano"
+    ]
+  }
+, {
+    "emoji": "🎻"
+  , "description": "violin"
+  , "aliases": [
+      "violin"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎺"
+  , "description": "trumpet"
+  , "aliases": [
+      "trumpet"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎷"
+  , "description": "saxophone"
+  , "aliases": [
+      "saxophone"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎸"
+  , "description": "guitar"
+  , "aliases": [
+      "guitar"
+    ]
+  , "tags": [
+      "rock"
+    ]
+  }
+, {
+    "emoji": "👾"
+  , "description": "alien monster"
+  , "aliases": [
+      "space_invader"
+    ]
+  , "tags": [
+      "game"
+    , "retro"
+    ]
+  }
+, {
+    "emoji": "🎮"
+  , "description": "video game"
+  , "aliases": [
+      "video_game"
+    ]
+  , "tags": [
+      "play"
+    , "controller"
+    , "console"
+    ]
+  }
+, {
+    "emoji": "🃏"
+  , "description": "playing card black joker"
+  , "aliases": [
+      "black_joker"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎴"
+  , "description": "flower playing cards"
+  , "aliases": [
+      "flower_playing_cards"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🀄"
+  , "description": "mahjong tile red dragon"
+  , "aliases": [
+      "mahjong"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎲"
+  , "description": "game die"
+  , "aliases": [
+      "game_die"
+    ]
+  , "tags": [
+      "dice"
+    , "gambling"
+    ]
+  }
+, {
+    "emoji": "🎯"
+  , "description": "direct hit"
+  , "aliases": [
+      "dart"
+    ]
+  , "tags": [
+      "target"
+    ]
+  }
+, {
+    "emoji": "🏈"
+  , "description": "american football"
+  , "aliases": [
+      "football"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  }
+, {
+    "emoji": "🏀"
+  , "description": "basketball and hoop"
+  , "aliases": [
+      "basketball"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  }
+, {
+    "emoji": "⚽"
+  , "description": "soccer ball"
+  , "aliases": [
+      "soccer"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  }
+, {
+    "emoji": "⚾️"
+  , "description": "baseball"
+  , "aliases": [
+      "baseball"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  }
+, {
+    "emoji": "🎾"
+  , "description": "tennis racquet and ball"
+  , "aliases": [
+      "tennis"
+    ]
+  , "tags": [
+      "sports"
+    ]
+  }
+, {
+    "emoji": "🎱"
+  , "description": "billiards"
+  , "aliases": [
+      "8ball"
+    ]
+  , "tags": [
+      "pool"
+    , "billiards"
+    ]
+  }
+, {
+    "emoji": "🏉"
+  , "description": "rugby football"
+  , "aliases": [
+      "rugby_football"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎳"
+  , "description": "bowling"
+  , "aliases": [
+      "bowling"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⛳"
+  , "description": "flag in hole"
+  , "aliases": [
+      "golf"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚵"
+  , "description": "mountain bicyclist"
+  , "aliases": [
+      "mountain_bicyclist"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚴"
+  , "description": "bicyclist"
+  , "aliases": [
+      "bicyclist"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏁"
+  , "description": "chequered flag"
+  , "aliases": [
+      "checkered_flag"
+    ]
+  , "tags": [
+      "milestone"
+    , "finish"
+    ]
+  }
+, {
+    "emoji": "🏇"
+  , "description": "horse racing"
+  , "aliases": [
+      "horse_racing"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏆"
+  , "description": "trophy"
+  , "aliases": [
+      "trophy"
+    ]
+  , "tags": [
+      "award"
+    , "contest"
+    , "winner"
+    ]
+  }
+, {
+    "emoji": "🎿"
+  , "description": "ski and ski boot"
+  , "aliases": [
+      "ski"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏂"
+  , "description": "snowboarder"
+  , "aliases": [
+      "snowboarder"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏊"
+  , "description": "swimmer"
+  , "aliases": [
+      "swimmer"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏄"
+  , "description": "surfer"
+  , "aliases": [
+      "surfer"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎣"
+  , "description": "fishing pole and fish"
+  , "aliases": [
+      "fishing_pole_and_fish"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "☕"
+  , "description": "hot beverage"
+  , "aliases": [
+      "coffee"
+    ]
+  , "tags": [
+      "cafe"
+    , "espresso"
+    ]
+  }
+, {
+    "emoji": "🍵"
+  , "description": "teacup without handle"
+  , "aliases": [
+      "tea"
+    ]
+  , "tags": [
+      "green"
+    , "breakfast"
+    ]
+  }
+, {
+    "emoji": "🍶"
+  , "description": "sake bottle and cup"
+  , "aliases": [
+      "sake"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍼"
+  , "description": "baby bottle"
+  , "aliases": [
+      "baby_bottle"
+    ]
+  , "tags": [
+      "milk"
+    ]
+  }
+, {
+    "emoji": "🍺"
+  , "description": "beer mug"
+  , "aliases": [
+      "beer"
+    ]
+  , "tags": [
+      "drink"
+    ]
+  }
+, {
+    "emoji": "🍻"
+  , "description": "clinking beer mugs"
+  , "aliases": [
+      "beers"
+    ]
+  , "tags": [
+      "drinks"
+    ]
+  }
+, {
+    "emoji": "🍸"
+  , "description": "cocktail glass"
+  , "aliases": [
+      "cocktail"
+    ]
+  , "tags": [
+      "drink"
+    ]
+  }
+, {
+    "emoji": "🍹"
+  , "description": "tropical drink"
+  , "aliases": [
+      "tropical_drink"
+    ]
+  , "tags": [
+      "summer"
+    , "vacation"
+    ]
+  }
+, {
+    "emoji": "🍷"
+  , "description": "wine glass"
+  , "aliases": [
+      "wine_glass"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍴"
+  , "description": "fork and knife"
+  , "aliases": [
+      "fork_and_knife"
+    ]
+  , "tags": [
+      "cutlery"
+    ]
+  }
+, {
+    "emoji": "🍕"
+  , "description": "slice of pizza"
+  , "aliases": [
+      "pizza"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍔"
+  , "description": "hamburger"
+  , "aliases": [
+      "hamburger"
+    ]
+  , "tags": [
+      "burger"
+    ]
+  }
+, {
+    "emoji": "🍟"
+  , "description": "french fries"
+  , "aliases": [
+      "fries"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍗"
+  , "description": "poultry leg"
+  , "aliases": [
+      "poultry_leg"
+    ]
+  , "tags": [
+      "meat"
+    , "chicken"
+    ]
+  }
+, {
+    "emoji": "🍖"
+  , "description": "meat on bone"
+  , "aliases": [
+      "meat_on_bone"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍝"
+  , "description": "spaghetti"
+  , "aliases": [
+      "spaghetti"
+    ]
+  , "tags": [
+      "pasta"
+    ]
+  }
+, {
+    "emoji": "🍛"
+  , "description": "curry and rice"
+  , "aliases": [
+      "curry"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍤"
+  , "description": "fried shrimp"
+  , "aliases": [
+      "fried_shrimp"
+    ]
+  , "tags": [
+      "tempura"
+    ]
+  }
+, {
+    "emoji": "🍱"
+  , "description": "bento box"
+  , "aliases": [
+      "bento"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍣"
+  , "description": "sushi"
+  , "aliases": [
+      "sushi"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍥"
+  , "description": "fish cake with swirl design"
+  , "aliases": [
+      "fish_cake"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍙"
+  , "description": "rice ball"
+  , "aliases": [
+      "rice_ball"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍘"
+  , "description": "rice cracker"
+  , "aliases": [
+      "rice_cracker"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍚"
+  , "description": "cooked rice"
+  , "aliases": [
+      "rice"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍜"
+  , "description": "steaming bowl"
+  , "aliases": [
+      "ramen"
+    ]
+  , "tags": [
+      "noodle"
+    ]
+  }
+, {
+    "emoji": "🍲"
+  , "description": "pot of food"
+  , "aliases": [
+      "stew"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍢"
+  , "description": "oden"
+  , "aliases": [
+      "oden"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍡"
+  , "description": "dango"
+  , "aliases": [
+      "dango"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍳"
+  , "description": "cooking"
+  , "aliases": [
+      "egg"
+    ]
+  , "tags": [
+      "breakfast"
+    ]
+  }
+, {
+    "emoji": "🍞"
+  , "description": "bread"
+  , "aliases": [
+      "bread"
+    ]
+  , "tags": [
+      "toast"
+    ]
+  }
+, {
+    "emoji": "🍩"
+  , "description": "doughnut"
+  , "aliases": [
+      "doughnut"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍮"
+  , "description": "custard"
+  , "aliases": [
+      "custard"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍦"
+  , "description": "soft ice cream"
+  , "aliases": [
+      "icecream"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍨"
+  , "description": "ice cream"
+  , "aliases": [
+      "ice_cream"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍧"
+  , "description": "shaved ice"
+  , "aliases": [
+      "shaved_ice"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎂"
+  , "description": "birthday cake"
+  , "aliases": [
+      "birthday"
+    ]
+  , "tags": [
+      "party"
+    ]
+  }
+, {
+    "emoji": "🍰"
+  , "description": "shortcake"
+  , "aliases": [
+      "cake"
+    ]
+  , "tags": [
+      "dessert"
+    ]
+  }
+, {
+    "emoji": "🍪"
+  , "description": "cookie"
+  , "aliases": [
+      "cookie"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍫"
+  , "description": "chocolate bar"
+  , "aliases": [
+      "chocolate_bar"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍬"
+  , "description": "candy"
+  , "aliases": [
+      "candy"
+    ]
+  , "tags": [
+      "sweet"
+    ]
+  }
+, {
+    "emoji": "🍭"
+  , "description": "lollipop"
+  , "aliases": [
+      "lollipop"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍯"
+  , "description": "honey pot"
+  , "aliases": [
+      "honey_pot"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍎"
+  , "description": "red apple"
+  , "aliases": [
+      "apple"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍏"
+  , "description": "green apple"
+  , "aliases": [
+      "green_apple"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  }
+, {
+    "emoji": "🍊"
+  , "description": "tangerine"
+  , "aliases": [
+      "tangerine"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍋"
+  , "description": "lemon"
+  , "aliases": [
+      "lemon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍒"
+  , "description": "cherries"
+  , "aliases": [
+      "cherries"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  }
+, {
+    "emoji": "🍇"
+  , "description": "grapes"
+  , "aliases": [
+      "grapes"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍉"
+  , "description": "watermelon"
+  , "aliases": [
+      "watermelon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍓"
+  , "description": "strawberry"
+  , "aliases": [
+      "strawberry"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  }
+, {
+    "emoji": "🍑"
+  , "description": "peach"
+  , "aliases": [
+      "peach"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍈"
+  , "description": "melon"
+  , "aliases": [
+      "melon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍌"
+  , "description": "banana"
+  , "aliases": [
+      "banana"
+    ]
+  , "tags": [
+      "fruit"
+    ]
+  }
+, {
+    "emoji": "🍐"
+  , "description": "pear"
+  , "aliases": [
+      "pear"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍍"
+  , "description": "pineapple"
+  , "aliases": [
+      "pineapple"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍠"
+  , "description": "roasted sweet potato"
+  , "aliases": [
+      "sweet_potato"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🍆"
+  , "description": "aubergine"
+  , "aliases": [
+      "eggplant"
+    ]
+  , "tags": [
+      "aubergine"
+    ]
+  }
+, {
+    "emoji": "🍅"
+  , "description": "tomato"
+  , "aliases": [
+      "tomato"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌽"
+  , "description": "ear of maize"
+  , "aliases": [
+      "corn"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏠"
+  , "description": "house building"
+  , "aliases": [
+      "house"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏡"
+  , "description": "house with garden"
+  , "aliases": [
+      "house_with_garden"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏫"
+  , "description": "school"
+  , "aliases": [
+      "school"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏢"
+  , "description": "office building"
+  , "aliases": [
+      "office"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏣"
+  , "description": "japanese post office"
+  , "aliases": [
+      "post_office"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏥"
+  , "description": "hospital"
+  , "aliases": [
+      "hospital"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏦"
+  , "description": "bank"
+  , "aliases": [
+      "bank"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏪"
+  , "description": "convenience store"
+  , "aliases": [
+      "convenience_store"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏩"
+  , "description": "love hotel"
+  , "aliases": [
+      "love_hotel"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏨"
+  , "description": "hotel"
+  , "aliases": [
+      "hotel"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💒"
+  , "description": "wedding"
+  , "aliases": [
+      "wedding"
+    ]
+  , "tags": [
+      "marriage"
+    ]
+  }
+, {
+    "emoji": "⛪"
+  , "description": "church"
+  , "aliases": [
+      "church"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏬"
+  , "description": "department store"
+  , "aliases": [
+      "department_store"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏤"
+  , "description": "european post office"
+  , "aliases": [
+      "european_post_office"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌇"
+  , "description": "sunset over buildings"
+  , "aliases": [
+      "city_sunrise"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌆"
+  , "description": "cityscape at dusk"
+  , "aliases": [
+      "city_sunset"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏯"
+  , "description": "japanese castle"
+  , "aliases": [
+      "japanese_castle"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏰"
+  , "description": "european castle"
+  , "aliases": [
+      "european_castle"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⛺"
+  , "description": "tent"
+  , "aliases": [
+      "tent"
+    ]
+  , "tags": [
+      "camping"
+    ]
+  }
+, {
+    "emoji": "🏭"
+  , "description": "factory"
+  , "aliases": [
+      "factory"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🗼"
+  , "description": "tokyo tower"
+  , "aliases": [
+      "tokyo_tower"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🗾"
+  , "description": "silhouette of japan"
+  , "aliases": [
+      "japan"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🗻"
+  , "description": "mount fuji"
+  , "aliases": [
+      "mount_fuji"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌄"
+  , "description": "sunrise over mountains"
+  , "aliases": [
+      "sunrise_over_mountains"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌅"
+  , "description": "sunrise"
+  , "aliases": [
+      "sunrise"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌃"
+  , "description": "night with stars"
+  , "aliases": [
+      "night_with_stars"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🗽"
+  , "description": "statue of liberty"
+  , "aliases": [
+      "statue_of_liberty"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🌉"
+  , "description": "bridge at night"
+  , "aliases": [
+      "bridge_at_night"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎠"
+  , "description": "carousel horse"
+  , "aliases": [
+      "carousel_horse"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎡"
+  , "description": "ferris wheel"
+  , "aliases": [
+      "ferris_wheel"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⛲"
+  , "description": "fountain"
+  , "aliases": [
+      "fountain"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎢"
+  , "description": "roller coaster"
+  , "aliases": [
+      "roller_coaster"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚢"
+  , "description": "ship"
+  , "aliases": [
+      "ship"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⛵"
+  , "description": "sailboat"
+  , "aliases": [
+      "boat"
+    , "sailboat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚤"
+  , "description": "speedboat"
+  , "aliases": [
+      "speedboat"
+    ]
+  , "tags": [
+      "ship"
+    ]
+  }
+, {
+    "emoji": "🚣"
+  , "description": "rowboat"
+  , "aliases": [
+      "rowboat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⚓"
+  , "description": "anchor"
+  , "aliases": [
+      "anchor"
+    ]
+  , "tags": [
+      "ship"
+    ]
+  }
+, {
+    "emoji": "🚀"
+  , "description": "rocket"
+  , "aliases": [
+      "rocket"
+    ]
+  , "tags": [
+      "ship"
+    , "launch"
+    ]
+  }
+, {
+    "emoji": "✈️"
+  , "description": "airplane"
+  , "aliases": [
+      "airplane"
+    ]
+  , "tags": [
+      "flight"
+    ]
+  }
+, {
+    "emoji": "💺"
+  , "description": "seat"
+  , "aliases": [
+      "seat"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚁"
+  , "description": "helicopter"
+  , "aliases": [
+      "helicopter"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚂"
+  , "description": "steam locomotive"
+  , "aliases": [
+      "steam_locomotive"
+    ]
+  , "tags": [
+      "train"
+    ]
+  }
+, {
+    "emoji": "🚊"
+  , "description": "tram"
+  , "aliases": [
+      "tram"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚉"
+  , "description": "station"
+  , "aliases": [
+      "station"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚞"
+  , "description": "mountain railway"
+  , "aliases": [
+      "mountain_railway"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚆"
+  , "description": "train"
+  , "aliases": [
+      "train2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚄"
+  , "description": "high-speed train"
+  , "aliases": [
+      "bullettrain_side"
+    ]
+  , "tags": [
+      "train"
+    ]
+  }
+, {
+    "emoji": "🚅"
+  , "description": "high-speed train with bullet nose"
+  , "aliases": [
+      "bullettrain_front"
+    ]
+  , "tags": [
+      "train"
+    ]
+  }
+, {
+    "emoji": "🚈"
+  , "description": "light rail"
+  , "aliases": [
+      "light_rail"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚇"
+  , "description": "metro"
+  , "aliases": [
+      "metro"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚝"
+  , "description": "monorail"
+  , "aliases": [
+      "monorail"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚋"
+  , "description": "tram car"
+  , "aliases": [
+      "train"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚃"
+  , "description": "railway car"
+  , "aliases": [
+      "railway_car"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚎"
+  , "description": "trolleybus"
+  , "aliases": [
+      "trolleybus"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚌"
+  , "description": "bus"
+  , "aliases": [
+      "bus"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚍"
+  , "description": "oncoming bus"
+  , "aliases": [
+      "oncoming_bus"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚙"
+  , "description": "recreational vehicle"
+  , "aliases": [
+      "blue_car"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚘"
+  , "description": "oncoming automobile"
+  , "aliases": [
+      "oncoming_automobile"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚗"
+  , "description": "automobile"
+  , "aliases": [
+      "car"
+    , "red_car"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚕"
+  , "description": "taxi"
+  , "aliases": [
+      "taxi"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚖"
+  , "description": "oncoming taxi"
+  , "aliases": [
+      "oncoming_taxi"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚛"
+  , "description": "articulated lorry"
+  , "aliases": [
+      "articulated_lorry"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚚"
+  , "description": "delivery truck"
+  , "aliases": [
+      "truck"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚨"
+  , "description": "police cars revolving light"
+  , "aliases": [
+      "rotating_light"
+    ]
+  , "tags": [
+      "911"
+    , "emergency"
+    ]
+  }
+, {
+    "emoji": "🚓"
+  , "description": "police car"
+  , "aliases": [
+      "police_car"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚔"
+  , "description": "oncoming police car"
+  , "aliases": [
+      "oncoming_police_car"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚒"
+  , "description": "fire engine"
+  , "aliases": [
+      "fire_engine"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚑"
+  , "description": "ambulance"
+  , "aliases": [
+      "ambulance"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚐"
+  , "description": "minibus"
+  , "aliases": [
+      "minibus"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚲"
+  , "description": "bicycle"
+  , "aliases": [
+      "bike"
+    ]
+  , "tags": [
+      "bicycle"
+    ]
+  }
+, {
+    "emoji": "🚡"
+  , "description": "aerial tramway"
+  , "aliases": [
+      "aerial_tramway"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚟"
+  , "description": "suspension railway"
+  , "aliases": [
+      "suspension_railway"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚠"
+  , "description": "mountain cableway"
+  , "aliases": [
+      "mountain_cableway"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚜"
+  , "description": "tractor"
+  , "aliases": [
+      "tractor"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💈"
+  , "description": "barber pole"
+  , "aliases": [
+      "barber"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚏"
+  , "description": "bus stop"
+  , "aliases": [
+      "busstop"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎫"
+  , "description": "ticket"
+  , "aliases": [
+      "ticket"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚦"
+  , "description": "vertical traffic light"
+  , "aliases": [
+      "vertical_traffic_light"
+    ]
+  , "tags": [
+      "semaphore"
+    ]
+  }
+, {
+    "emoji": "🚥"
+  , "description": "horizontal traffic light"
+  , "aliases": [
+      "traffic_light"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⚠️"
+  , "description": "warning sign"
+  , "aliases": [
+      "warning"
+    ]
+  , "tags": [
+      "wip"
+    ]
+  }
+, {
+    "emoji": "🚧"
+  , "description": "construction sign"
+  , "aliases": [
+      "construction"
+    ]
+  , "tags": [
+      "wip"
+    ]
+  }
+, {
+    "emoji": "🔰"
+  , "description": "japanese symbol for beginner"
+  , "aliases": [
+      "beginner"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⛽"
+  , "description": "fuel pump"
+  , "aliases": [
+      "fuelpump"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏮"
+  , "description": "izakaya lantern"
+  , "aliases": [
+      "izakaya_lantern"
+    , "lantern"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎰"
+  , "description": "slot machine"
+  , "aliases": [
+      "slot_machine"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♨️"
+  , "description": "hot springs"
+  , "aliases": [
+      "hotsprings"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🗿"
+  , "description": "moyai"
+  , "aliases": [
+      "moyai"
+    ]
+  , "tags": [
+      "stone"
+    ]
+  }
+, {
+    "emoji": "🎪"
+  , "description": "circus tent"
+  , "aliases": [
+      "circus_tent"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🎭"
+  , "description": "performing arts"
+  , "aliases": [
+      "performing_arts"
+    ]
+  , "tags": [
+      "theater"
+    , "drama"
+    ]
+  }
+, {
+    "emoji": "📍"
+  , "description": "round pushpin"
+  , "aliases": [
+      "round_pushpin"
+    ]
+  , "tags": [
+      "location"
+    ]
+  }
+, {
+    "emoji": "🚩"
+  , "description": "triangular flag on post"
+  , "aliases": [
+      "triangular_flag_on_post"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🇯🇵"
+  , "description": "regional indicator symbol letter j + regional indicator symbol letter p"
+  , "aliases": [
+      "jp"
+    ]
+  , "tags": [
+      "japan"
+    ]
+  }
+, {
+    "emoji": "🇰🇷"
+  , "description": "regional indicator symbol letter k + regional indicator symbol letter r"
+  , "aliases": [
+      "kr"
+    ]
+  , "tags": [
+      "korea"
+    ]
+  }
+, {
+    "emoji": "🇩🇪"
+  , "description": "regional indicator symbol letter d + regional indicator symbol letter e"
+  , "aliases": [
+      "de"
+    ]
+  , "tags": [
+      "flag"
+    , "germany"
+    ]
+  }
+, {
+    "emoji": "🇨🇳"
+  , "description": "regional indicator symbol letter c + regional indicator symbol letter n"
+  , "aliases": [
+      "cn"
+    ]
+  , "tags": [
+      "china"
+    ]
+  }
+, {
+    "emoji": "🇺🇸"
+  , "description": "regional indicator symbol letter u + regional indicator symbol letter s"
+  , "aliases": [
+      "us"
+    ]
+  , "tags": [
+      "flag"
+    , "united"
+    , "america"
+    ]
+  }
+, {
+    "emoji": "🇫🇷"
+  , "description": "regional indicator symbol letter f + regional indicator symbol letter r"
+  , "aliases": [
+      "fr"
+    ]
+  , "tags": [
+      "france"
+    , "french"
+    ]
+  }
+, {
+    "emoji": "🇪🇸"
+  , "description": "regional indicator symbol letter e + regional indicator symbol letter s"
+  , "aliases": [
+      "es"
+    ]
+  , "tags": [
+      "spain"
+    ]
+  }
+, {
+    "emoji": "🇮🇹"
+  , "description": "regional indicator symbol letter i + regional indicator symbol letter t"
+  , "aliases": [
+      "it"
+    ]
+  , "tags": [
+      "italy"
+    ]
+  }
+, {
+    "emoji": "🇷🇺"
+  , "description": "regional indicator symbol letter r + regional indicator symbol letter u"
+  , "aliases": [
+      "ru"
+    ]
+  , "tags": [
+      "russia"
+    ]
+  }
+, {
+    "emoji": "🇬🇧"
+  , "description": "regional indicator symbol letter g + regional indicator symbol letter b"
+  , "aliases": [
+      "gb"
+    , "uk"
+    ]
+  , "tags": [
+      "flag"
+    , "british"
+    ]
+  }
+, {
+    "emoji": "1️⃣"
+  , "description": "digit one + combining enclosing keycap"
+  , "aliases": [
+      "one"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "2️⃣"
+  , "description": "digit two + combining enclosing keycap"
+  , "aliases": [
+      "two"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "3️⃣"
+  , "description": "digit three + combining enclosing keycap"
+  , "aliases": [
+      "three"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "4️⃣"
+  , "description": "digit four + combining enclosing keycap"
+  , "aliases": [
+      "four"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "5️⃣"
+  , "description": "digit five + combining enclosing keycap"
+  , "aliases": [
+      "five"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "6️⃣"
+  , "description": "digit six + combining enclosing keycap"
+  , "aliases": [
+      "six"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "7️⃣"
+  , "description": "digit seven + combining enclosing keycap"
+  , "aliases": [
+      "seven"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "8️⃣"
+  , "description": "digit eight + combining enclosing keycap"
+  , "aliases": [
+      "eight"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "9️⃣"
+  , "description": "digit nine + combining enclosing keycap"
+  , "aliases": [
+      "nine"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "0️⃣"
+  , "description": "digit zero + combining enclosing keycap"
+  , "aliases": [
+      "zero"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔟"
+  , "description": "keycap ten"
+  , "aliases": [
+      "keycap_ten"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔢"
+  , "description": "input symbol for numbers"
+  , "aliases": [
+      "1234"
+    ]
+  , "tags": [
+      "numbers"
+    ]
+  }
+, {
+    "emoji": "#️⃣"
+  , "description": "number sign + combining enclosing keycap"
+  , "aliases": [
+      "hash"
+    ]
+  , "tags": [
+      "number"
+    ]
+  }
+, {
+    "emoji": "🔣"
+  , "description": "input symbol for symbols"
+  , "aliases": [
+      "symbols"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⬆️"
+  , "description": "upwards black arrow"
+  , "aliases": [
+      "arrow_up"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⬇️"
+  , "description": "downwards black arrow"
+  , "aliases": [
+      "arrow_down"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⬅️"
+  , "description": "leftwards black arrow"
+  , "aliases": [
+      "arrow_left"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "➡️"
+  , "description": "black rightwards arrow"
+  , "aliases": [
+      "arrow_right"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔠"
+  , "description": "input symbol for latin capital letters"
+  , "aliases": [
+      "capital_abcd"
+    ]
+  , "tags": [
+      "letters"
+    ]
+  }
+, {
+    "emoji": "🔡"
+  , "description": "input symbol for latin small letters"
+  , "aliases": [
+      "abcd"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔤"
+  , "description": "input symbol for latin letters"
+  , "aliases": [
+      "abc"
+    ]
+  , "tags": [
+      "alphabet"
+    ]
+  }
+, {
+    "emoji": "↗️"
+  , "description": "north east arrow"
+  , "aliases": [
+      "arrow_upper_right"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "↖️"
+  , "description": "north west arrow"
+  , "aliases": [
+      "arrow_upper_left"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "↘️"
+  , "description": "south east arrow"
+  , "aliases": [
+      "arrow_lower_right"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "↙️"
+  , "description": "south west arrow"
+  , "aliases": [
+      "arrow_lower_left"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "↔️"
+  , "description": "left right arrow"
+  , "aliases": [
+      "left_right_arrow"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "↕️"
+  , "description": "up down arrow"
+  , "aliases": [
+      "arrow_up_down"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔄"
+  , "description": "anticlockwise downwards and upwards open circle arrows"
+  , "aliases": [
+      "arrows_counterclockwise"
+    ]
+  , "tags": [
+      "sync"
+    ]
+  }
+, {
+    "emoji": "◀️"
+  , "description": "black left-pointing triangle"
+  , "aliases": [
+      "arrow_backward"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "▶️"
+  , "description": "black right-pointing triangle"
+  , "aliases": [
+      "arrow_forward"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔼"
+  , "description": "up-pointing small red triangle"
+  , "aliases": [
+      "arrow_up_small"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔽"
+  , "description": "down-pointing small red triangle"
+  , "aliases": [
+      "arrow_down_small"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "↩️"
+  , "description": "leftwards arrow with hook"
+  , "aliases": [
+      "leftwards_arrow_with_hook"
+    ]
+  , "tags": [
+      "return"
+    ]
+  }
+, {
+    "emoji": "↪️"
+  , "description": "rightwards arrow with hook"
+  , "aliases": [
+      "arrow_right_hook"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "ℹ️"
+  , "description": "information source"
+  , "aliases": [
+      "information_source"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⏪"
+  , "description": "black left-pointing double triangle"
+  , "aliases": [
+      "rewind"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⏩"
+  , "description": "black right-pointing double triangle"
+  , "aliases": [
+      "fast_forward"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⏫"
+  , "description": "black up-pointing double triangle"
+  , "aliases": [
+      "arrow_double_up"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⏬"
+  , "description": "black down-pointing double triangle"
+  , "aliases": [
+      "arrow_double_down"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⤵️"
+  , "description": "arrow pointing rightwards then curving downwards"
+  , "aliases": [
+      "arrow_heading_down"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⤴️"
+  , "description": "arrow pointing rightwards then curving upwards"
+  , "aliases": [
+      "arrow_heading_up"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🆗"
+  , "description": "squared ok"
+  , "aliases": [
+      "ok"
+    ]
+  , "tags": [
+      "yes"
+    ]
+  }
+, {
+    "emoji": "🔀"
+  , "description": "twisted rightwards arrows"
+  , "aliases": [
+      "twisted_rightwards_arrows"
+    ]
+  , "tags": [
+      "shuffle"
+    ]
+  }
+, {
+    "emoji": "🔁"
+  , "description": "clockwise rightwards and leftwards open circle arrows"
+  , "aliases": [
+      "repeat"
+    ]
+  , "tags": [
+      "loop"
+    ]
+  }
+, {
+    "emoji": "🔂"
+  , "description": "clockwise rightwards and leftwards open circle arrows with circled one overlay"
+  , "aliases": [
+      "repeat_one"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🆕"
+  , "description": "squared new"
+  , "aliases": [
+      "new"
+    ]
+  , "tags": [
+      "fresh"
+    ]
+  }
+, {
+    "emoji": "🆙"
+  , "description": "squared up with exclamation mark"
+  , "aliases": [
+      "up"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🆒"
+  , "description": "squared cool"
+  , "aliases": [
+      "cool"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🆓"
+  , "description": "squared free"
+  , "aliases": [
+      "free"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🆖"
+  , "description": "squared ng"
+  , "aliases": [
+      "ng"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📶"
+  , "description": "antenna with bars"
+  , "aliases": [
+      "signal_strength"
+    ]
+  , "tags": [
+      "wifi"
+    ]
+  }
+, {
+    "emoji": "🎦"
+  , "description": "cinema"
+  , "aliases": [
+      "cinema"
+    ]
+  , "tags": [
+      "film"
+    , "movie"
+    ]
+  }
+, {
+    "emoji": "🈁"
+  , "description": "squared katakana koko"
+  , "aliases": [
+      "koko"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈯"
+  , "description": "squared cjk unified ideograph-6307"
+  , "aliases": [
+      "u6307"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈳"
+  , "description": "squared cjk unified ideograph-7a7a"
+  , "aliases": [
+      "u7a7a"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈵"
+  , "description": "squared cjk unified ideograph-6e80"
+  , "aliases": [
+      "u6e80"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈴"
+  , "description": "squared cjk unified ideograph-5408"
+  , "aliases": [
+      "u5408"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈲"
+  , "description": "squared cjk unified ideograph-7981"
+  , "aliases": [
+      "u7981"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🉐"
+  , "description": "circled ideograph advantage"
+  , "aliases": [
+      "ideograph_advantage"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈹"
+  , "description": "squared cjk unified ideograph-5272"
+  , "aliases": [
+      "u5272"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈺"
+  , "description": "squared cjk unified ideograph-55b6"
+  , "aliases": [
+      "u55b6"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈶"
+  , "description": "squared cjk unified ideograph-6709"
+  , "aliases": [
+      "u6709"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈚"
+  , "description": "squared cjk unified ideograph-7121"
+  , "aliases": [
+      "u7121"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚻"
+  , "description": "restroom"
+  , "aliases": [
+      "restroom"
+    ]
+  , "tags": [
+      "toilet"
+    ]
+  }
+, {
+    "emoji": "🚹"
+  , "description": "mens symbol"
+  , "aliases": [
+      "mens"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚺"
+  , "description": "womens symbol"
+  , "aliases": [
+      "womens"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚼"
+  , "description": "baby symbol"
+  , "aliases": [
+      "baby_symbol"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚾"
+  , "description": "water closet"
+  , "aliases": [
+      "wc"
+    ]
+  , "tags": [
+      "toilet"
+    , "restroom"
+    ]
+  }
+, {
+    "emoji": "🚰"
+  , "description": "potable water symbol"
+  , "aliases": [
+      "potable_water"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚮"
+  , "description": "put litter in its place symbol"
+  , "aliases": [
+      "put_litter_in_its_place"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🅿️"
+  , "description": "negative squared latin capital letter p"
+  , "aliases": [
+      "parking"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♿"
+  , "description": "wheelchair symbol"
+  , "aliases": [
+      "wheelchair"
+    ]
+  , "tags": [
+      "accessibility"
+    ]
+  }
+, {
+    "emoji": "🚭"
+  , "description": "no smoking symbol"
+  , "aliases": [
+      "no_smoking"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈷️"
+  , "description": "squared cjk unified ideograph-6708"
+  , "aliases": [
+      "u6708"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈸"
+  , "description": "squared cjk unified ideograph-7533"
+  , "aliases": [
+      "u7533"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🈂️"
+  , "description": "squared katakana sa"
+  , "aliases": [
+      "sa"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "Ⓜ️"
+  , "description": "circled latin capital letter m"
+  , "aliases": [
+      "m"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🛂"
+  , "description": "passport control"
+  , "aliases": [
+      "passport_control"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🛄"
+  , "description": "baggage claim"
+  , "aliases": [
+      "baggage_claim"
+    ]
+  , "tags": [
+      "airport"
+    ]
+  }
+, {
+    "emoji": "🛅"
+  , "description": "left luggage"
+  , "aliases": [
+      "left_luggage"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🛃"
+  , "description": "customs"
+  , "aliases": [
+      "customs"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🉑"
+  , "description": "circled ideograph accept"
+  , "aliases": [
+      "accept"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "㊙️"
+  , "description": "circled ideograph secret"
+  , "aliases": [
+      "secret"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "㊗️"
+  , "description": "circled ideograph congratulation"
+  , "aliases": [
+      "congratulations"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🆑"
+  , "description": "squared cl"
+  , "aliases": [
+      "cl"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🆘"
+  , "description": "squared sos"
+  , "aliases": [
+      "sos"
+    ]
+  , "tags": [
+      "help"
+    , "emergency"
+    ]
+  }
+, {
+    "emoji": "🆔"
+  , "description": "squared id"
+  , "aliases": [
+      "id"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚫"
+  , "description": "no entry sign"
+  , "aliases": [
+      "no_entry_sign"
+    ]
+  , "tags": [
+      "block"
+    , "forbidden"
+    ]
+  }
+, {
+    "emoji": "🔞"
+  , "description": "no one under eighteen symbol"
+  , "aliases": [
+      "underage"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📵"
+  , "description": "no mobile phones"
+  , "aliases": [
+      "no_mobile_phones"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚯"
+  , "description": "do not litter symbol"
+  , "aliases": [
+      "do_not_litter"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚱"
+  , "description": "non-potable water symbol"
+  , "aliases": [
+      "non-potable_water"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚳"
+  , "description": "no bicycles"
+  , "aliases": [
+      "no_bicycles"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚷"
+  , "description": "no pedestrians"
+  , "aliases": [
+      "no_pedestrians"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🚸"
+  , "description": "children crossing"
+  , "aliases": [
+      "children_crossing"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⛔"
+  , "description": "no entry"
+  , "aliases": [
+      "no_entry"
+    ]
+  , "tags": [
+      "limit"
+    ]
+  }
+, {
+    "emoji": "✳️"
+  , "description": "eight spoked asterisk"
+  , "aliases": [
+      "eight_spoked_asterisk"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "❇️"
+  , "description": "sparkle"
+  , "aliases": [
+      "sparkle"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "❎"
+  , "description": "negative squared cross mark"
+  , "aliases": [
+      "negative_squared_cross_mark"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "✅"
+  , "description": "white heavy check mark"
+  , "aliases": [
+      "white_check_mark"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "✴️"
+  , "description": "eight pointed black star"
+  , "aliases": [
+      "eight_pointed_black_star"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💟"
+  , "description": "heart decoration"
+  , "aliases": [
+      "heart_decoration"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🆚"
+  , "description": "squared vs"
+  , "aliases": [
+      "vs"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📳"
+  , "description": "vibration mode"
+  , "aliases": [
+      "vibration_mode"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "📴"
+  , "description": "mobile phone off"
+  , "aliases": [
+      "mobile_phone_off"
+    ]
+  , "tags": [
+      "mute"
+    , "off"
+    ]
+  }
+, {
+    "emoji": "🅰️"
+  , "description": "negative squared latin capital letter a"
+  , "aliases": [
+      "a"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🅱️"
+  , "description": "negative squared latin capital letter b"
+  , "aliases": [
+      "b"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🆎"
+  , "description": "negative squared ab"
+  , "aliases": [
+      "ab"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🅾️"
+  , "description": "negative squared latin capital letter o"
+  , "aliases": [
+      "o2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💠"
+  , "description": "diamond shape with a dot inside"
+  , "aliases": [
+      "diamond_shape_with_a_dot_inside"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "➿"
+  , "description": "double curly loop"
+  , "aliases": [
+      "loop"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♻️"
+  , "description": "black universal recycling symbol"
+  , "aliases": [
+      "recycle"
+    ]
+  , "tags": [
+      "environment"
+    , "green"
+    ]
+  }
+, {
+    "emoji": "♈"
+  , "description": "aries"
+  , "aliases": [
+      "aries"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♉"
+  , "description": "taurus"
+  , "aliases": [
+      "taurus"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♊"
+  , "description": "gemini"
+  , "aliases": [
+      "gemini"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♋"
+  , "description": "cancer"
+  , "aliases": [
+      "cancer"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♌"
+  , "description": "leo"
+  , "aliases": [
+      "leo"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♍"
+  , "description": "virgo"
+  , "aliases": [
+      "virgo"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♎"
+  , "description": "libra"
+  , "aliases": [
+      "libra"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♏"
+  , "description": "scorpius"
+  , "aliases": [
+      "scorpius"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♐"
+  , "description": "sagittarius"
+  , "aliases": [
+      "sagittarius"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♑"
+  , "description": "capricorn"
+  , "aliases": [
+      "capricorn"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♒"
+  , "description": "aquarius"
+  , "aliases": [
+      "aquarius"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♓"
+  , "description": "pisces"
+  , "aliases": [
+      "pisces"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⛎"
+  , "description": "ophiuchus"
+  , "aliases": [
+      "ophiuchus"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔯"
+  , "description": "six pointed star with middle dot"
+  , "aliases": [
+      "six_pointed_star"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🏧"
+  , "description": "automated teller machine"
+  , "aliases": [
+      "atm"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💹"
+  , "description": "chart with upwards trend and yen sign"
+  , "aliases": [
+      "chart"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💲"
+  , "description": "heavy dollar sign"
+  , "aliases": [
+      "heavy_dollar_sign"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💱"
+  , "description": "currency exchange"
+  , "aliases": [
+      "currency_exchange"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "©️"
+  , "description": "copyright sign"
+  , "aliases": [
+      "copyright"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "®️"
+  , "description": "registered sign"
+  , "aliases": [
+      "registered"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "™️"
+  , "description": "trade mark sign"
+  , "aliases": [
+      "tm"
+    ]
+  , "tags": [
+      "trademark"
+    ]
+  }
+, {
+    "emoji": "❌"
+  , "description": "cross mark"
+  , "aliases": [
+      "x"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "‼️"
+  , "description": "double exclamation mark"
+  , "aliases": [
+      "bangbang"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⁉️"
+  , "description": "exclamation question mark"
+  , "aliases": [
+      "interrobang"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "❗"
+  , "description": "heavy exclamation mark symbol"
+  , "aliases": [
+      "exclamation"
+    , "heavy_exclamation_mark"
+    ]
+  , "tags": [
+      "bang"
+    ]
+  }
+, {
+    "emoji": "❓"
+  , "description": "black question mark ornament"
+  , "aliases": [
+      "question"
+    ]
+  , "tags": [
+      "confused"
+    ]
+  }
+, {
+    "emoji": "❕"
+  , "description": "white exclamation mark ornament"
+  , "aliases": [
+      "grey_exclamation"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "❔"
+  , "description": "white question mark ornament"
+  , "aliases": [
+      "grey_question"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⭕"
+  , "description": "heavy large circle"
+  , "aliases": [
+      "o"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔝"
+  , "description": "top with upwards arrow above"
+  , "aliases": [
+      "top"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔚"
+  , "description": "end with leftwards arrow above"
+  , "aliases": [
+      "end"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔙"
+  , "description": "back with leftwards arrow above"
+  , "aliases": [
+      "back"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔛"
+  , "description": "on with exclamation mark with left right arrow above"
+  , "aliases": [
+      "on"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔜"
+  , "description": "soon with rightwards arrow above"
+  , "aliases": [
+      "soon"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔃"
+  , "description": "clockwise downwards and upwards open circle arrows"
+  , "aliases": [
+      "arrows_clockwise"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕛"
+  , "description": "clock face twelve oclock"
+  , "aliases": [
+      "clock12"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕧"
+  , "description": "clock face twelve-thirty"
+  , "aliases": [
+      "clock1230"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕐"
+  , "description": "clock face one oclock"
+  , "aliases": [
+      "clock1"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕜"
+  , "description": "clock face one-thirty"
+  , "aliases": [
+      "clock130"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕑"
+  , "description": "clock face two oclock"
+  , "aliases": [
+      "clock2"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕝"
+  , "description": "clock face two-thirty"
+  , "aliases": [
+      "clock230"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕒"
+  , "description": "clock face three oclock"
+  , "aliases": [
+      "clock3"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕞"
+  , "description": "clock face three-thirty"
+  , "aliases": [
+      "clock330"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕓"
+  , "description": "clock face four oclock"
+  , "aliases": [
+      "clock4"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕟"
+  , "description": "clock face four-thirty"
+  , "aliases": [
+      "clock430"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕔"
+  , "description": "clock face five oclock"
+  , "aliases": [
+      "clock5"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕠"
+  , "description": "clock face five-thirty"
+  , "aliases": [
+      "clock530"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕕"
+  , "description": "clock face six oclock"
+  , "aliases": [
+      "clock6"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕖"
+  , "description": "clock face seven oclock"
+  , "aliases": [
+      "clock7"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕗"
+  , "description": "clock face eight oclock"
+  , "aliases": [
+      "clock8"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕘"
+  , "description": "clock face nine oclock"
+  , "aliases": [
+      "clock9"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕙"
+  , "description": "clock face ten oclock"
+  , "aliases": [
+      "clock10"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕚"
+  , "description": "clock face eleven oclock"
+  , "aliases": [
+      "clock11"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕡"
+  , "description": "clock face six-thirty"
+  , "aliases": [
+      "clock630"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕢"
+  , "description": "clock face seven-thirty"
+  , "aliases": [
+      "clock730"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕣"
+  , "description": "clock face eight-thirty"
+  , "aliases": [
+      "clock830"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕤"
+  , "description": "clock face nine-thirty"
+  , "aliases": [
+      "clock930"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕥"
+  , "description": "clock face ten-thirty"
+  , "aliases": [
+      "clock1030"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🕦"
+  , "description": "clock face eleven-thirty"
+  , "aliases": [
+      "clock1130"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "✖️"
+  , "description": "heavy multiplication x"
+  , "aliases": [
+      "heavy_multiplication_x"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "➕"
+  , "description": "heavy plus sign"
+  , "aliases": [
+      "heavy_plus_sign"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "➖"
+  , "description": "heavy minus sign"
+  , "aliases": [
+      "heavy_minus_sign"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "➗"
+  , "description": "heavy division sign"
+  , "aliases": [
+      "heavy_division_sign"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♠️"
+  , "description": "black spade suit"
+  , "aliases": [
+      "spades"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♥️"
+  , "description": "black heart suit"
+  , "aliases": [
+      "hearts"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♣️"
+  , "description": "black club suit"
+  , "aliases": [
+      "clubs"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "♦️"
+  , "description": "black diamond suit"
+  , "aliases": [
+      "diamonds"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💮"
+  , "description": "white flower"
+  , "aliases": [
+      "white_flower"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "💯"
+  , "description": "hundred points symbol"
+  , "aliases": [
+      "100"
+    ]
+  , "tags": [
+      "score"
+    , "perfect"
+    ]
+  }
+, {
+    "emoji": "✔️"
+  , "description": "heavy check mark"
+  , "aliases": [
+      "heavy_check_mark"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "☑️"
+  , "description": "ballot box with check"
+  , "aliases": [
+      "ballot_box_with_check"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔘"
+  , "description": "radio button"
+  , "aliases": [
+      "radio_button"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔗"
+  , "description": "link symbol"
+  , "aliases": [
+      "link"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "➰"
+  , "description": "curly loop"
+  , "aliases": [
+      "curly_loop"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "〰️"
+  , "description": "wavy dash"
+  , "aliases": [
+      "wavy_dash"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "〽️"
+  , "description": "part alternation mark"
+  , "aliases": [
+      "part_alternation_mark"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔱"
+  , "description": "trident emblem"
+  , "aliases": [
+      "trident"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "◼️"
+  , "description": "black medium square"
+  , "aliases": [
+      "black_medium_square"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "◻️"
+  , "description": "white medium square"
+  , "aliases": [
+      "white_medium_square"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "◾"
+  , "description": "black medium small square"
+  , "aliases": [
+      "black_medium_small_square"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "◽"
+  , "description": "white medium small square"
+  , "aliases": [
+      "white_medium_small_square"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "▪️"
+  , "description": "black small square"
+  , "aliases": [
+      "black_small_square"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "▫️"
+  , "description": "white small square"
+  , "aliases": [
+      "white_small_square"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔺"
+  , "description": "up-pointing red triangle"
+  , "aliases": [
+      "small_red_triangle"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔲"
+  , "description": "black square button"
+  , "aliases": [
+      "black_square_button"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔳"
+  , "description": "white square button"
+  , "aliases": [
+      "white_square_button"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⚫"
+  , "description": "medium black circle"
+  , "aliases": [
+      "black_circle"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⚪"
+  , "description": "medium white circle"
+  , "aliases": [
+      "white_circle"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔴"
+  , "description": "large red circle"
+  , "aliases": [
+      "red_circle"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔵"
+  , "description": "large blue circle"
+  , "aliases": [
+      "large_blue_circle"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔻"
+  , "description": "down-pointing red triangle"
+  , "aliases": [
+      "small_red_triangle_down"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⬜"
+  , "description": "white large square"
+  , "aliases": [
+      "white_large_square"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "⬛"
+  , "description": "black large square"
+  , "aliases": [
+      "black_large_square"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔶"
+  , "description": "large orange diamond"
+  , "aliases": [
+      "large_orange_diamond"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔷"
+  , "description": "large blue diamond"
+  , "aliases": [
+      "large_blue_diamond"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔸"
+  , "description": "small orange diamond"
+  , "aliases": [
+      "small_orange_diamond"
+    ]
+  , "tags": [
+    ]
+  }
+, {
+    "emoji": "🔹"
+  , "description": "small blue diamond"
+  , "aliases": [
+      "small_blue_diamond"
+    ]
+  , "tags": [
+    ]
+  }
+]
diff --git a/plugins/emoji/lib/emoji.rb b/plugins/emoji/lib/emoji.rb
new file mode 100644
index 0000000000..c0ad80b473
--- /dev/null
+++ b/plugins/emoji/lib/emoji.rb
@@ -0,0 +1,4 @@
+require "emoji/engine"
+
+module Emoji
+end
diff --git a/plugins/emoji/lib/emoji/engine.rb b/plugins/emoji/lib/emoji/engine.rb
new file mode 100644
index 0000000000..ceade33a03
--- /dev/null
+++ b/plugins/emoji/lib/emoji/engine.rb
@@ -0,0 +1,20 @@
+module Emoji
+  class Engine < ::Rails::Engine
+    isolate_namespace Emoji
+  end
+
+  def self.all
+    return @all if defined?(@all)
+    @all = parse_db
+  end
+
+  def self.db_file
+    File.expand_path('../../../db.json', __FILE__)
+  end
+
+  private
+
+    def self.parse_db
+      File.open(db_file, "r:UTF-8") { |f| JSON.parse(f.read) }
+    end
+end
diff --git a/plugins/emoji/lib/emoji/version.rb b/plugins/emoji/lib/emoji/version.rb
new file mode 100644
index 0000000000..2196b3eaea
--- /dev/null
+++ b/plugins/emoji/lib/emoji/version.rb
@@ -0,0 +1,3 @@
+module Emoji
+  VERSION = "0.0.1"
+end
diff --git a/plugins/emoji/lib/tasks/emoji.rake b/plugins/emoji/lib/tasks/emoji.rake
new file mode 100644
index 0000000000..b9830c01b2
--- /dev/null
+++ b/plugins/emoji/lib/tasks/emoji.rake
@@ -0,0 +1,48 @@
+desc "update emoji images"
+task "emoji:update" => :environment do
+  download_emojis_for("emoji_one", "https://raw.githubusercontent.com/Ranks/emojione/master/assets/png/%s.png", uppercase: true, leading_zeros: true)
+  download_emojis_for("twitter", "https://raw.githubusercontent.com/twitter/twemoji/gh-pages/72x72/%s.png", lowercase: true)
+  download_emojis_for("apple", "https://raw.githubusercontent.com/github/gemoji/master/images/emoji/unicode/%s.png", lowercase: true, leading_zeros: true)
+  # download_google_emojis("https://raw.githubusercontent.com/gjtorikian/NotoColorEmoji-png/master/images/68x64/%s.png")
+end
+
+def download_emojis_for(set, url_template, options={})
+  puts "Downloading emojis for #{set}..."
+
+  uppercase = options[:uppercase] == true
+  lowercase = options[:lowercase] == true
+  leading_zeros = options[:leading_zeros] == true
+
+  Emoji.all.each do |emoji|
+    codepoints = emoji["emoji"].codepoints.map { |c| c.to_s(16).rjust(leading_zeros ? 4 : 0, '0') }
+    filename = codepoints.join('-').sub(/-fe0f\b/, '')
+    filename = filename.downcase if lowercase
+    filename = filename.upcase if uppercase
+    puts "#{filename} -> #{emoji["emoji"]}"
+    url = url_template % filename
+    data = open(url).read rescue nil
+    next if data.nil?
+    emoji["aliases"].each do |name|
+      File.open("plugins/emoji/public/images/#{set}/#{name}.png", "wb") { |f| f << data }
+    end
+  end
+end
+
+# extracted from the NotoColorEmoji font
+GOOGLE_EMOJIS = {169=>19, 174=>20, 8419=>23, 8482=>25, 8986=>114, 8987=>115, 9193=>806, 9194=>807, 9195=>270, 9196=>271, 9200=>275, 9203=>276, 9729=>86, 9745=>799, 9748=>654, 9749=>655, 9757=>17, 9786=>692, 9800=>702, 9801=>622, 9802=>704, 9803=>705, 9804=>706, 9805=>626, 9806=>708, 9807=>709, 9808=>710, 9809=>711, 9810=>712, 9811=>713, 9851=>714, 9855=>715, 9875=>805, 9888=>816, 9889=>749, 9917=>14, 9918=>15, 9924=>784, 9925=>785, 9934=>786, 9940=>787, 9962=>788, 9970=>789, 9971=>790, 9973=>791, 9978=>792, 9981=>793, 9989=>794, 9994=>795, 9995=>796, 9996=>797, 10024=>798, 10060=>800, 10062=>801, 10067=>802, 10068=>803, 10069=>804, 10133=>810, 10134=>811, 10135=>812, 10160=>814, 10175=>815, 12336=>24, 126980=>1, 127183=>21, 127344=>26, 127345=>27, 127358=>28, 127359=>29, 127374=>30, 127377=>31, 127378=>32, 127379=>33, 127380=>34, 127381=>35, 127382=>36, 127383=>37, 127384=>38, 127385=>39, 127386=>40, 127462=>41, 127463=>42, 127464=>43, 127465=>44, 127466=>45, 127467=>46, 127468=>47, 127469=>48, 127470=>49, 127471=>50, 127472=>51, 127473=>52, 127474=>53, 127475=>54, 127476=>55, 127477=>56, 127478=>57, 127479=>58, 127480=>59, 127481=>60, 127482=>61, 127483=>62, 127484=>63, 127485=>64, 127486=>65, 127487=>66, 127489=>67, 127490=>68, 127514=>69, 127535=>71, 127538=>72, 127539=>73, 127540=>74, 127541=>75, 127542=>76, 127543=>77, 127544=>78, 127545=>79, 127546=>80, 127568=>81, 127569=>82, 127744=>88, 127745=>89, 127746=>90, 127747=>91, 127748=>92, 127749=>93, 127750=>94, 127751=>95, 127752=>96, 127753=>97, 127754=>98, 127755=>99, 127756=>100, 127757=>101, 127758=>102, 127759=>103, 127760=>104, 127761=>105, 127762=>106, 127763=>107, 127764=>108, 127765=>109, 127766=>110, 127767=>111, 127768=>112, 127769=>113, 127770=>84, 127771=>85, 127772=>116, 127773=>117, 127774=>118, 127775=>119, 127776=>120, 127792=>121, 127793=>122, 127794=>123, 127795=>124, 127796=>125, 127797=>126, 127799=>127, 127800=>128, 127801=>129, 127802=>130, 127803=>131, 127804=>132, 127805=>133, 127806=>134, 127807=>135, 127808=>136, 127809=>137, 127810=>138, 127811=>139, 127812=>140, 127813=>141, 127814=>142, 127815=>143, 127816=>144, 127817=>145, 127818=>146, 127819=>147, 127820=>148, 127821=>149, 127822=>150, 127823=>151, 127824=>152, 127825=>153, 127826=>154, 127827=>155, 127828=>156, 127829=>157, 127830=>158, 127831=>159, 127832=>160, 127833=>161, 127834=>162, 127835=>163, 127836=>164, 127837=>165, 127838=>166, 127839=>167, 127840=>168, 127841=>169, 127842=>170, 127843=>171, 127844=>172, 127845=>173, 127846=>174, 127847=>175, 127848=>176, 127849=>177, 127850=>178, 127851=>179, 127852=>180, 127853=>181, 127854=>182, 127855=>183, 127856=>184, 127857=>185, 127858=>186, 127859=>187, 127860=>188, 127861=>189, 127862=>190, 127863=>191, 127864=>192, 127865=>193, 127866=>194, 127867=>195, 127868=>196, 127872=>197, 127873=>198, 127874=>199, 127875=>200, 127876=>201, 127877=>202, 127878=>203, 127879=>204, 127880=>205, 127881=>206, 127882=>207, 127883=>208, 127884=>209, 127885=>210, 127886=>211, 127887=>212, 127888=>213, 127889=>214, 127890=>215, 127891=>216, 127904=>217, 127905=>218, 127906=>219, 127907=>220, 127908=>221, 127909=>222, 127910=>223, 127911=>224, 127912=>225, 127913=>226, 127914=>227, 127915=>228, 127916=>229, 127917=>230, 127918=>231, 127919=>232, 127920=>233, 127921=>234, 127922=>235, 127923=>236, 127924=>237, 127925=>238, 127926=>239, 127927=>240, 127928=>241, 127929=>242, 127930=>243, 127931=>244, 127932=>245, 127933=>246, 127934=>247, 127935=>248, 127936=>249, 127937=>250, 127938=>251, 127939=>252, 127940=>253, 127942=>254, 127943=>255, 127944=>256, 127945=>257, 127946=>258, 127968=>259, 127969=>260, 127970=>261, 127971=>262, 127972=>263, 127973=>264, 127974=>265, 127975=>266, 127976=>267, 127977=>268, 127978=>269, 127979=>808, 127980=>809, 127981=>272, 127982=>273, 127983=>274, 127984=>813, 128000=>277, 128001=>278, 128002=>279, 128003=>280, 128004=>281, 128005=>282, 128006=>283, 128007=>284, 128008=>285, 128009=>286, 128010=>287, 128011=>288, 128012=>289, 128013=>290, 128014=>291, 128015=>292, 128016=>293, 128017=>294, 128018=>295, 128019=>296, 128020=>297, 128021=>298, 128022=>299, 128023=>300, 128024=>301, 128025=>302, 128026=>303, 128027=>304, 128028=>305, 128029=>306, 128030=>307, 128031=>308, 128032=>309, 128033=>310, 128034=>311, 128035=>312, 128036=>313, 128037=>314, 128038=>315, 128039=>316, 128040=>317, 128041=>318, 128042=>319, 128043=>320, 128044=>321, 128045=>322, 128046=>323, 128047=>324, 128048=>325, 128049=>326, 128050=>327, 128051=>328, 128052=>329, 128053=>330, 128054=>331, 128055=>332, 128056=>333, 128057=>334, 128058=>335, 128059=>336, 128060=>337, 128061=>338, 128062=>339, 128064=>340, 128066=>341, 128067=>342, 128068=>343, 128069=>344, 128070=>345, 128071=>346, 128072=>347, 128073=>348, 128074=>349, 128075=>350, 128076=>351, 128077=>352, 128078=>353, 128079=>354, 128080=>355, 128081=>356, 128082=>357, 128083=>358, 128084=>359, 128085=>360, 128086=>361, 128087=>362, 128088=>363, 128089=>364, 128090=>365, 128091=>366, 128092=>367, 128093=>368, 128094=>369, 128095=>370, 128096=>371, 128097=>372, 128098=>373, 128099=>374, 128100=>375, 128101=>376, 128102=>377, 128103=>378, 128104=>379, 128105=>380, 128106=>381, 128107=>382, 128108=>383, 128109=>384, 128110=>385, 128111=>386, 128112=>387, 128113=>388, 128114=>389, 128115=>390, 128116=>391, 128117=>392, 128118=>393, 128119=>394, 128120=>395, 128121=>87, 128122=>397, 128123=>398, 128124=>399, 128125=>400, 128126=>401, 128127=>402, 128128=>403, 128129=>404, 128130=>405, 128131=>406, 128132=>407, 128133=>408, 128134=>409, 128135=>410, 128136=>411, 128137=>412, 128138=>413, 128139=>414, 128140=>415, 128141=>416, 128142=>417, 128143=>418, 128144=>419, 128145=>420, 128146=>421, 128147=>422, 128148=>423, 128149=>424, 128150=>425, 128151=>426, 128152=>427, 128153=>428, 128154=>429, 128155=>430, 128156=>431, 128157=>432, 128158=>433, 128159=>434, 128160=>435, 128161=>436, 128162=>437, 128163=>438, 128164=>439, 128165=>440, 128166=>441, 128167=>442, 128168=>443, 128169=>444, 128170=>445, 128171=>446, 128172=>447, 128173=>448, 128174=>449, 128175=>450, 128176=>451, 128177=>452, 128178=>453, 128179=>454, 128180=>455, 128181=>456, 128182=>457, 128183=>458, 128184=>459, 128185=>460, 128186=>461, 128187=>462, 128188=>463, 128189=>464, 128190=>465, 128191=>466, 128192=>467, 128193=>468, 128194=>469, 128195=>470, 128196=>471, 128197=>472, 128198=>473, 128199=>474, 128200=>475, 128201=>476, 128202=>477, 128203=>478, 128204=>479, 128205=>480, 128206=>481, 128207=>482, 128208=>483, 128209=>484, 128210=>485, 128211=>486, 128212=>487, 128213=>488, 128214=>489, 128215=>490, 128216=>491, 128217=>492, 128218=>493, 128219=>494, 128220=>495, 128221=>496, 128222=>497, 128223=>498, 128224=>499, 128225=>500, 128226=>501, 128227=>502, 128228=>503, 128229=>604, 128230=>505, 128231=>613, 128232=>507, 128233=>615, 128234=>616, 128235=>510, 128236=>511, 128237=>512, 128238=>620, 128239=>514, 128240=>515, 128241=>516, 128242=>517, 128243=>518, 128244=>519, 128245=>520, 128246=>521, 128247=>522, 128249=>523, 128250=>524, 128251=>525, 128252=>526, 128256=>527, 128257=>528, 128258=>529, 128259=>530, 128260=>531, 128261=>532, 128262=>533, 128263=>534, 128264=>535, 128265=>536, 128266=>537, 128267=>538, 128268=>539, 128269=>540, 128270=>541, 128271=>542, 128272=>543, 128273=>544, 128274=>545, 128275=>546, 128276=>547, 128277=>548, 128278=>549, 128279=>550, 128280=>551, 128281=>552, 128282=>553, 128283=>554, 128284=>555, 128285=>556, 128286=>557, 128287=>558, 128288=>559, 128289=>560, 128290=>561, 128291=>562, 128292=>563, 128293=>564, 128294=>565, 128295=>566, 128296=>567, 128297=>568, 128298=>569, 128299=>570, 128300=>571, 128301=>572, 128302=>573, 128303=>574, 128304=>575, 128305=>576, 128306=>577, 128307=>578, 128308=>579, 128309=>580, 128310=>581, 128311=>582, 128312=>583, 128313=>584, 128314=>585, 128315=>586, 128316=>587, 128317=>588, 128336=>589, 128337=>590, 128338=>591, 128339=>592, 128340=>593, 128341=>594, 128342=>595, 128343=>596, 128344=>597, 128345=>598, 128346=>599, 128347=>600, 128348=>601, 128349=>602, 128350=>603, 128351=>13, 128352=>605, 128353=>606, 128354=>607, 128355=>608, 128356=>609, 128357=>610, 128358=>611, 128359=>612, 128507=>629, 128508=>630, 128509=>631, 128510=>632, 128511=>633, 128512=>634, 128513=>635, 128514=>636, 128515=>637, 128516=>638, 128517=>639, 128518=>640, 128519=>641, 128520=>642, 128521=>643, 128522=>644, 128523=>645, 128524=>646, 128525=>647, 128526=>648, 128527=>649, 128528=>650, 128529=>651, 128530=>652, 128531=>653, 128532=>396, 128533=>678, 128534=>656, 128535=>657, 128536=>658, 128537=>659, 128538=>660, 128539=>661, 128540=>662, 128541=>663, 128542=>664, 128543=>665, 128544=>666, 128545=>667, 128546=>668, 128547=>669, 128548=>670, 128549=>671, 128550=>672, 128551=>673, 128552=>674, 128553=>675, 128554=>676, 128555=>677, 128556=>22, 128557=>679, 128558=>680, 128559=>681, 128560=>682, 128561=>683, 128562=>684, 128563=>685, 128564=>686, 128565=>687, 128566=>688, 128567=>689, 128568=>690, 128569=>691, 128570=>83, 128571=>693, 128572=>694, 128573=>695, 128574=>696, 128575=>697, 128576=>698, 128581=>699, 128582=>700, 128583=>701, 128584=>621, 128585=>703, 128586=>623, 128587=>624, 128588=>625, 128589=>707, 128590=>627, 128591=>628, 128640=>716, 128641=>717, 128642=>718, 128643=>719, 128644=>720, 128645=>721, 128646=>722, 128647=>723, 128648=>724, 128649=>725, 128650=>726, 128651=>727, 128652=>728, 128653=>729, 128654=>730, 128655=>731, 128656=>732, 128657=>733, 128658=>734, 128659=>735, 128660=>736, 128661=>737, 128662=>738, 128663=>739, 128664=>740, 128665=>741, 128666=>742, 128667=>743, 128668=>744, 128669=>745, 128670=>746, 128671=>747, 128672=>748, 128673=>817, 128674=>750, 128675=>751, 128676=>752, 128677=>753, 128678=>754, 128679=>755, 128680=>756, 128681=>757, 128682=>758, 128683=>759, 128684=>760, 128685=>761, 128686=>762, 128687=>763, 128688=>764, 128689=>765, 128690=>766, 128691=>767, 128692=>768, 128693=>769, 128694=>770, 128695=>771, 128696=>772, 128697=>773, 128698=>774, 128699=>775, 128700=>776, 128701=>777, 128702=>778, 128703=>779, 128704=>780, 128705=>781, 128706=>782, 128707=>783, 128708=>16, 128709=>18, 1041637=>504, 1041638=>70, 1041639=>506, 1041640=>614, 1041641=>508, 1041642=>509, 1041643=>617, 1041644=>618, 1041645=>619, 1041646=>513, 1042476=>2, 1042478=>3, 1042479=>4, 1042480=>5, 1042481=>6, 1042482=>7, 1042483=>8, 1042484=>9, 1042485=>10, 1042486=>11, 1042487=>12}.freeze
+
+def download_google_emojis(url_template)
+  puts "Downloading emojis for google..."
+  Emoji.all.each do |emoji|
+    codepoint = emoji["emoji"].codepoints.first
+    filename = GOOGLE_EMOJIS[codepoint]
+    next if filename.nil?
+    puts "#{filename} -> #{emoji["emoji"]}"
+    url = url_template % filename
+    data = open(url).read rescue nil
+    next if data.nil?
+    emoji["aliases"].each do |name|
+      File.open("plugins/emoji/public/images/google/#{name}.png", "wb") { |f| f << data }
+    end
+  end
+end
diff --git a/plugins/emoji/plugin.rb b/plugins/emoji/plugin.rb
index 261b668634..c6d70a3410 100644
--- a/plugins/emoji/plugin.rb
+++ b/plugins/emoji/plugin.rb
@@ -1,14 +1,33 @@
 # name: emoji
 # about: emoji support for Discourse
-# version: 0.1
-# authors: Sam Saffron, Robin Ward
+# version: 0.2
+# authors: Sam Saffron, Robin Ward, Régis Hanol
+
+load File.expand_path('../lib/emoji/engine.rb', __FILE__)
 
 register_asset('javascripts/emoji.js.erb', :server_side)
+register_asset('javascripts/emoji-autocomplete.js', :composer)
+register_asset('javascripts/discourse/templates/emoji-toolbar.raw.hbs', :composer)
+register_asset('javascripts/emoji-toolbar.js', :composer)
 register_asset('stylesheets/emoji.css')
 
-after_initialize do
+def site_setting_saved(site_setting)
+  return unless site_setting.name.to_s == "emoji_set"
+  return unless site_setting.value_changed?
+  before = "/plugins/emoji/images/#{site_setting.value_was}/"
+  after = "/plugins/emoji/images/#{site_setting.value}/"
+  Scheduler::Defer.later "Fix Emoji Links" do
+    Post.exec_sql("UPDATE posts SET cooked = REPLACE(cooked, :before, :after) WHERE cooked LIKE :like",
+      before: before,
+      after: after,
+      like: "%#{before}%"
+    )
+  end
+end
 
+listen_for(:site_setting_saved)
+
+after_initialize do
   # whitelist emojis so that new user can post emojis
   Post::white_listed_image_classes << "emoji"
-
 end
diff --git a/plugins/emoji/public/images/+1.png b/plugins/emoji/public/images/+1.png
deleted file mode 120000
index 5db29d6679..0000000000
--- a/plugins/emoji/public/images/+1.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f44d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/-1.png b/plugins/emoji/public/images/-1.png
deleted file mode 120000
index 5b63ed9312..0000000000
--- a/plugins/emoji/public/images/-1.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f44e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/100.png b/plugins/emoji/public/images/100.png
deleted file mode 120000
index e30cb95244..0000000000
--- a/plugins/emoji/public/images/100.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4af.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/1234.png b/plugins/emoji/public/images/1234.png
deleted file mode 120000
index 4bf1900645..0000000000
--- a/plugins/emoji/public/images/1234.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f522.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/8ball.png b/plugins/emoji/public/images/8ball.png
deleted file mode 120000
index 6c016fe572..0000000000
--- a/plugins/emoji/public/images/8ball.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/a.png b/plugins/emoji/public/images/a.png
deleted file mode 120000
index 18baa8b96e..0000000000
--- a/plugins/emoji/public/images/a.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f170.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ab.png b/plugins/emoji/public/images/ab.png
deleted file mode 120000
index 6f9b70186c..0000000000
--- a/plugins/emoji/public/images/ab.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f18e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/abc.png b/plugins/emoji/public/images/abc.png
deleted file mode 120000
index 129ae4d246..0000000000
--- a/plugins/emoji/public/images/abc.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f524.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/abcd.png b/plugins/emoji/public/images/abcd.png
deleted file mode 120000
index 8e0e9ab617..0000000000
--- a/plugins/emoji/public/images/abcd.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f521.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/accept.png b/plugins/emoji/public/images/accept.png
deleted file mode 120000
index 2209f8c9b7..0000000000
--- a/plugins/emoji/public/images/accept.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f251.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/aerial_tramway.png b/plugins/emoji/public/images/aerial_tramway.png
deleted file mode 120000
index 4c5c67d0be..0000000000
--- a/plugins/emoji/public/images/aerial_tramway.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/airplane.png b/plugins/emoji/public/images/airplane.png
deleted file mode 120000
index f23c42ec98..0000000000
--- a/plugins/emoji/public/images/airplane.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2708.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/alarm_clock.png b/plugins/emoji/public/images/alarm_clock.png
deleted file mode 120000
index d252dcded5..0000000000
--- a/plugins/emoji/public/images/alarm_clock.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/23f0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/alien.png b/plugins/emoji/public/images/alien.png
deleted file mode 120000
index b9b26dda62..0000000000
--- a/plugins/emoji/public/images/alien.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f47d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ambulance.png b/plugins/emoji/public/images/ambulance.png
deleted file mode 120000
index 980cdca7e0..0000000000
--- a/plugins/emoji/public/images/ambulance.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f691.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/anchor.png b/plugins/emoji/public/images/anchor.png
deleted file mode 120000
index 5d08956426..0000000000
--- a/plugins/emoji/public/images/anchor.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2693.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/angel.png b/plugins/emoji/public/images/angel.png
deleted file mode 120000
index 949743f558..0000000000
--- a/plugins/emoji/public/images/angel.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f47c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/anger.png b/plugins/emoji/public/images/anger.png
deleted file mode 120000
index dfdd816cd1..0000000000
--- a/plugins/emoji/public/images/anger.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/angry.png b/plugins/emoji/public/images/angry.png
deleted file mode 120000
index 284a52e3fa..0000000000
--- a/plugins/emoji/public/images/angry.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f620.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/anguished.png b/plugins/emoji/public/images/anguished.png
deleted file mode 120000
index 8fe3bf3db9..0000000000
--- a/plugins/emoji/public/images/anguished.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f627.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ant.png b/plugins/emoji/public/images/ant.png
deleted file mode 120000
index c40148e514..0000000000
--- a/plugins/emoji/public/images/ant.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f41c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/apple.png b/plugins/emoji/public/images/apple.png
deleted file mode 120000
index 4eb02bb660..0000000000
--- a/plugins/emoji/public/images/apple.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f34e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/apple/+1.png b/plugins/emoji/public/images/apple/+1.png
new file mode 100644
index 0000000000..e1d89aada6
Binary files /dev/null and b/plugins/emoji/public/images/apple/+1.png differ
diff --git a/plugins/emoji/public/images/apple/-1.png b/plugins/emoji/public/images/apple/-1.png
new file mode 100644
index 0000000000..c7fb4c0649
Binary files /dev/null and b/plugins/emoji/public/images/apple/-1.png differ
diff --git a/plugins/emoji/public/images/apple/100.png b/plugins/emoji/public/images/apple/100.png
new file mode 100644
index 0000000000..c5baf8471a
Binary files /dev/null and b/plugins/emoji/public/images/apple/100.png differ
diff --git a/plugins/emoji/public/images/apple/1234.png b/plugins/emoji/public/images/apple/1234.png
new file mode 100644
index 0000000000..54320e6e9e
Binary files /dev/null and b/plugins/emoji/public/images/apple/1234.png differ
diff --git a/plugins/emoji/public/images/apple/8ball.png b/plugins/emoji/public/images/apple/8ball.png
new file mode 100644
index 0000000000..118184cdec
Binary files /dev/null and b/plugins/emoji/public/images/apple/8ball.png differ
diff --git a/plugins/emoji/public/images/apple/a.png b/plugins/emoji/public/images/apple/a.png
new file mode 100644
index 0000000000..826f6211bd
Binary files /dev/null and b/plugins/emoji/public/images/apple/a.png differ
diff --git a/plugins/emoji/public/images/apple/ab.png b/plugins/emoji/public/images/apple/ab.png
new file mode 100644
index 0000000000..acd6e1290e
Binary files /dev/null and b/plugins/emoji/public/images/apple/ab.png differ
diff --git a/plugins/emoji/public/images/apple/abc.png b/plugins/emoji/public/images/apple/abc.png
new file mode 100644
index 0000000000..be0db0d75a
Binary files /dev/null and b/plugins/emoji/public/images/apple/abc.png differ
diff --git a/plugins/emoji/public/images/apple/abcd.png b/plugins/emoji/public/images/apple/abcd.png
new file mode 100644
index 0000000000..72713ba661
Binary files /dev/null and b/plugins/emoji/public/images/apple/abcd.png differ
diff --git a/plugins/emoji/public/images/apple/accept.png b/plugins/emoji/public/images/apple/accept.png
new file mode 100644
index 0000000000..8d7128c825
Binary files /dev/null and b/plugins/emoji/public/images/apple/accept.png differ
diff --git a/plugins/emoji/public/images/apple/aerial_tramway.png b/plugins/emoji/public/images/apple/aerial_tramway.png
new file mode 100644
index 0000000000..2a00e86920
Binary files /dev/null and b/plugins/emoji/public/images/apple/aerial_tramway.png differ
diff --git a/plugins/emoji/public/images/apple/airplane.png b/plugins/emoji/public/images/apple/airplane.png
new file mode 100644
index 0000000000..01f79a7e28
Binary files /dev/null and b/plugins/emoji/public/images/apple/airplane.png differ
diff --git a/plugins/emoji/public/images/apple/alarm_clock.png b/plugins/emoji/public/images/apple/alarm_clock.png
new file mode 100644
index 0000000000..d8ab24775a
Binary files /dev/null and b/plugins/emoji/public/images/apple/alarm_clock.png differ
diff --git a/plugins/emoji/public/images/apple/alien.png b/plugins/emoji/public/images/apple/alien.png
new file mode 100644
index 0000000000..7564e0538b
Binary files /dev/null and b/plugins/emoji/public/images/apple/alien.png differ
diff --git a/plugins/emoji/public/images/apple/ambulance.png b/plugins/emoji/public/images/apple/ambulance.png
new file mode 100644
index 0000000000..96e78279ef
Binary files /dev/null and b/plugins/emoji/public/images/apple/ambulance.png differ
diff --git a/plugins/emoji/public/images/apple/anchor.png b/plugins/emoji/public/images/apple/anchor.png
new file mode 100644
index 0000000000..7761da427b
Binary files /dev/null and b/plugins/emoji/public/images/apple/anchor.png differ
diff --git a/plugins/emoji/public/images/apple/angel.png b/plugins/emoji/public/images/apple/angel.png
new file mode 100644
index 0000000000..1af7712c73
Binary files /dev/null and b/plugins/emoji/public/images/apple/angel.png differ
diff --git a/plugins/emoji/public/images/apple/anger.png b/plugins/emoji/public/images/apple/anger.png
new file mode 100644
index 0000000000..a4d5128dfe
Binary files /dev/null and b/plugins/emoji/public/images/apple/anger.png differ
diff --git a/plugins/emoji/public/images/apple/angry.png b/plugins/emoji/public/images/apple/angry.png
new file mode 100644
index 0000000000..d60e7220dc
Binary files /dev/null and b/plugins/emoji/public/images/apple/angry.png differ
diff --git a/plugins/emoji/public/images/apple/anguished.png b/plugins/emoji/public/images/apple/anguished.png
new file mode 100644
index 0000000000..470b36572f
Binary files /dev/null and b/plugins/emoji/public/images/apple/anguished.png differ
diff --git a/plugins/emoji/public/images/apple/ant.png b/plugins/emoji/public/images/apple/ant.png
new file mode 100644
index 0000000000..4d619880a2
Binary files /dev/null and b/plugins/emoji/public/images/apple/ant.png differ
diff --git a/plugins/emoji/public/images/apple/apple.png b/plugins/emoji/public/images/apple/apple.png
new file mode 100644
index 0000000000..05020bf2be
Binary files /dev/null and b/plugins/emoji/public/images/apple/apple.png differ
diff --git a/plugins/emoji/public/images/apple/aquarius.png b/plugins/emoji/public/images/apple/aquarius.png
new file mode 100644
index 0000000000..37be5dec9d
Binary files /dev/null and b/plugins/emoji/public/images/apple/aquarius.png differ
diff --git a/plugins/emoji/public/images/apple/aries.png b/plugins/emoji/public/images/apple/aries.png
new file mode 100644
index 0000000000..5fa3106b53
Binary files /dev/null and b/plugins/emoji/public/images/apple/aries.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_backward.png b/plugins/emoji/public/images/apple/arrow_backward.png
new file mode 100644
index 0000000000..ab583e5d30
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_backward.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_double_down.png b/plugins/emoji/public/images/apple/arrow_double_down.png
new file mode 100644
index 0000000000..cfb82e6bfc
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_double_down.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_double_up.png b/plugins/emoji/public/images/apple/arrow_double_up.png
new file mode 100644
index 0000000000..962447cb52
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_double_up.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_down.png b/plugins/emoji/public/images/apple/arrow_down.png
new file mode 100644
index 0000000000..3fd0141fe9
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_down.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_down_small.png b/plugins/emoji/public/images/apple/arrow_down_small.png
new file mode 100644
index 0000000000..c7886bd9ed
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_down_small.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_forward.png b/plugins/emoji/public/images/apple/arrow_forward.png
new file mode 100644
index 0000000000..5e5b3ee397
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_forward.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_heading_down.png b/plugins/emoji/public/images/apple/arrow_heading_down.png
new file mode 100644
index 0000000000..bad0e05880
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_heading_down.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_heading_up.png b/plugins/emoji/public/images/apple/arrow_heading_up.png
new file mode 100644
index 0000000000..66f3e0672e
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_heading_up.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_left.png b/plugins/emoji/public/images/apple/arrow_left.png
new file mode 100644
index 0000000000..14698d5143
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_left.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_lower_left.png b/plugins/emoji/public/images/apple/arrow_lower_left.png
new file mode 100644
index 0000000000..28954ade94
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_lower_left.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_lower_right.png b/plugins/emoji/public/images/apple/arrow_lower_right.png
new file mode 100644
index 0000000000..84e22ceded
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_lower_right.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_right.png b/plugins/emoji/public/images/apple/arrow_right.png
new file mode 100644
index 0000000000..ab3fe36882
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_right.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_right_hook.png b/plugins/emoji/public/images/apple/arrow_right_hook.png
new file mode 100644
index 0000000000..a896767866
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_right_hook.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_up.png b/plugins/emoji/public/images/apple/arrow_up.png
new file mode 100644
index 0000000000..e462a4f848
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_up.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_up_down.png b/plugins/emoji/public/images/apple/arrow_up_down.png
new file mode 100644
index 0000000000..9b313192f2
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_up_down.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_up_small.png b/plugins/emoji/public/images/apple/arrow_up_small.png
new file mode 100644
index 0000000000..63dcb794fc
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_up_small.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_upper_left.png b/plugins/emoji/public/images/apple/arrow_upper_left.png
new file mode 100644
index 0000000000..d8f7b89ca6
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_upper_left.png differ
diff --git a/plugins/emoji/public/images/apple/arrow_upper_right.png b/plugins/emoji/public/images/apple/arrow_upper_right.png
new file mode 100644
index 0000000000..cb956fc863
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrow_upper_right.png differ
diff --git a/plugins/emoji/public/images/apple/arrows_clockwise.png b/plugins/emoji/public/images/apple/arrows_clockwise.png
new file mode 100644
index 0000000000..cec1433885
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrows_clockwise.png differ
diff --git a/plugins/emoji/public/images/apple/arrows_counterclockwise.png b/plugins/emoji/public/images/apple/arrows_counterclockwise.png
new file mode 100644
index 0000000000..25634977b2
Binary files /dev/null and b/plugins/emoji/public/images/apple/arrows_counterclockwise.png differ
diff --git a/plugins/emoji/public/images/apple/art.png b/plugins/emoji/public/images/apple/art.png
new file mode 100644
index 0000000000..fd61d65076
Binary files /dev/null and b/plugins/emoji/public/images/apple/art.png differ
diff --git a/plugins/emoji/public/images/apple/articulated_lorry.png b/plugins/emoji/public/images/apple/articulated_lorry.png
new file mode 100644
index 0000000000..c26dd70678
Binary files /dev/null and b/plugins/emoji/public/images/apple/articulated_lorry.png differ
diff --git a/plugins/emoji/public/images/apple/astonished.png b/plugins/emoji/public/images/apple/astonished.png
new file mode 100644
index 0000000000..929aa55ac4
Binary files /dev/null and b/plugins/emoji/public/images/apple/astonished.png differ
diff --git a/plugins/emoji/public/images/apple/athletic_shoe.png b/plugins/emoji/public/images/apple/athletic_shoe.png
new file mode 100644
index 0000000000..36767601db
Binary files /dev/null and b/plugins/emoji/public/images/apple/athletic_shoe.png differ
diff --git a/plugins/emoji/public/images/apple/atm.png b/plugins/emoji/public/images/apple/atm.png
new file mode 100644
index 0000000000..93e57ac41a
Binary files /dev/null and b/plugins/emoji/public/images/apple/atm.png differ
diff --git a/plugins/emoji/public/images/apple/b.png b/plugins/emoji/public/images/apple/b.png
new file mode 100644
index 0000000000..d22733d040
Binary files /dev/null and b/plugins/emoji/public/images/apple/b.png differ
diff --git a/plugins/emoji/public/images/apple/baby.png b/plugins/emoji/public/images/apple/baby.png
new file mode 100644
index 0000000000..61ab12f1a5
Binary files /dev/null and b/plugins/emoji/public/images/apple/baby.png differ
diff --git a/plugins/emoji/public/images/apple/baby_bottle.png b/plugins/emoji/public/images/apple/baby_bottle.png
new file mode 100644
index 0000000000..351b477591
Binary files /dev/null and b/plugins/emoji/public/images/apple/baby_bottle.png differ
diff --git a/plugins/emoji/public/images/apple/baby_chick.png b/plugins/emoji/public/images/apple/baby_chick.png
new file mode 100644
index 0000000000..428e07e2ab
Binary files /dev/null and b/plugins/emoji/public/images/apple/baby_chick.png differ
diff --git a/plugins/emoji/public/images/apple/baby_symbol.png b/plugins/emoji/public/images/apple/baby_symbol.png
new file mode 100644
index 0000000000..73cde87a21
Binary files /dev/null and b/plugins/emoji/public/images/apple/baby_symbol.png differ
diff --git a/plugins/emoji/public/images/apple/back.png b/plugins/emoji/public/images/apple/back.png
new file mode 100644
index 0000000000..4f1f0952cc
Binary files /dev/null and b/plugins/emoji/public/images/apple/back.png differ
diff --git a/plugins/emoji/public/images/apple/baggage_claim.png b/plugins/emoji/public/images/apple/baggage_claim.png
new file mode 100644
index 0000000000..5fb3bbfee6
Binary files /dev/null and b/plugins/emoji/public/images/apple/baggage_claim.png differ
diff --git a/plugins/emoji/public/images/apple/balloon.png b/plugins/emoji/public/images/apple/balloon.png
new file mode 100644
index 0000000000..b23ace295e
Binary files /dev/null and b/plugins/emoji/public/images/apple/balloon.png differ
diff --git a/plugins/emoji/public/images/apple/ballot_box_with_check.png b/plugins/emoji/public/images/apple/ballot_box_with_check.png
new file mode 100644
index 0000000000..b3cfd72098
Binary files /dev/null and b/plugins/emoji/public/images/apple/ballot_box_with_check.png differ
diff --git a/plugins/emoji/public/images/apple/bamboo.png b/plugins/emoji/public/images/apple/bamboo.png
new file mode 100644
index 0000000000..cb2e9c0c6e
Binary files /dev/null and b/plugins/emoji/public/images/apple/bamboo.png differ
diff --git a/plugins/emoji/public/images/apple/banana.png b/plugins/emoji/public/images/apple/banana.png
new file mode 100644
index 0000000000..0e1fdefab0
Binary files /dev/null and b/plugins/emoji/public/images/apple/banana.png differ
diff --git a/plugins/emoji/public/images/apple/bangbang.png b/plugins/emoji/public/images/apple/bangbang.png
new file mode 100644
index 0000000000..8a5728d0cf
Binary files /dev/null and b/plugins/emoji/public/images/apple/bangbang.png differ
diff --git a/plugins/emoji/public/images/apple/bank.png b/plugins/emoji/public/images/apple/bank.png
new file mode 100644
index 0000000000..1283322c24
Binary files /dev/null and b/plugins/emoji/public/images/apple/bank.png differ
diff --git a/plugins/emoji/public/images/apple/bar_chart.png b/plugins/emoji/public/images/apple/bar_chart.png
new file mode 100644
index 0000000000..e3cdecc0e3
Binary files /dev/null and b/plugins/emoji/public/images/apple/bar_chart.png differ
diff --git a/plugins/emoji/public/images/apple/barber.png b/plugins/emoji/public/images/apple/barber.png
new file mode 100644
index 0000000000..cacd2555ec
Binary files /dev/null and b/plugins/emoji/public/images/apple/barber.png differ
diff --git a/plugins/emoji/public/images/apple/baseball.png b/plugins/emoji/public/images/apple/baseball.png
new file mode 100644
index 0000000000..6f73efc5f1
Binary files /dev/null and b/plugins/emoji/public/images/apple/baseball.png differ
diff --git a/plugins/emoji/public/images/apple/basketball.png b/plugins/emoji/public/images/apple/basketball.png
new file mode 100644
index 0000000000..96b575797d
Binary files /dev/null and b/plugins/emoji/public/images/apple/basketball.png differ
diff --git a/plugins/emoji/public/images/apple/bath.png b/plugins/emoji/public/images/apple/bath.png
new file mode 100644
index 0000000000..e48eb7e59a
Binary files /dev/null and b/plugins/emoji/public/images/apple/bath.png differ
diff --git a/plugins/emoji/public/images/apple/bathtub.png b/plugins/emoji/public/images/apple/bathtub.png
new file mode 100644
index 0000000000..a8030ce349
Binary files /dev/null and b/plugins/emoji/public/images/apple/bathtub.png differ
diff --git a/plugins/emoji/public/images/apple/battery.png b/plugins/emoji/public/images/apple/battery.png
new file mode 100644
index 0000000000..fe3ab89ad4
Binary files /dev/null and b/plugins/emoji/public/images/apple/battery.png differ
diff --git a/plugins/emoji/public/images/apple/bear.png b/plugins/emoji/public/images/apple/bear.png
new file mode 100644
index 0000000000..4896c9abb4
Binary files /dev/null and b/plugins/emoji/public/images/apple/bear.png differ
diff --git a/plugins/emoji/public/images/apple/bee.png b/plugins/emoji/public/images/apple/bee.png
new file mode 100644
index 0000000000..fd8465d93e
Binary files /dev/null and b/plugins/emoji/public/images/apple/bee.png differ
diff --git a/plugins/emoji/public/images/apple/beer.png b/plugins/emoji/public/images/apple/beer.png
new file mode 100644
index 0000000000..b5ce16b2e9
Binary files /dev/null and b/plugins/emoji/public/images/apple/beer.png differ
diff --git a/plugins/emoji/public/images/apple/beers.png b/plugins/emoji/public/images/apple/beers.png
new file mode 100644
index 0000000000..22e5fc51b4
Binary files /dev/null and b/plugins/emoji/public/images/apple/beers.png differ
diff --git a/plugins/emoji/public/images/apple/beetle.png b/plugins/emoji/public/images/apple/beetle.png
new file mode 100644
index 0000000000..4fcdc7532c
Binary files /dev/null and b/plugins/emoji/public/images/apple/beetle.png differ
diff --git a/plugins/emoji/public/images/apple/beginner.png b/plugins/emoji/public/images/apple/beginner.png
new file mode 100644
index 0000000000..8813761dc5
Binary files /dev/null and b/plugins/emoji/public/images/apple/beginner.png differ
diff --git a/plugins/emoji/public/images/apple/bell.png b/plugins/emoji/public/images/apple/bell.png
new file mode 100644
index 0000000000..cf6886b466
Binary files /dev/null and b/plugins/emoji/public/images/apple/bell.png differ
diff --git a/plugins/emoji/public/images/apple/bento.png b/plugins/emoji/public/images/apple/bento.png
new file mode 100644
index 0000000000..89236d6f08
Binary files /dev/null and b/plugins/emoji/public/images/apple/bento.png differ
diff --git a/plugins/emoji/public/images/apple/bicyclist.png b/plugins/emoji/public/images/apple/bicyclist.png
new file mode 100644
index 0000000000..85af69cf0d
Binary files /dev/null and b/plugins/emoji/public/images/apple/bicyclist.png differ
diff --git a/plugins/emoji/public/images/apple/bike.png b/plugins/emoji/public/images/apple/bike.png
new file mode 100644
index 0000000000..2809a80881
Binary files /dev/null and b/plugins/emoji/public/images/apple/bike.png differ
diff --git a/plugins/emoji/public/images/apple/bikini.png b/plugins/emoji/public/images/apple/bikini.png
new file mode 100644
index 0000000000..46be2daf75
Binary files /dev/null and b/plugins/emoji/public/images/apple/bikini.png differ
diff --git a/plugins/emoji/public/images/apple/bird.png b/plugins/emoji/public/images/apple/bird.png
new file mode 100644
index 0000000000..51a3a36d65
Binary files /dev/null and b/plugins/emoji/public/images/apple/bird.png differ
diff --git a/plugins/emoji/public/images/apple/birthday.png b/plugins/emoji/public/images/apple/birthday.png
new file mode 100644
index 0000000000..7e8157c377
Binary files /dev/null and b/plugins/emoji/public/images/apple/birthday.png differ
diff --git a/plugins/emoji/public/images/apple/black_circle.png b/plugins/emoji/public/images/apple/black_circle.png
new file mode 100644
index 0000000000..3b929ddf7a
Binary files /dev/null and b/plugins/emoji/public/images/apple/black_circle.png differ
diff --git a/plugins/emoji/public/images/apple/black_joker.png b/plugins/emoji/public/images/apple/black_joker.png
new file mode 100644
index 0000000000..a9af9504f6
Binary files /dev/null and b/plugins/emoji/public/images/apple/black_joker.png differ
diff --git a/plugins/emoji/public/images/apple/black_large_square.png b/plugins/emoji/public/images/apple/black_large_square.png
new file mode 100644
index 0000000000..d0b82fd684
Binary files /dev/null and b/plugins/emoji/public/images/apple/black_large_square.png differ
diff --git a/plugins/emoji/public/images/apple/black_medium_small_square.png b/plugins/emoji/public/images/apple/black_medium_small_square.png
new file mode 100644
index 0000000000..bb65f1580d
Binary files /dev/null and b/plugins/emoji/public/images/apple/black_medium_small_square.png differ
diff --git a/plugins/emoji/public/images/apple/black_medium_square.png b/plugins/emoji/public/images/apple/black_medium_square.png
new file mode 100644
index 0000000000..d0b82fd684
Binary files /dev/null and b/plugins/emoji/public/images/apple/black_medium_square.png differ
diff --git a/plugins/emoji/public/images/apple/black_nib.png b/plugins/emoji/public/images/apple/black_nib.png
new file mode 100644
index 0000000000..2c39cce49e
Binary files /dev/null and b/plugins/emoji/public/images/apple/black_nib.png differ
diff --git a/plugins/emoji/public/images/apple/black_small_square.png b/plugins/emoji/public/images/apple/black_small_square.png
new file mode 100644
index 0000000000..73ad0e6f30
Binary files /dev/null and b/plugins/emoji/public/images/apple/black_small_square.png differ
diff --git a/plugins/emoji/public/images/apple/black_square_button.png b/plugins/emoji/public/images/apple/black_square_button.png
new file mode 100644
index 0000000000..27af757d89
Binary files /dev/null and b/plugins/emoji/public/images/apple/black_square_button.png differ
diff --git a/plugins/emoji/public/images/apple/blossom.png b/plugins/emoji/public/images/apple/blossom.png
new file mode 100644
index 0000000000..792f9ecf5f
Binary files /dev/null and b/plugins/emoji/public/images/apple/blossom.png differ
diff --git a/plugins/emoji/public/images/apple/blowfish.png b/plugins/emoji/public/images/apple/blowfish.png
new file mode 100644
index 0000000000..d480416c51
Binary files /dev/null and b/plugins/emoji/public/images/apple/blowfish.png differ
diff --git a/plugins/emoji/public/images/apple/blue_book.png b/plugins/emoji/public/images/apple/blue_book.png
new file mode 100644
index 0000000000..de037bcdd4
Binary files /dev/null and b/plugins/emoji/public/images/apple/blue_book.png differ
diff --git a/plugins/emoji/public/images/apple/blue_car.png b/plugins/emoji/public/images/apple/blue_car.png
new file mode 100644
index 0000000000..a5d2700fc1
Binary files /dev/null and b/plugins/emoji/public/images/apple/blue_car.png differ
diff --git a/plugins/emoji/public/images/apple/blue_heart.png b/plugins/emoji/public/images/apple/blue_heart.png
new file mode 100644
index 0000000000..4c41716d7d
Binary files /dev/null and b/plugins/emoji/public/images/apple/blue_heart.png differ
diff --git a/plugins/emoji/public/images/apple/blush.png b/plugins/emoji/public/images/apple/blush.png
new file mode 100644
index 0000000000..06b20d313f
Binary files /dev/null and b/plugins/emoji/public/images/apple/blush.png differ
diff --git a/plugins/emoji/public/images/apple/boar.png b/plugins/emoji/public/images/apple/boar.png
new file mode 100644
index 0000000000..ce8dc6cb83
Binary files /dev/null and b/plugins/emoji/public/images/apple/boar.png differ
diff --git a/plugins/emoji/public/images/apple/boat.png b/plugins/emoji/public/images/apple/boat.png
new file mode 100644
index 0000000000..a175599015
Binary files /dev/null and b/plugins/emoji/public/images/apple/boat.png differ
diff --git a/plugins/emoji/public/images/apple/bomb.png b/plugins/emoji/public/images/apple/bomb.png
new file mode 100644
index 0000000000..0002ce5e14
Binary files /dev/null and b/plugins/emoji/public/images/apple/bomb.png differ
diff --git a/plugins/emoji/public/images/apple/book.png b/plugins/emoji/public/images/apple/book.png
new file mode 100644
index 0000000000..e269adc7e9
Binary files /dev/null and b/plugins/emoji/public/images/apple/book.png differ
diff --git a/plugins/emoji/public/images/apple/bookmark.png b/plugins/emoji/public/images/apple/bookmark.png
new file mode 100644
index 0000000000..ff12ef8e8d
Binary files /dev/null and b/plugins/emoji/public/images/apple/bookmark.png differ
diff --git a/plugins/emoji/public/images/apple/bookmark_tabs.png b/plugins/emoji/public/images/apple/bookmark_tabs.png
new file mode 100644
index 0000000000..1f49074de8
Binary files /dev/null and b/plugins/emoji/public/images/apple/bookmark_tabs.png differ
diff --git a/plugins/emoji/public/images/apple/books.png b/plugins/emoji/public/images/apple/books.png
new file mode 100644
index 0000000000..227138b199
Binary files /dev/null and b/plugins/emoji/public/images/apple/books.png differ
diff --git a/plugins/emoji/public/images/apple/boom.png b/plugins/emoji/public/images/apple/boom.png
new file mode 100644
index 0000000000..c16baf2aec
Binary files /dev/null and b/plugins/emoji/public/images/apple/boom.png differ
diff --git a/plugins/emoji/public/images/apple/boot.png b/plugins/emoji/public/images/apple/boot.png
new file mode 100644
index 0000000000..f835a6041e
Binary files /dev/null and b/plugins/emoji/public/images/apple/boot.png differ
diff --git a/plugins/emoji/public/images/apple/bouquet.png b/plugins/emoji/public/images/apple/bouquet.png
new file mode 100644
index 0000000000..e2c55468c7
Binary files /dev/null and b/plugins/emoji/public/images/apple/bouquet.png differ
diff --git a/plugins/emoji/public/images/apple/bow.png b/plugins/emoji/public/images/apple/bow.png
new file mode 100644
index 0000000000..194223536f
Binary files /dev/null and b/plugins/emoji/public/images/apple/bow.png differ
diff --git a/plugins/emoji/public/images/apple/bowling.png b/plugins/emoji/public/images/apple/bowling.png
new file mode 100644
index 0000000000..3d184f7892
Binary files /dev/null and b/plugins/emoji/public/images/apple/bowling.png differ
diff --git a/plugins/emoji/public/images/apple/boy.png b/plugins/emoji/public/images/apple/boy.png
new file mode 100644
index 0000000000..3bc26d58ff
Binary files /dev/null and b/plugins/emoji/public/images/apple/boy.png differ
diff --git a/plugins/emoji/public/images/apple/bread.png b/plugins/emoji/public/images/apple/bread.png
new file mode 100644
index 0000000000..9c3f40d328
Binary files /dev/null and b/plugins/emoji/public/images/apple/bread.png differ
diff --git a/plugins/emoji/public/images/apple/bride_with_veil.png b/plugins/emoji/public/images/apple/bride_with_veil.png
new file mode 100644
index 0000000000..5d3e746d86
Binary files /dev/null and b/plugins/emoji/public/images/apple/bride_with_veil.png differ
diff --git a/plugins/emoji/public/images/apple/bridge_at_night.png b/plugins/emoji/public/images/apple/bridge_at_night.png
new file mode 100644
index 0000000000..b1e0e336d9
Binary files /dev/null and b/plugins/emoji/public/images/apple/bridge_at_night.png differ
diff --git a/plugins/emoji/public/images/apple/briefcase.png b/plugins/emoji/public/images/apple/briefcase.png
new file mode 100644
index 0000000000..f8345a086a
Binary files /dev/null and b/plugins/emoji/public/images/apple/briefcase.png differ
diff --git a/plugins/emoji/public/images/apple/broken_heart.png b/plugins/emoji/public/images/apple/broken_heart.png
new file mode 100644
index 0000000000..0d8d825529
Binary files /dev/null and b/plugins/emoji/public/images/apple/broken_heart.png differ
diff --git a/plugins/emoji/public/images/apple/bug.png b/plugins/emoji/public/images/apple/bug.png
new file mode 100644
index 0000000000..c03fb3414a
Binary files /dev/null and b/plugins/emoji/public/images/apple/bug.png differ
diff --git a/plugins/emoji/public/images/apple/bulb.png b/plugins/emoji/public/images/apple/bulb.png
new file mode 100644
index 0000000000..e2f47eacf0
Binary files /dev/null and b/plugins/emoji/public/images/apple/bulb.png differ
diff --git a/plugins/emoji/public/images/apple/bullettrain_front.png b/plugins/emoji/public/images/apple/bullettrain_front.png
new file mode 100644
index 0000000000..573259ac7f
Binary files /dev/null and b/plugins/emoji/public/images/apple/bullettrain_front.png differ
diff --git a/plugins/emoji/public/images/apple/bullettrain_side.png b/plugins/emoji/public/images/apple/bullettrain_side.png
new file mode 100644
index 0000000000..cc3a3791d5
Binary files /dev/null and b/plugins/emoji/public/images/apple/bullettrain_side.png differ
diff --git a/plugins/emoji/public/images/apple/bus.png b/plugins/emoji/public/images/apple/bus.png
new file mode 100644
index 0000000000..44149941e5
Binary files /dev/null and b/plugins/emoji/public/images/apple/bus.png differ
diff --git a/plugins/emoji/public/images/apple/busstop.png b/plugins/emoji/public/images/apple/busstop.png
new file mode 100644
index 0000000000..ac8ad5a261
Binary files /dev/null and b/plugins/emoji/public/images/apple/busstop.png differ
diff --git a/plugins/emoji/public/images/apple/bust_in_silhouette.png b/plugins/emoji/public/images/apple/bust_in_silhouette.png
new file mode 100644
index 0000000000..c48af4ab9b
Binary files /dev/null and b/plugins/emoji/public/images/apple/bust_in_silhouette.png differ
diff --git a/plugins/emoji/public/images/apple/busts_in_silhouette.png b/plugins/emoji/public/images/apple/busts_in_silhouette.png
new file mode 100644
index 0000000000..74f65f0cf4
Binary files /dev/null and b/plugins/emoji/public/images/apple/busts_in_silhouette.png differ
diff --git a/plugins/emoji/public/images/apple/cactus.png b/plugins/emoji/public/images/apple/cactus.png
new file mode 100644
index 0000000000..cc8e4b1e9e
Binary files /dev/null and b/plugins/emoji/public/images/apple/cactus.png differ
diff --git a/plugins/emoji/public/images/apple/cake.png b/plugins/emoji/public/images/apple/cake.png
new file mode 100644
index 0000000000..4ac13de0ce
Binary files /dev/null and b/plugins/emoji/public/images/apple/cake.png differ
diff --git a/plugins/emoji/public/images/apple/calendar.png b/plugins/emoji/public/images/apple/calendar.png
new file mode 100644
index 0000000000..a6ba1537f6
Binary files /dev/null and b/plugins/emoji/public/images/apple/calendar.png differ
diff --git a/plugins/emoji/public/images/apple/calling.png b/plugins/emoji/public/images/apple/calling.png
new file mode 100644
index 0000000000..773a17cce5
Binary files /dev/null and b/plugins/emoji/public/images/apple/calling.png differ
diff --git a/plugins/emoji/public/images/apple/camel.png b/plugins/emoji/public/images/apple/camel.png
new file mode 100644
index 0000000000..b73a80df41
Binary files /dev/null and b/plugins/emoji/public/images/apple/camel.png differ
diff --git a/plugins/emoji/public/images/apple/camera.png b/plugins/emoji/public/images/apple/camera.png
new file mode 100644
index 0000000000..2b5ca74a16
Binary files /dev/null and b/plugins/emoji/public/images/apple/camera.png differ
diff --git a/plugins/emoji/public/images/apple/cancer.png b/plugins/emoji/public/images/apple/cancer.png
new file mode 100644
index 0000000000..5f71bc0c73
Binary files /dev/null and b/plugins/emoji/public/images/apple/cancer.png differ
diff --git a/plugins/emoji/public/images/apple/candy.png b/plugins/emoji/public/images/apple/candy.png
new file mode 100644
index 0000000000..2e5c316b4a
Binary files /dev/null and b/plugins/emoji/public/images/apple/candy.png differ
diff --git a/plugins/emoji/public/images/apple/capital_abcd.png b/plugins/emoji/public/images/apple/capital_abcd.png
new file mode 100644
index 0000000000..81592050ba
Binary files /dev/null and b/plugins/emoji/public/images/apple/capital_abcd.png differ
diff --git a/plugins/emoji/public/images/apple/capricorn.png b/plugins/emoji/public/images/apple/capricorn.png
new file mode 100644
index 0000000000..04b4c6ef71
Binary files /dev/null and b/plugins/emoji/public/images/apple/capricorn.png differ
diff --git a/plugins/emoji/public/images/apple/car.png b/plugins/emoji/public/images/apple/car.png
new file mode 100644
index 0000000000..0a35f6e5d7
Binary files /dev/null and b/plugins/emoji/public/images/apple/car.png differ
diff --git a/plugins/emoji/public/images/apple/card_index.png b/plugins/emoji/public/images/apple/card_index.png
new file mode 100644
index 0000000000..42f244ab61
Binary files /dev/null and b/plugins/emoji/public/images/apple/card_index.png differ
diff --git a/plugins/emoji/public/images/apple/carousel_horse.png b/plugins/emoji/public/images/apple/carousel_horse.png
new file mode 100644
index 0000000000..17b1eb51fb
Binary files /dev/null and b/plugins/emoji/public/images/apple/carousel_horse.png differ
diff --git a/plugins/emoji/public/images/apple/cat.png b/plugins/emoji/public/images/apple/cat.png
new file mode 100644
index 0000000000..4bc083c182
Binary files /dev/null and b/plugins/emoji/public/images/apple/cat.png differ
diff --git a/plugins/emoji/public/images/apple/cat2.png b/plugins/emoji/public/images/apple/cat2.png
new file mode 100644
index 0000000000..5192f8c56a
Binary files /dev/null and b/plugins/emoji/public/images/apple/cat2.png differ
diff --git a/plugins/emoji/public/images/apple/cd.png b/plugins/emoji/public/images/apple/cd.png
new file mode 100644
index 0000000000..698f1f837f
Binary files /dev/null and b/plugins/emoji/public/images/apple/cd.png differ
diff --git a/plugins/emoji/public/images/apple/chart.png b/plugins/emoji/public/images/apple/chart.png
new file mode 100644
index 0000000000..bebeddf169
Binary files /dev/null and b/plugins/emoji/public/images/apple/chart.png differ
diff --git a/plugins/emoji/public/images/apple/chart_with_downwards_trend.png b/plugins/emoji/public/images/apple/chart_with_downwards_trend.png
new file mode 100644
index 0000000000..2698a455c3
Binary files /dev/null and b/plugins/emoji/public/images/apple/chart_with_downwards_trend.png differ
diff --git a/plugins/emoji/public/images/apple/chart_with_upwards_trend.png b/plugins/emoji/public/images/apple/chart_with_upwards_trend.png
new file mode 100644
index 0000000000..cdc80d4b62
Binary files /dev/null and b/plugins/emoji/public/images/apple/chart_with_upwards_trend.png differ
diff --git a/plugins/emoji/public/images/apple/checkered_flag.png b/plugins/emoji/public/images/apple/checkered_flag.png
new file mode 100644
index 0000000000..ff10a1d54e
Binary files /dev/null and b/plugins/emoji/public/images/apple/checkered_flag.png differ
diff --git a/plugins/emoji/public/images/apple/cherries.png b/plugins/emoji/public/images/apple/cherries.png
new file mode 100644
index 0000000000..2c3502e466
Binary files /dev/null and b/plugins/emoji/public/images/apple/cherries.png differ
diff --git a/plugins/emoji/public/images/apple/cherry_blossom.png b/plugins/emoji/public/images/apple/cherry_blossom.png
new file mode 100644
index 0000000000..abb6c3d998
Binary files /dev/null and b/plugins/emoji/public/images/apple/cherry_blossom.png differ
diff --git a/plugins/emoji/public/images/apple/chestnut.png b/plugins/emoji/public/images/apple/chestnut.png
new file mode 100644
index 0000000000..e731f7ba31
Binary files /dev/null and b/plugins/emoji/public/images/apple/chestnut.png differ
diff --git a/plugins/emoji/public/images/apple/chicken.png b/plugins/emoji/public/images/apple/chicken.png
new file mode 100644
index 0000000000..e6a659443e
Binary files /dev/null and b/plugins/emoji/public/images/apple/chicken.png differ
diff --git a/plugins/emoji/public/images/apple/children_crossing.png b/plugins/emoji/public/images/apple/children_crossing.png
new file mode 100644
index 0000000000..3bdbb51527
Binary files /dev/null and b/plugins/emoji/public/images/apple/children_crossing.png differ
diff --git a/plugins/emoji/public/images/apple/chocolate_bar.png b/plugins/emoji/public/images/apple/chocolate_bar.png
new file mode 100644
index 0000000000..148e647ec2
Binary files /dev/null and b/plugins/emoji/public/images/apple/chocolate_bar.png differ
diff --git a/plugins/emoji/public/images/apple/christmas_tree.png b/plugins/emoji/public/images/apple/christmas_tree.png
new file mode 100644
index 0000000000..35851ed11e
Binary files /dev/null and b/plugins/emoji/public/images/apple/christmas_tree.png differ
diff --git a/plugins/emoji/public/images/apple/church.png b/plugins/emoji/public/images/apple/church.png
new file mode 100644
index 0000000000..4c41943438
Binary files /dev/null and b/plugins/emoji/public/images/apple/church.png differ
diff --git a/plugins/emoji/public/images/apple/cinema.png b/plugins/emoji/public/images/apple/cinema.png
new file mode 100644
index 0000000000..0cd0135c9e
Binary files /dev/null and b/plugins/emoji/public/images/apple/cinema.png differ
diff --git a/plugins/emoji/public/images/apple/circus_tent.png b/plugins/emoji/public/images/apple/circus_tent.png
new file mode 100644
index 0000000000..fe663269e1
Binary files /dev/null and b/plugins/emoji/public/images/apple/circus_tent.png differ
diff --git a/plugins/emoji/public/images/apple/city_sunrise.png b/plugins/emoji/public/images/apple/city_sunrise.png
new file mode 100644
index 0000000000..9aeca018f2
Binary files /dev/null and b/plugins/emoji/public/images/apple/city_sunrise.png differ
diff --git a/plugins/emoji/public/images/apple/city_sunset.png b/plugins/emoji/public/images/apple/city_sunset.png
new file mode 100644
index 0000000000..b385117e71
Binary files /dev/null and b/plugins/emoji/public/images/apple/city_sunset.png differ
diff --git a/plugins/emoji/public/images/apple/cl.png b/plugins/emoji/public/images/apple/cl.png
new file mode 100644
index 0000000000..41c149ff09
Binary files /dev/null and b/plugins/emoji/public/images/apple/cl.png differ
diff --git a/plugins/emoji/public/images/apple/clap.png b/plugins/emoji/public/images/apple/clap.png
new file mode 100644
index 0000000000..2c7adb6165
Binary files /dev/null and b/plugins/emoji/public/images/apple/clap.png differ
diff --git a/plugins/emoji/public/images/apple/clapper.png b/plugins/emoji/public/images/apple/clapper.png
new file mode 100644
index 0000000000..ea008fd705
Binary files /dev/null and b/plugins/emoji/public/images/apple/clapper.png differ
diff --git a/plugins/emoji/public/images/apple/clipboard.png b/plugins/emoji/public/images/apple/clipboard.png
new file mode 100644
index 0000000000..c01719f86c
Binary files /dev/null and b/plugins/emoji/public/images/apple/clipboard.png differ
diff --git a/plugins/emoji/public/images/apple/clock1.png b/plugins/emoji/public/images/apple/clock1.png
new file mode 100644
index 0000000000..3acdfd020e
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock1.png differ
diff --git a/plugins/emoji/public/images/apple/clock10.png b/plugins/emoji/public/images/apple/clock10.png
new file mode 100644
index 0000000000..589ff30f96
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock10.png differ
diff --git a/plugins/emoji/public/images/apple/clock1030.png b/plugins/emoji/public/images/apple/clock1030.png
new file mode 100644
index 0000000000..0bca8343cd
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock1030.png differ
diff --git a/plugins/emoji/public/images/apple/clock11.png b/plugins/emoji/public/images/apple/clock11.png
new file mode 100644
index 0000000000..5f7a6614c1
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock11.png differ
diff --git a/plugins/emoji/public/images/apple/clock1130.png b/plugins/emoji/public/images/apple/clock1130.png
new file mode 100644
index 0000000000..dd1fd36ce1
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock1130.png differ
diff --git a/plugins/emoji/public/images/apple/clock12.png b/plugins/emoji/public/images/apple/clock12.png
new file mode 100644
index 0000000000..19e31dac03
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock12.png differ
diff --git a/plugins/emoji/public/images/apple/clock1230.png b/plugins/emoji/public/images/apple/clock1230.png
new file mode 100644
index 0000000000..927d80b714
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock1230.png differ
diff --git a/plugins/emoji/public/images/apple/clock130.png b/plugins/emoji/public/images/apple/clock130.png
new file mode 100644
index 0000000000..0bbab0f08e
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock130.png differ
diff --git a/plugins/emoji/public/images/apple/clock2.png b/plugins/emoji/public/images/apple/clock2.png
new file mode 100644
index 0000000000..53cca9a082
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock2.png differ
diff --git a/plugins/emoji/public/images/apple/clock230.png b/plugins/emoji/public/images/apple/clock230.png
new file mode 100644
index 0000000000..537f9677ac
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock230.png differ
diff --git a/plugins/emoji/public/images/apple/clock3.png b/plugins/emoji/public/images/apple/clock3.png
new file mode 100644
index 0000000000..dbbf43c8e9
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock3.png differ
diff --git a/plugins/emoji/public/images/apple/clock330.png b/plugins/emoji/public/images/apple/clock330.png
new file mode 100644
index 0000000000..290509b88d
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock330.png differ
diff --git a/plugins/emoji/public/images/apple/clock4.png b/plugins/emoji/public/images/apple/clock4.png
new file mode 100644
index 0000000000..9cfa3c0e72
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock4.png differ
diff --git a/plugins/emoji/public/images/apple/clock430.png b/plugins/emoji/public/images/apple/clock430.png
new file mode 100644
index 0000000000..df4e15959c
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock430.png differ
diff --git a/plugins/emoji/public/images/apple/clock5.png b/plugins/emoji/public/images/apple/clock5.png
new file mode 100644
index 0000000000..a46d5d2e67
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock5.png differ
diff --git a/plugins/emoji/public/images/apple/clock530.png b/plugins/emoji/public/images/apple/clock530.png
new file mode 100644
index 0000000000..459ccedbbc
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock530.png differ
diff --git a/plugins/emoji/public/images/apple/clock6.png b/plugins/emoji/public/images/apple/clock6.png
new file mode 100644
index 0000000000..1f9fc0390b
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock6.png differ
diff --git a/plugins/emoji/public/images/apple/clock630.png b/plugins/emoji/public/images/apple/clock630.png
new file mode 100644
index 0000000000..57985affa5
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock630.png differ
diff --git a/plugins/emoji/public/images/apple/clock7.png b/plugins/emoji/public/images/apple/clock7.png
new file mode 100644
index 0000000000..e1c92cfd62
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock7.png differ
diff --git a/plugins/emoji/public/images/apple/clock730.png b/plugins/emoji/public/images/apple/clock730.png
new file mode 100644
index 0000000000..b7cea5cd5d
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock730.png differ
diff --git a/plugins/emoji/public/images/apple/clock8.png b/plugins/emoji/public/images/apple/clock8.png
new file mode 100644
index 0000000000..072d628282
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock8.png differ
diff --git a/plugins/emoji/public/images/apple/clock830.png b/plugins/emoji/public/images/apple/clock830.png
new file mode 100644
index 0000000000..85ef43d7ef
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock830.png differ
diff --git a/plugins/emoji/public/images/apple/clock9.png b/plugins/emoji/public/images/apple/clock9.png
new file mode 100644
index 0000000000..f3c4e2e09f
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock9.png differ
diff --git a/plugins/emoji/public/images/apple/clock930.png b/plugins/emoji/public/images/apple/clock930.png
new file mode 100644
index 0000000000..b5036a81ce
Binary files /dev/null and b/plugins/emoji/public/images/apple/clock930.png differ
diff --git a/plugins/emoji/public/images/apple/closed_book.png b/plugins/emoji/public/images/apple/closed_book.png
new file mode 100644
index 0000000000..a24ad94400
Binary files /dev/null and b/plugins/emoji/public/images/apple/closed_book.png differ
diff --git a/plugins/emoji/public/images/apple/closed_lock_with_key.png b/plugins/emoji/public/images/apple/closed_lock_with_key.png
new file mode 100644
index 0000000000..40293effa5
Binary files /dev/null and b/plugins/emoji/public/images/apple/closed_lock_with_key.png differ
diff --git a/plugins/emoji/public/images/apple/closed_umbrella.png b/plugins/emoji/public/images/apple/closed_umbrella.png
new file mode 100644
index 0000000000..596a31236a
Binary files /dev/null and b/plugins/emoji/public/images/apple/closed_umbrella.png differ
diff --git a/plugins/emoji/public/images/apple/cloud.png b/plugins/emoji/public/images/apple/cloud.png
new file mode 100644
index 0000000000..fff04e9502
Binary files /dev/null and b/plugins/emoji/public/images/apple/cloud.png differ
diff --git a/plugins/emoji/public/images/apple/clubs.png b/plugins/emoji/public/images/apple/clubs.png
new file mode 100644
index 0000000000..230d9d032e
Binary files /dev/null and b/plugins/emoji/public/images/apple/clubs.png differ
diff --git a/plugins/emoji/public/images/apple/cn.png b/plugins/emoji/public/images/apple/cn.png
new file mode 100644
index 0000000000..54a955fa63
Binary files /dev/null and b/plugins/emoji/public/images/apple/cn.png differ
diff --git a/plugins/emoji/public/images/apple/cocktail.png b/plugins/emoji/public/images/apple/cocktail.png
new file mode 100644
index 0000000000..9dcfbce91b
Binary files /dev/null and b/plugins/emoji/public/images/apple/cocktail.png differ
diff --git a/plugins/emoji/public/images/apple/coffee.png b/plugins/emoji/public/images/apple/coffee.png
new file mode 100644
index 0000000000..d2e343dbb0
Binary files /dev/null and b/plugins/emoji/public/images/apple/coffee.png differ
diff --git a/plugins/emoji/public/images/apple/cold_sweat.png b/plugins/emoji/public/images/apple/cold_sweat.png
new file mode 100644
index 0000000000..5a0bd01f04
Binary files /dev/null and b/plugins/emoji/public/images/apple/cold_sweat.png differ
diff --git a/plugins/emoji/public/images/apple/collision.png b/plugins/emoji/public/images/apple/collision.png
new file mode 100644
index 0000000000..c16baf2aec
Binary files /dev/null and b/plugins/emoji/public/images/apple/collision.png differ
diff --git a/plugins/emoji/public/images/apple/computer.png b/plugins/emoji/public/images/apple/computer.png
new file mode 100644
index 0000000000..9f6b8be581
Binary files /dev/null and b/plugins/emoji/public/images/apple/computer.png differ
diff --git a/plugins/emoji/public/images/apple/confetti_ball.png b/plugins/emoji/public/images/apple/confetti_ball.png
new file mode 100644
index 0000000000..2ffb8bf563
Binary files /dev/null and b/plugins/emoji/public/images/apple/confetti_ball.png differ
diff --git a/plugins/emoji/public/images/apple/confounded.png b/plugins/emoji/public/images/apple/confounded.png
new file mode 100644
index 0000000000..cb45c1c8c6
Binary files /dev/null and b/plugins/emoji/public/images/apple/confounded.png differ
diff --git a/plugins/emoji/public/images/apple/confused.png b/plugins/emoji/public/images/apple/confused.png
new file mode 100644
index 0000000000..8a07a47060
Binary files /dev/null and b/plugins/emoji/public/images/apple/confused.png differ
diff --git a/plugins/emoji/public/images/apple/congratulations.png b/plugins/emoji/public/images/apple/congratulations.png
new file mode 100644
index 0000000000..21b49d7564
Binary files /dev/null and b/plugins/emoji/public/images/apple/congratulations.png differ
diff --git a/plugins/emoji/public/images/apple/construction.png b/plugins/emoji/public/images/apple/construction.png
new file mode 100644
index 0000000000..655762e7e1
Binary files /dev/null and b/plugins/emoji/public/images/apple/construction.png differ
diff --git a/plugins/emoji/public/images/apple/construction_worker.png b/plugins/emoji/public/images/apple/construction_worker.png
new file mode 100644
index 0000000000..8768e47de0
Binary files /dev/null and b/plugins/emoji/public/images/apple/construction_worker.png differ
diff --git a/plugins/emoji/public/images/apple/convenience_store.png b/plugins/emoji/public/images/apple/convenience_store.png
new file mode 100644
index 0000000000..b8fba9aab0
Binary files /dev/null and b/plugins/emoji/public/images/apple/convenience_store.png differ
diff --git a/plugins/emoji/public/images/apple/cookie.png b/plugins/emoji/public/images/apple/cookie.png
new file mode 100644
index 0000000000..ddcdd9de3e
Binary files /dev/null and b/plugins/emoji/public/images/apple/cookie.png differ
diff --git a/plugins/emoji/public/images/apple/cool.png b/plugins/emoji/public/images/apple/cool.png
new file mode 100644
index 0000000000..d901fe824c
Binary files /dev/null and b/plugins/emoji/public/images/apple/cool.png differ
diff --git a/plugins/emoji/public/images/apple/cop.png b/plugins/emoji/public/images/apple/cop.png
new file mode 100644
index 0000000000..04e110bcd7
Binary files /dev/null and b/plugins/emoji/public/images/apple/cop.png differ
diff --git a/plugins/emoji/public/images/apple/copyright.png b/plugins/emoji/public/images/apple/copyright.png
new file mode 100644
index 0000000000..6b241de5c7
Binary files /dev/null and b/plugins/emoji/public/images/apple/copyright.png differ
diff --git a/plugins/emoji/public/images/apple/corn.png b/plugins/emoji/public/images/apple/corn.png
new file mode 100644
index 0000000000..a60964a6dc
Binary files /dev/null and b/plugins/emoji/public/images/apple/corn.png differ
diff --git a/plugins/emoji/public/images/apple/couple.png b/plugins/emoji/public/images/apple/couple.png
new file mode 100644
index 0000000000..ceb9c369ae
Binary files /dev/null and b/plugins/emoji/public/images/apple/couple.png differ
diff --git a/plugins/emoji/public/images/apple/couple_with_heart.png b/plugins/emoji/public/images/apple/couple_with_heart.png
new file mode 100644
index 0000000000..1ef2e6baa9
Binary files /dev/null and b/plugins/emoji/public/images/apple/couple_with_heart.png differ
diff --git a/plugins/emoji/public/images/apple/couplekiss.png b/plugins/emoji/public/images/apple/couplekiss.png
new file mode 100644
index 0000000000..b4e29a9528
Binary files /dev/null and b/plugins/emoji/public/images/apple/couplekiss.png differ
diff --git a/plugins/emoji/public/images/apple/cow.png b/plugins/emoji/public/images/apple/cow.png
new file mode 100644
index 0000000000..61e0b7d560
Binary files /dev/null and b/plugins/emoji/public/images/apple/cow.png differ
diff --git a/plugins/emoji/public/images/apple/cow2.png b/plugins/emoji/public/images/apple/cow2.png
new file mode 100644
index 0000000000..02a0985679
Binary files /dev/null and b/plugins/emoji/public/images/apple/cow2.png differ
diff --git a/plugins/emoji/public/images/apple/credit_card.png b/plugins/emoji/public/images/apple/credit_card.png
new file mode 100644
index 0000000000..645647bc94
Binary files /dev/null and b/plugins/emoji/public/images/apple/credit_card.png differ
diff --git a/plugins/emoji/public/images/apple/crescent_moon.png b/plugins/emoji/public/images/apple/crescent_moon.png
new file mode 100644
index 0000000000..f9b393baca
Binary files /dev/null and b/plugins/emoji/public/images/apple/crescent_moon.png differ
diff --git a/plugins/emoji/public/images/apple/crocodile.png b/plugins/emoji/public/images/apple/crocodile.png
new file mode 100644
index 0000000000..902210255d
Binary files /dev/null and b/plugins/emoji/public/images/apple/crocodile.png differ
diff --git a/plugins/emoji/public/images/apple/crossed_flags.png b/plugins/emoji/public/images/apple/crossed_flags.png
new file mode 100644
index 0000000000..4d2b611bfb
Binary files /dev/null and b/plugins/emoji/public/images/apple/crossed_flags.png differ
diff --git a/plugins/emoji/public/images/apple/crown.png b/plugins/emoji/public/images/apple/crown.png
new file mode 100644
index 0000000000..13f55e7861
Binary files /dev/null and b/plugins/emoji/public/images/apple/crown.png differ
diff --git a/plugins/emoji/public/images/apple/cry.png b/plugins/emoji/public/images/apple/cry.png
new file mode 100644
index 0000000000..1718b42ed4
Binary files /dev/null and b/plugins/emoji/public/images/apple/cry.png differ
diff --git a/plugins/emoji/public/images/apple/crying_cat_face.png b/plugins/emoji/public/images/apple/crying_cat_face.png
new file mode 100644
index 0000000000..3b3a47159a
Binary files /dev/null and b/plugins/emoji/public/images/apple/crying_cat_face.png differ
diff --git a/plugins/emoji/public/images/apple/crystal_ball.png b/plugins/emoji/public/images/apple/crystal_ball.png
new file mode 100644
index 0000000000..bee8b57650
Binary files /dev/null and b/plugins/emoji/public/images/apple/crystal_ball.png differ
diff --git a/plugins/emoji/public/images/apple/cupid.png b/plugins/emoji/public/images/apple/cupid.png
new file mode 100644
index 0000000000..f52560789a
Binary files /dev/null and b/plugins/emoji/public/images/apple/cupid.png differ
diff --git a/plugins/emoji/public/images/apple/curly_loop.png b/plugins/emoji/public/images/apple/curly_loop.png
new file mode 100644
index 0000000000..25919a6d15
Binary files /dev/null and b/plugins/emoji/public/images/apple/curly_loop.png differ
diff --git a/plugins/emoji/public/images/apple/currency_exchange.png b/plugins/emoji/public/images/apple/currency_exchange.png
new file mode 100644
index 0000000000..57419983ab
Binary files /dev/null and b/plugins/emoji/public/images/apple/currency_exchange.png differ
diff --git a/plugins/emoji/public/images/apple/curry.png b/plugins/emoji/public/images/apple/curry.png
new file mode 100644
index 0000000000..6c47d4b06a
Binary files /dev/null and b/plugins/emoji/public/images/apple/curry.png differ
diff --git a/plugins/emoji/public/images/apple/custard.png b/plugins/emoji/public/images/apple/custard.png
new file mode 100644
index 0000000000..c851e10338
Binary files /dev/null and b/plugins/emoji/public/images/apple/custard.png differ
diff --git a/plugins/emoji/public/images/apple/customs.png b/plugins/emoji/public/images/apple/customs.png
new file mode 100644
index 0000000000..381eecdb49
Binary files /dev/null and b/plugins/emoji/public/images/apple/customs.png differ
diff --git a/plugins/emoji/public/images/apple/cyclone.png b/plugins/emoji/public/images/apple/cyclone.png
new file mode 100644
index 0000000000..0aea4feff7
Binary files /dev/null and b/plugins/emoji/public/images/apple/cyclone.png differ
diff --git a/plugins/emoji/public/images/apple/dancer.png b/plugins/emoji/public/images/apple/dancer.png
new file mode 100644
index 0000000000..32070c120a
Binary files /dev/null and b/plugins/emoji/public/images/apple/dancer.png differ
diff --git a/plugins/emoji/public/images/apple/dancers.png b/plugins/emoji/public/images/apple/dancers.png
new file mode 100644
index 0000000000..59a81b3806
Binary files /dev/null and b/plugins/emoji/public/images/apple/dancers.png differ
diff --git a/plugins/emoji/public/images/apple/dango.png b/plugins/emoji/public/images/apple/dango.png
new file mode 100644
index 0000000000..4b3d4297a8
Binary files /dev/null and b/plugins/emoji/public/images/apple/dango.png differ
diff --git a/plugins/emoji/public/images/apple/dart.png b/plugins/emoji/public/images/apple/dart.png
new file mode 100644
index 0000000000..3699b76fd3
Binary files /dev/null and b/plugins/emoji/public/images/apple/dart.png differ
diff --git a/plugins/emoji/public/images/apple/dash.png b/plugins/emoji/public/images/apple/dash.png
new file mode 100644
index 0000000000..bdc0d85a32
Binary files /dev/null and b/plugins/emoji/public/images/apple/dash.png differ
diff --git a/plugins/emoji/public/images/apple/date.png b/plugins/emoji/public/images/apple/date.png
new file mode 100644
index 0000000000..47c673868d
Binary files /dev/null and b/plugins/emoji/public/images/apple/date.png differ
diff --git a/plugins/emoji/public/images/apple/de.png b/plugins/emoji/public/images/apple/de.png
new file mode 100644
index 0000000000..c14678af49
Binary files /dev/null and b/plugins/emoji/public/images/apple/de.png differ
diff --git a/plugins/emoji/public/images/apple/deciduous_tree.png b/plugins/emoji/public/images/apple/deciduous_tree.png
new file mode 100644
index 0000000000..2dd403043b
Binary files /dev/null and b/plugins/emoji/public/images/apple/deciduous_tree.png differ
diff --git a/plugins/emoji/public/images/apple/department_store.png b/plugins/emoji/public/images/apple/department_store.png
new file mode 100644
index 0000000000..024ea83115
Binary files /dev/null and b/plugins/emoji/public/images/apple/department_store.png differ
diff --git a/plugins/emoji/public/images/apple/diamond_shape_with_a_dot_inside.png b/plugins/emoji/public/images/apple/diamond_shape_with_a_dot_inside.png
new file mode 100644
index 0000000000..ca5ac05d2c
Binary files /dev/null and b/plugins/emoji/public/images/apple/diamond_shape_with_a_dot_inside.png differ
diff --git a/plugins/emoji/public/images/apple/diamonds.png b/plugins/emoji/public/images/apple/diamonds.png
new file mode 100644
index 0000000000..08ddc3872c
Binary files /dev/null and b/plugins/emoji/public/images/apple/diamonds.png differ
diff --git a/plugins/emoji/public/images/apple/disappointed.png b/plugins/emoji/public/images/apple/disappointed.png
new file mode 100644
index 0000000000..f9aaee24be
Binary files /dev/null and b/plugins/emoji/public/images/apple/disappointed.png differ
diff --git a/plugins/emoji/public/images/apple/disappointed_relieved.png b/plugins/emoji/public/images/apple/disappointed_relieved.png
new file mode 100644
index 0000000000..4a7a9fd69d
Binary files /dev/null and b/plugins/emoji/public/images/apple/disappointed_relieved.png differ
diff --git a/plugins/emoji/public/images/apple/dizzy.png b/plugins/emoji/public/images/apple/dizzy.png
new file mode 100644
index 0000000000..94314d0d0a
Binary files /dev/null and b/plugins/emoji/public/images/apple/dizzy.png differ
diff --git a/plugins/emoji/public/images/apple/dizzy_face.png b/plugins/emoji/public/images/apple/dizzy_face.png
new file mode 100644
index 0000000000..92bb5851c7
Binary files /dev/null and b/plugins/emoji/public/images/apple/dizzy_face.png differ
diff --git a/plugins/emoji/public/images/apple/do_not_litter.png b/plugins/emoji/public/images/apple/do_not_litter.png
new file mode 100644
index 0000000000..e7be6905f7
Binary files /dev/null and b/plugins/emoji/public/images/apple/do_not_litter.png differ
diff --git a/plugins/emoji/public/images/apple/dog.png b/plugins/emoji/public/images/apple/dog.png
new file mode 100644
index 0000000000..c83e5ceb16
Binary files /dev/null and b/plugins/emoji/public/images/apple/dog.png differ
diff --git a/plugins/emoji/public/images/apple/dog2.png b/plugins/emoji/public/images/apple/dog2.png
new file mode 100644
index 0000000000..6070161781
Binary files /dev/null and b/plugins/emoji/public/images/apple/dog2.png differ
diff --git a/plugins/emoji/public/images/apple/dollar.png b/plugins/emoji/public/images/apple/dollar.png
new file mode 100644
index 0000000000..e002955849
Binary files /dev/null and b/plugins/emoji/public/images/apple/dollar.png differ
diff --git a/plugins/emoji/public/images/apple/dolls.png b/plugins/emoji/public/images/apple/dolls.png
new file mode 100644
index 0000000000..cbd0f30530
Binary files /dev/null and b/plugins/emoji/public/images/apple/dolls.png differ
diff --git a/plugins/emoji/public/images/apple/dolphin.png b/plugins/emoji/public/images/apple/dolphin.png
new file mode 100644
index 0000000000..083819034c
Binary files /dev/null and b/plugins/emoji/public/images/apple/dolphin.png differ
diff --git a/plugins/emoji/public/images/apple/door.png b/plugins/emoji/public/images/apple/door.png
new file mode 100644
index 0000000000..51f9718c08
Binary files /dev/null and b/plugins/emoji/public/images/apple/door.png differ
diff --git a/plugins/emoji/public/images/apple/doughnut.png b/plugins/emoji/public/images/apple/doughnut.png
new file mode 100644
index 0000000000..dac8d495ee
Binary files /dev/null and b/plugins/emoji/public/images/apple/doughnut.png differ
diff --git a/plugins/emoji/public/images/apple/dragon.png b/plugins/emoji/public/images/apple/dragon.png
new file mode 100644
index 0000000000..b649b76df3
Binary files /dev/null and b/plugins/emoji/public/images/apple/dragon.png differ
diff --git a/plugins/emoji/public/images/apple/dragon_face.png b/plugins/emoji/public/images/apple/dragon_face.png
new file mode 100644
index 0000000000..9d03a107ac
Binary files /dev/null and b/plugins/emoji/public/images/apple/dragon_face.png differ
diff --git a/plugins/emoji/public/images/apple/dress.png b/plugins/emoji/public/images/apple/dress.png
new file mode 100644
index 0000000000..55a6aa8fb0
Binary files /dev/null and b/plugins/emoji/public/images/apple/dress.png differ
diff --git a/plugins/emoji/public/images/apple/dromedary_camel.png b/plugins/emoji/public/images/apple/dromedary_camel.png
new file mode 100644
index 0000000000..a9a1394bdf
Binary files /dev/null and b/plugins/emoji/public/images/apple/dromedary_camel.png differ
diff --git a/plugins/emoji/public/images/apple/droplet.png b/plugins/emoji/public/images/apple/droplet.png
new file mode 100644
index 0000000000..d28e56aa63
Binary files /dev/null and b/plugins/emoji/public/images/apple/droplet.png differ
diff --git a/plugins/emoji/public/images/apple/dvd.png b/plugins/emoji/public/images/apple/dvd.png
new file mode 100644
index 0000000000..2813986555
Binary files /dev/null and b/plugins/emoji/public/images/apple/dvd.png differ
diff --git a/plugins/emoji/public/images/apple/e-mail.png b/plugins/emoji/public/images/apple/e-mail.png
new file mode 100644
index 0000000000..d609e3c096
Binary files /dev/null and b/plugins/emoji/public/images/apple/e-mail.png differ
diff --git a/plugins/emoji/public/images/apple/ear.png b/plugins/emoji/public/images/apple/ear.png
new file mode 100644
index 0000000000..c8e64b560d
Binary files /dev/null and b/plugins/emoji/public/images/apple/ear.png differ
diff --git a/plugins/emoji/public/images/apple/ear_of_rice.png b/plugins/emoji/public/images/apple/ear_of_rice.png
new file mode 100644
index 0000000000..03d42ae471
Binary files /dev/null and b/plugins/emoji/public/images/apple/ear_of_rice.png differ
diff --git a/plugins/emoji/public/images/apple/earth_africa.png b/plugins/emoji/public/images/apple/earth_africa.png
new file mode 100644
index 0000000000..dbfb2a7ff7
Binary files /dev/null and b/plugins/emoji/public/images/apple/earth_africa.png differ
diff --git a/plugins/emoji/public/images/apple/earth_americas.png b/plugins/emoji/public/images/apple/earth_americas.png
new file mode 100644
index 0000000000..5527d4ba28
Binary files /dev/null and b/plugins/emoji/public/images/apple/earth_americas.png differ
diff --git a/plugins/emoji/public/images/apple/earth_asia.png b/plugins/emoji/public/images/apple/earth_asia.png
new file mode 100644
index 0000000000..9edcc3f88d
Binary files /dev/null and b/plugins/emoji/public/images/apple/earth_asia.png differ
diff --git a/plugins/emoji/public/images/apple/egg.png b/plugins/emoji/public/images/apple/egg.png
new file mode 100644
index 0000000000..63243ee645
Binary files /dev/null and b/plugins/emoji/public/images/apple/egg.png differ
diff --git a/plugins/emoji/public/images/apple/eggplant.png b/plugins/emoji/public/images/apple/eggplant.png
new file mode 100644
index 0000000000..13e3636314
Binary files /dev/null and b/plugins/emoji/public/images/apple/eggplant.png differ
diff --git a/plugins/emoji/public/images/apple/eight.png b/plugins/emoji/public/images/apple/eight.png
new file mode 100644
index 0000000000..f76e43d179
Binary files /dev/null and b/plugins/emoji/public/images/apple/eight.png differ
diff --git a/plugins/emoji/public/images/apple/eight_pointed_black_star.png b/plugins/emoji/public/images/apple/eight_pointed_black_star.png
new file mode 100644
index 0000000000..6f4b4eac98
Binary files /dev/null and b/plugins/emoji/public/images/apple/eight_pointed_black_star.png differ
diff --git a/plugins/emoji/public/images/apple/eight_spoked_asterisk.png b/plugins/emoji/public/images/apple/eight_spoked_asterisk.png
new file mode 100644
index 0000000000..efb7f02f52
Binary files /dev/null and b/plugins/emoji/public/images/apple/eight_spoked_asterisk.png differ
diff --git a/plugins/emoji/public/images/apple/electric_plug.png b/plugins/emoji/public/images/apple/electric_plug.png
new file mode 100644
index 0000000000..4262ad05cd
Binary files /dev/null and b/plugins/emoji/public/images/apple/electric_plug.png differ
diff --git a/plugins/emoji/public/images/apple/elephant.png b/plugins/emoji/public/images/apple/elephant.png
new file mode 100644
index 0000000000..418f1e9031
Binary files /dev/null and b/plugins/emoji/public/images/apple/elephant.png differ
diff --git a/plugins/emoji/public/images/apple/email.png b/plugins/emoji/public/images/apple/email.png
new file mode 100644
index 0000000000..e843883b5c
Binary files /dev/null and b/plugins/emoji/public/images/apple/email.png differ
diff --git a/plugins/emoji/public/images/apple/end.png b/plugins/emoji/public/images/apple/end.png
new file mode 100644
index 0000000000..81f57d66ca
Binary files /dev/null and b/plugins/emoji/public/images/apple/end.png differ
diff --git a/plugins/emoji/public/images/apple/envelope.png b/plugins/emoji/public/images/apple/envelope.png
new file mode 100644
index 0000000000..e843883b5c
Binary files /dev/null and b/plugins/emoji/public/images/apple/envelope.png differ
diff --git a/plugins/emoji/public/images/apple/envelope_with_arrow.png b/plugins/emoji/public/images/apple/envelope_with_arrow.png
new file mode 100644
index 0000000000..24a4f008b5
Binary files /dev/null and b/plugins/emoji/public/images/apple/envelope_with_arrow.png differ
diff --git a/plugins/emoji/public/images/apple/es.png b/plugins/emoji/public/images/apple/es.png
new file mode 100644
index 0000000000..afcdcf7b40
Binary files /dev/null and b/plugins/emoji/public/images/apple/es.png differ
diff --git a/plugins/emoji/public/images/apple/euro.png b/plugins/emoji/public/images/apple/euro.png
new file mode 100644
index 0000000000..56d8b68639
Binary files /dev/null and b/plugins/emoji/public/images/apple/euro.png differ
diff --git a/plugins/emoji/public/images/apple/european_castle.png b/plugins/emoji/public/images/apple/european_castle.png
new file mode 100644
index 0000000000..5d0ae8986e
Binary files /dev/null and b/plugins/emoji/public/images/apple/european_castle.png differ
diff --git a/plugins/emoji/public/images/apple/european_post_office.png b/plugins/emoji/public/images/apple/european_post_office.png
new file mode 100644
index 0000000000..a4e92cfc1f
Binary files /dev/null and b/plugins/emoji/public/images/apple/european_post_office.png differ
diff --git a/plugins/emoji/public/images/apple/evergreen_tree.png b/plugins/emoji/public/images/apple/evergreen_tree.png
new file mode 100644
index 0000000000..4710e8861f
Binary files /dev/null and b/plugins/emoji/public/images/apple/evergreen_tree.png differ
diff --git a/plugins/emoji/public/images/apple/exclamation.png b/plugins/emoji/public/images/apple/exclamation.png
new file mode 100644
index 0000000000..15f0171355
Binary files /dev/null and b/plugins/emoji/public/images/apple/exclamation.png differ
diff --git a/plugins/emoji/public/images/apple/expressionless.png b/plugins/emoji/public/images/apple/expressionless.png
new file mode 100644
index 0000000000..4882027ec9
Binary files /dev/null and b/plugins/emoji/public/images/apple/expressionless.png differ
diff --git a/plugins/emoji/public/images/apple/eyeglasses.png b/plugins/emoji/public/images/apple/eyeglasses.png
new file mode 100644
index 0000000000..9f4e057a7a
Binary files /dev/null and b/plugins/emoji/public/images/apple/eyeglasses.png differ
diff --git a/plugins/emoji/public/images/apple/eyes.png b/plugins/emoji/public/images/apple/eyes.png
new file mode 100644
index 0000000000..a8c595d0ce
Binary files /dev/null and b/plugins/emoji/public/images/apple/eyes.png differ
diff --git a/plugins/emoji/public/images/apple/facepunch.png b/plugins/emoji/public/images/apple/facepunch.png
new file mode 100644
index 0000000000..1c2768cfc9
Binary files /dev/null and b/plugins/emoji/public/images/apple/facepunch.png differ
diff --git a/plugins/emoji/public/images/apple/factory.png b/plugins/emoji/public/images/apple/factory.png
new file mode 100644
index 0000000000..200aedb25e
Binary files /dev/null and b/plugins/emoji/public/images/apple/factory.png differ
diff --git a/plugins/emoji/public/images/apple/fallen_leaf.png b/plugins/emoji/public/images/apple/fallen_leaf.png
new file mode 100644
index 0000000000..1804751ac3
Binary files /dev/null and b/plugins/emoji/public/images/apple/fallen_leaf.png differ
diff --git a/plugins/emoji/public/images/apple/family.png b/plugins/emoji/public/images/apple/family.png
new file mode 100644
index 0000000000..f4e470e577
Binary files /dev/null and b/plugins/emoji/public/images/apple/family.png differ
diff --git a/plugins/emoji/public/images/apple/fast_forward.png b/plugins/emoji/public/images/apple/fast_forward.png
new file mode 100644
index 0000000000..c5636e73a0
Binary files /dev/null and b/plugins/emoji/public/images/apple/fast_forward.png differ
diff --git a/plugins/emoji/public/images/apple/fax.png b/plugins/emoji/public/images/apple/fax.png
new file mode 100644
index 0000000000..f3e80d7d3e
Binary files /dev/null and b/plugins/emoji/public/images/apple/fax.png differ
diff --git a/plugins/emoji/public/images/apple/fearful.png b/plugins/emoji/public/images/apple/fearful.png
new file mode 100644
index 0000000000..47e44c1e38
Binary files /dev/null and b/plugins/emoji/public/images/apple/fearful.png differ
diff --git a/plugins/emoji/public/images/apple/feet.png b/plugins/emoji/public/images/apple/feet.png
new file mode 100644
index 0000000000..603b28f5ed
Binary files /dev/null and b/plugins/emoji/public/images/apple/feet.png differ
diff --git a/plugins/emoji/public/images/apple/ferris_wheel.png b/plugins/emoji/public/images/apple/ferris_wheel.png
new file mode 100644
index 0000000000..dadf2f980e
Binary files /dev/null and b/plugins/emoji/public/images/apple/ferris_wheel.png differ
diff --git a/plugins/emoji/public/images/apple/file_folder.png b/plugins/emoji/public/images/apple/file_folder.png
new file mode 100644
index 0000000000..da3462be08
Binary files /dev/null and b/plugins/emoji/public/images/apple/file_folder.png differ
diff --git a/plugins/emoji/public/images/apple/fire.png b/plugins/emoji/public/images/apple/fire.png
new file mode 100644
index 0000000000..ad50c02180
Binary files /dev/null and b/plugins/emoji/public/images/apple/fire.png differ
diff --git a/plugins/emoji/public/images/apple/fire_engine.png b/plugins/emoji/public/images/apple/fire_engine.png
new file mode 100644
index 0000000000..d7df6e86bd
Binary files /dev/null and b/plugins/emoji/public/images/apple/fire_engine.png differ
diff --git a/plugins/emoji/public/images/apple/fireworks.png b/plugins/emoji/public/images/apple/fireworks.png
new file mode 100644
index 0000000000..809342d460
Binary files /dev/null and b/plugins/emoji/public/images/apple/fireworks.png differ
diff --git a/plugins/emoji/public/images/apple/first_quarter_moon.png b/plugins/emoji/public/images/apple/first_quarter_moon.png
new file mode 100644
index 0000000000..adaf1d6cff
Binary files /dev/null and b/plugins/emoji/public/images/apple/first_quarter_moon.png differ
diff --git a/plugins/emoji/public/images/apple/first_quarter_moon_with_face.png b/plugins/emoji/public/images/apple/first_quarter_moon_with_face.png
new file mode 100644
index 0000000000..c3904e1f3f
Binary files /dev/null and b/plugins/emoji/public/images/apple/first_quarter_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/apple/fish.png b/plugins/emoji/public/images/apple/fish.png
new file mode 100644
index 0000000000..2de22099c7
Binary files /dev/null and b/plugins/emoji/public/images/apple/fish.png differ
diff --git a/plugins/emoji/public/images/apple/fish_cake.png b/plugins/emoji/public/images/apple/fish_cake.png
new file mode 100644
index 0000000000..89ab1d9274
Binary files /dev/null and b/plugins/emoji/public/images/apple/fish_cake.png differ
diff --git a/plugins/emoji/public/images/apple/fishing_pole_and_fish.png b/plugins/emoji/public/images/apple/fishing_pole_and_fish.png
new file mode 100644
index 0000000000..ffc6109710
Binary files /dev/null and b/plugins/emoji/public/images/apple/fishing_pole_and_fish.png differ
diff --git a/plugins/emoji/public/images/apple/fist.png b/plugins/emoji/public/images/apple/fist.png
new file mode 100644
index 0000000000..e5262ca227
Binary files /dev/null and b/plugins/emoji/public/images/apple/fist.png differ
diff --git a/plugins/emoji/public/images/apple/five.png b/plugins/emoji/public/images/apple/five.png
new file mode 100644
index 0000000000..9555767a9f
Binary files /dev/null and b/plugins/emoji/public/images/apple/five.png differ
diff --git a/plugins/emoji/public/images/apple/flags.png b/plugins/emoji/public/images/apple/flags.png
new file mode 100644
index 0000000000..2526da08a8
Binary files /dev/null and b/plugins/emoji/public/images/apple/flags.png differ
diff --git a/plugins/emoji/public/images/apple/flashlight.png b/plugins/emoji/public/images/apple/flashlight.png
new file mode 100644
index 0000000000..6f4487471b
Binary files /dev/null and b/plugins/emoji/public/images/apple/flashlight.png differ
diff --git a/plugins/emoji/public/images/apple/flipper.png b/plugins/emoji/public/images/apple/flipper.png
new file mode 100644
index 0000000000..083819034c
Binary files /dev/null and b/plugins/emoji/public/images/apple/flipper.png differ
diff --git a/plugins/emoji/public/images/apple/floppy_disk.png b/plugins/emoji/public/images/apple/floppy_disk.png
new file mode 100644
index 0000000000..f00a8d4e6c
Binary files /dev/null and b/plugins/emoji/public/images/apple/floppy_disk.png differ
diff --git a/plugins/emoji/public/images/apple/flower_playing_cards.png b/plugins/emoji/public/images/apple/flower_playing_cards.png
new file mode 100644
index 0000000000..8cf8725462
Binary files /dev/null and b/plugins/emoji/public/images/apple/flower_playing_cards.png differ
diff --git a/plugins/emoji/public/images/apple/flushed.png b/plugins/emoji/public/images/apple/flushed.png
new file mode 100644
index 0000000000..e6aad287d0
Binary files /dev/null and b/plugins/emoji/public/images/apple/flushed.png differ
diff --git a/plugins/emoji/public/images/apple/foggy.png b/plugins/emoji/public/images/apple/foggy.png
new file mode 100644
index 0000000000..a0ab780708
Binary files /dev/null and b/plugins/emoji/public/images/apple/foggy.png differ
diff --git a/plugins/emoji/public/images/apple/football.png b/plugins/emoji/public/images/apple/football.png
new file mode 100644
index 0000000000..037f7a76e1
Binary files /dev/null and b/plugins/emoji/public/images/apple/football.png differ
diff --git a/plugins/emoji/public/images/apple/footprints.png b/plugins/emoji/public/images/apple/footprints.png
new file mode 100644
index 0000000000..7305374067
Binary files /dev/null and b/plugins/emoji/public/images/apple/footprints.png differ
diff --git a/plugins/emoji/public/images/apple/fork_and_knife.png b/plugins/emoji/public/images/apple/fork_and_knife.png
new file mode 100644
index 0000000000..2fbad780ba
Binary files /dev/null and b/plugins/emoji/public/images/apple/fork_and_knife.png differ
diff --git a/plugins/emoji/public/images/apple/fountain.png b/plugins/emoji/public/images/apple/fountain.png
new file mode 100644
index 0000000000..a4ae76623a
Binary files /dev/null and b/plugins/emoji/public/images/apple/fountain.png differ
diff --git a/plugins/emoji/public/images/apple/four.png b/plugins/emoji/public/images/apple/four.png
new file mode 100644
index 0000000000..e0bab58f05
Binary files /dev/null and b/plugins/emoji/public/images/apple/four.png differ
diff --git a/plugins/emoji/public/images/apple/four_leaf_clover.png b/plugins/emoji/public/images/apple/four_leaf_clover.png
new file mode 100644
index 0000000000..88d4372820
Binary files /dev/null and b/plugins/emoji/public/images/apple/four_leaf_clover.png differ
diff --git a/plugins/emoji/public/images/apple/fr.png b/plugins/emoji/public/images/apple/fr.png
new file mode 100644
index 0000000000..c4ed930176
Binary files /dev/null and b/plugins/emoji/public/images/apple/fr.png differ
diff --git a/plugins/emoji/public/images/apple/free.png b/plugins/emoji/public/images/apple/free.png
new file mode 100644
index 0000000000..623e07f714
Binary files /dev/null and b/plugins/emoji/public/images/apple/free.png differ
diff --git a/plugins/emoji/public/images/apple/fried_shrimp.png b/plugins/emoji/public/images/apple/fried_shrimp.png
new file mode 100644
index 0000000000..4b6711a21a
Binary files /dev/null and b/plugins/emoji/public/images/apple/fried_shrimp.png differ
diff --git a/plugins/emoji/public/images/apple/fries.png b/plugins/emoji/public/images/apple/fries.png
new file mode 100644
index 0000000000..38badf5e60
Binary files /dev/null and b/plugins/emoji/public/images/apple/fries.png differ
diff --git a/plugins/emoji/public/images/apple/frog.png b/plugins/emoji/public/images/apple/frog.png
new file mode 100644
index 0000000000..ccc52e8a37
Binary files /dev/null and b/plugins/emoji/public/images/apple/frog.png differ
diff --git a/plugins/emoji/public/images/apple/frowning.png b/plugins/emoji/public/images/apple/frowning.png
new file mode 100644
index 0000000000..ebaed84a95
Binary files /dev/null and b/plugins/emoji/public/images/apple/frowning.png differ
diff --git a/plugins/emoji/public/images/apple/fuelpump.png b/plugins/emoji/public/images/apple/fuelpump.png
new file mode 100644
index 0000000000..ac7378d2cd
Binary files /dev/null and b/plugins/emoji/public/images/apple/fuelpump.png differ
diff --git a/plugins/emoji/public/images/apple/full_moon.png b/plugins/emoji/public/images/apple/full_moon.png
new file mode 100644
index 0000000000..127f2dcdee
Binary files /dev/null and b/plugins/emoji/public/images/apple/full_moon.png differ
diff --git a/plugins/emoji/public/images/apple/full_moon_with_face.png b/plugins/emoji/public/images/apple/full_moon_with_face.png
new file mode 100644
index 0000000000..ee30e5a027
Binary files /dev/null and b/plugins/emoji/public/images/apple/full_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/apple/game_die.png b/plugins/emoji/public/images/apple/game_die.png
new file mode 100644
index 0000000000..02ee30d4ff
Binary files /dev/null and b/plugins/emoji/public/images/apple/game_die.png differ
diff --git a/plugins/emoji/public/images/apple/gb.png b/plugins/emoji/public/images/apple/gb.png
new file mode 100644
index 0000000000..15bbcdd2f6
Binary files /dev/null and b/plugins/emoji/public/images/apple/gb.png differ
diff --git a/plugins/emoji/public/images/apple/gem.png b/plugins/emoji/public/images/apple/gem.png
new file mode 100644
index 0000000000..1c99516d5c
Binary files /dev/null and b/plugins/emoji/public/images/apple/gem.png differ
diff --git a/plugins/emoji/public/images/apple/gemini.png b/plugins/emoji/public/images/apple/gemini.png
new file mode 100644
index 0000000000..b1a40509ea
Binary files /dev/null and b/plugins/emoji/public/images/apple/gemini.png differ
diff --git a/plugins/emoji/public/images/apple/ghost.png b/plugins/emoji/public/images/apple/ghost.png
new file mode 100644
index 0000000000..3f8fc15d9a
Binary files /dev/null and b/plugins/emoji/public/images/apple/ghost.png differ
diff --git a/plugins/emoji/public/images/apple/gift.png b/plugins/emoji/public/images/apple/gift.png
new file mode 100644
index 0000000000..7ca56a9068
Binary files /dev/null and b/plugins/emoji/public/images/apple/gift.png differ
diff --git a/plugins/emoji/public/images/apple/gift_heart.png b/plugins/emoji/public/images/apple/gift_heart.png
new file mode 100644
index 0000000000..7715b6c744
Binary files /dev/null and b/plugins/emoji/public/images/apple/gift_heart.png differ
diff --git a/plugins/emoji/public/images/apple/girl.png b/plugins/emoji/public/images/apple/girl.png
new file mode 100644
index 0000000000..0180cdf4fe
Binary files /dev/null and b/plugins/emoji/public/images/apple/girl.png differ
diff --git a/plugins/emoji/public/images/apple/globe_with_meridians.png b/plugins/emoji/public/images/apple/globe_with_meridians.png
new file mode 100644
index 0000000000..d2a440c05e
Binary files /dev/null and b/plugins/emoji/public/images/apple/globe_with_meridians.png differ
diff --git a/plugins/emoji/public/images/apple/goat.png b/plugins/emoji/public/images/apple/goat.png
new file mode 100644
index 0000000000..a6e7b9d6e3
Binary files /dev/null and b/plugins/emoji/public/images/apple/goat.png differ
diff --git a/plugins/emoji/public/images/apple/golf.png b/plugins/emoji/public/images/apple/golf.png
new file mode 100644
index 0000000000..2426adc66d
Binary files /dev/null and b/plugins/emoji/public/images/apple/golf.png differ
diff --git a/plugins/emoji/public/images/apple/grapes.png b/plugins/emoji/public/images/apple/grapes.png
new file mode 100644
index 0000000000..700c567c9b
Binary files /dev/null and b/plugins/emoji/public/images/apple/grapes.png differ
diff --git a/plugins/emoji/public/images/apple/green_apple.png b/plugins/emoji/public/images/apple/green_apple.png
new file mode 100644
index 0000000000..119b9dddd8
Binary files /dev/null and b/plugins/emoji/public/images/apple/green_apple.png differ
diff --git a/plugins/emoji/public/images/apple/green_book.png b/plugins/emoji/public/images/apple/green_book.png
new file mode 100644
index 0000000000..bd096135f9
Binary files /dev/null and b/plugins/emoji/public/images/apple/green_book.png differ
diff --git a/plugins/emoji/public/images/apple/green_heart.png b/plugins/emoji/public/images/apple/green_heart.png
new file mode 100644
index 0000000000..81729b0466
Binary files /dev/null and b/plugins/emoji/public/images/apple/green_heart.png differ
diff --git a/plugins/emoji/public/images/apple/grey_exclamation.png b/plugins/emoji/public/images/apple/grey_exclamation.png
new file mode 100644
index 0000000000..dcf5343f5f
Binary files /dev/null and b/plugins/emoji/public/images/apple/grey_exclamation.png differ
diff --git a/plugins/emoji/public/images/apple/grey_question.png b/plugins/emoji/public/images/apple/grey_question.png
new file mode 100644
index 0000000000..64e48d498d
Binary files /dev/null and b/plugins/emoji/public/images/apple/grey_question.png differ
diff --git a/plugins/emoji/public/images/apple/grimacing.png b/plugins/emoji/public/images/apple/grimacing.png
new file mode 100644
index 0000000000..615d6d48c6
Binary files /dev/null and b/plugins/emoji/public/images/apple/grimacing.png differ
diff --git a/plugins/emoji/public/images/apple/grin.png b/plugins/emoji/public/images/apple/grin.png
new file mode 100644
index 0000000000..8b6cdec703
Binary files /dev/null and b/plugins/emoji/public/images/apple/grin.png differ
diff --git a/plugins/emoji/public/images/apple/grinning.png b/plugins/emoji/public/images/apple/grinning.png
new file mode 100644
index 0000000000..9e8d85c92c
Binary files /dev/null and b/plugins/emoji/public/images/apple/grinning.png differ
diff --git a/plugins/emoji/public/images/apple/guardsman.png b/plugins/emoji/public/images/apple/guardsman.png
new file mode 100644
index 0000000000..cd65542f46
Binary files /dev/null and b/plugins/emoji/public/images/apple/guardsman.png differ
diff --git a/plugins/emoji/public/images/apple/guitar.png b/plugins/emoji/public/images/apple/guitar.png
new file mode 100644
index 0000000000..aa92056c09
Binary files /dev/null and b/plugins/emoji/public/images/apple/guitar.png differ
diff --git a/plugins/emoji/public/images/apple/gun.png b/plugins/emoji/public/images/apple/gun.png
new file mode 100644
index 0000000000..3a8676000a
Binary files /dev/null and b/plugins/emoji/public/images/apple/gun.png differ
diff --git a/plugins/emoji/public/images/apple/haircut.png b/plugins/emoji/public/images/apple/haircut.png
new file mode 100644
index 0000000000..8a2702166f
Binary files /dev/null and b/plugins/emoji/public/images/apple/haircut.png differ
diff --git a/plugins/emoji/public/images/apple/hamburger.png b/plugins/emoji/public/images/apple/hamburger.png
new file mode 100644
index 0000000000..7fbc23ddb1
Binary files /dev/null and b/plugins/emoji/public/images/apple/hamburger.png differ
diff --git a/plugins/emoji/public/images/apple/hammer.png b/plugins/emoji/public/images/apple/hammer.png
new file mode 100644
index 0000000000..cb30c5d5e3
Binary files /dev/null and b/plugins/emoji/public/images/apple/hammer.png differ
diff --git a/plugins/emoji/public/images/apple/hamster.png b/plugins/emoji/public/images/apple/hamster.png
new file mode 100644
index 0000000000..6d062f55b1
Binary files /dev/null and b/plugins/emoji/public/images/apple/hamster.png differ
diff --git a/plugins/emoji/public/images/apple/hand.png b/plugins/emoji/public/images/apple/hand.png
new file mode 100644
index 0000000000..acdb2fd378
Binary files /dev/null and b/plugins/emoji/public/images/apple/hand.png differ
diff --git a/plugins/emoji/public/images/apple/handbag.png b/plugins/emoji/public/images/apple/handbag.png
new file mode 100644
index 0000000000..aa0e951ad4
Binary files /dev/null and b/plugins/emoji/public/images/apple/handbag.png differ
diff --git a/plugins/emoji/public/images/apple/hankey.png b/plugins/emoji/public/images/apple/hankey.png
new file mode 100644
index 0000000000..75544655b3
Binary files /dev/null and b/plugins/emoji/public/images/apple/hankey.png differ
diff --git a/plugins/emoji/public/images/apple/hash.png b/plugins/emoji/public/images/apple/hash.png
new file mode 100644
index 0000000000..e1e5923d41
Binary files /dev/null and b/plugins/emoji/public/images/apple/hash.png differ
diff --git a/plugins/emoji/public/images/apple/hatched_chick.png b/plugins/emoji/public/images/apple/hatched_chick.png
new file mode 100644
index 0000000000..3e6d9bd73e
Binary files /dev/null and b/plugins/emoji/public/images/apple/hatched_chick.png differ
diff --git a/plugins/emoji/public/images/apple/hatching_chick.png b/plugins/emoji/public/images/apple/hatching_chick.png
new file mode 100644
index 0000000000..1e11c41520
Binary files /dev/null and b/plugins/emoji/public/images/apple/hatching_chick.png differ
diff --git a/plugins/emoji/public/images/apple/headphones.png b/plugins/emoji/public/images/apple/headphones.png
new file mode 100644
index 0000000000..4082688444
Binary files /dev/null and b/plugins/emoji/public/images/apple/headphones.png differ
diff --git a/plugins/emoji/public/images/apple/hear_no_evil.png b/plugins/emoji/public/images/apple/hear_no_evil.png
new file mode 100644
index 0000000000..7e8a512825
Binary files /dev/null and b/plugins/emoji/public/images/apple/hear_no_evil.png differ
diff --git a/plugins/emoji/public/images/apple/heart.png b/plugins/emoji/public/images/apple/heart.png
new file mode 100644
index 0000000000..10f67fb233
Binary files /dev/null and b/plugins/emoji/public/images/apple/heart.png differ
diff --git a/plugins/emoji/public/images/apple/heart_decoration.png b/plugins/emoji/public/images/apple/heart_decoration.png
new file mode 100644
index 0000000000..040ab7c51d
Binary files /dev/null and b/plugins/emoji/public/images/apple/heart_decoration.png differ
diff --git a/plugins/emoji/public/images/apple/heart_eyes.png b/plugins/emoji/public/images/apple/heart_eyes.png
new file mode 100644
index 0000000000..e63dbfda55
Binary files /dev/null and b/plugins/emoji/public/images/apple/heart_eyes.png differ
diff --git a/plugins/emoji/public/images/apple/heart_eyes_cat.png b/plugins/emoji/public/images/apple/heart_eyes_cat.png
new file mode 100644
index 0000000000..048ca8689b
Binary files /dev/null and b/plugins/emoji/public/images/apple/heart_eyes_cat.png differ
diff --git a/plugins/emoji/public/images/apple/heartbeat.png b/plugins/emoji/public/images/apple/heartbeat.png
new file mode 100644
index 0000000000..9f4b41d32a
Binary files /dev/null and b/plugins/emoji/public/images/apple/heartbeat.png differ
diff --git a/plugins/emoji/public/images/apple/heartpulse.png b/plugins/emoji/public/images/apple/heartpulse.png
new file mode 100644
index 0000000000..9920dbc786
Binary files /dev/null and b/plugins/emoji/public/images/apple/heartpulse.png differ
diff --git a/plugins/emoji/public/images/apple/hearts.png b/plugins/emoji/public/images/apple/hearts.png
new file mode 100644
index 0000000000..dabee766eb
Binary files /dev/null and b/plugins/emoji/public/images/apple/hearts.png differ
diff --git a/plugins/emoji/public/images/apple/heavy_check_mark.png b/plugins/emoji/public/images/apple/heavy_check_mark.png
new file mode 100644
index 0000000000..d6b6015104
Binary files /dev/null and b/plugins/emoji/public/images/apple/heavy_check_mark.png differ
diff --git a/plugins/emoji/public/images/apple/heavy_division_sign.png b/plugins/emoji/public/images/apple/heavy_division_sign.png
new file mode 100644
index 0000000000..08ae9ee847
Binary files /dev/null and b/plugins/emoji/public/images/apple/heavy_division_sign.png differ
diff --git a/plugins/emoji/public/images/apple/heavy_dollar_sign.png b/plugins/emoji/public/images/apple/heavy_dollar_sign.png
new file mode 100644
index 0000000000..0874e00652
Binary files /dev/null and b/plugins/emoji/public/images/apple/heavy_dollar_sign.png differ
diff --git a/plugins/emoji/public/images/apple/heavy_exclamation_mark.png b/plugins/emoji/public/images/apple/heavy_exclamation_mark.png
new file mode 100644
index 0000000000..15f0171355
Binary files /dev/null and b/plugins/emoji/public/images/apple/heavy_exclamation_mark.png differ
diff --git a/plugins/emoji/public/images/apple/heavy_minus_sign.png b/plugins/emoji/public/images/apple/heavy_minus_sign.png
new file mode 100644
index 0000000000..e661c4895d
Binary files /dev/null and b/plugins/emoji/public/images/apple/heavy_minus_sign.png differ
diff --git a/plugins/emoji/public/images/apple/heavy_multiplication_x.png b/plugins/emoji/public/images/apple/heavy_multiplication_x.png
new file mode 100644
index 0000000000..d9f1012468
Binary files /dev/null and b/plugins/emoji/public/images/apple/heavy_multiplication_x.png differ
diff --git a/plugins/emoji/public/images/apple/heavy_plus_sign.png b/plugins/emoji/public/images/apple/heavy_plus_sign.png
new file mode 100644
index 0000000000..2eac7b29af
Binary files /dev/null and b/plugins/emoji/public/images/apple/heavy_plus_sign.png differ
diff --git a/plugins/emoji/public/images/apple/helicopter.png b/plugins/emoji/public/images/apple/helicopter.png
new file mode 100644
index 0000000000..1ee25fa3ab
Binary files /dev/null and b/plugins/emoji/public/images/apple/helicopter.png differ
diff --git a/plugins/emoji/public/images/apple/herb.png b/plugins/emoji/public/images/apple/herb.png
new file mode 100644
index 0000000000..9ac06db3e1
Binary files /dev/null and b/plugins/emoji/public/images/apple/herb.png differ
diff --git a/plugins/emoji/public/images/apple/hibiscus.png b/plugins/emoji/public/images/apple/hibiscus.png
new file mode 100644
index 0000000000..567f8cc027
Binary files /dev/null and b/plugins/emoji/public/images/apple/hibiscus.png differ
diff --git a/plugins/emoji/public/images/apple/high_brightness.png b/plugins/emoji/public/images/apple/high_brightness.png
new file mode 100644
index 0000000000..49bfcfdfe5
Binary files /dev/null and b/plugins/emoji/public/images/apple/high_brightness.png differ
diff --git a/plugins/emoji/public/images/apple/high_heel.png b/plugins/emoji/public/images/apple/high_heel.png
new file mode 100644
index 0000000000..4562be9dab
Binary files /dev/null and b/plugins/emoji/public/images/apple/high_heel.png differ
diff --git a/plugins/emoji/public/images/apple/hocho.png b/plugins/emoji/public/images/apple/hocho.png
new file mode 100644
index 0000000000..630397cd39
Binary files /dev/null and b/plugins/emoji/public/images/apple/hocho.png differ
diff --git a/plugins/emoji/public/images/apple/honey_pot.png b/plugins/emoji/public/images/apple/honey_pot.png
new file mode 100644
index 0000000000..d7fbb7408f
Binary files /dev/null and b/plugins/emoji/public/images/apple/honey_pot.png differ
diff --git a/plugins/emoji/public/images/apple/honeybee.png b/plugins/emoji/public/images/apple/honeybee.png
new file mode 100644
index 0000000000..fd8465d93e
Binary files /dev/null and b/plugins/emoji/public/images/apple/honeybee.png differ
diff --git a/plugins/emoji/public/images/apple/horse.png b/plugins/emoji/public/images/apple/horse.png
new file mode 100644
index 0000000000..ebb777ee9d
Binary files /dev/null and b/plugins/emoji/public/images/apple/horse.png differ
diff --git a/plugins/emoji/public/images/apple/horse_racing.png b/plugins/emoji/public/images/apple/horse_racing.png
new file mode 100644
index 0000000000..42f715974b
Binary files /dev/null and b/plugins/emoji/public/images/apple/horse_racing.png differ
diff --git a/plugins/emoji/public/images/apple/hospital.png b/plugins/emoji/public/images/apple/hospital.png
new file mode 100644
index 0000000000..ba7a2a4216
Binary files /dev/null and b/plugins/emoji/public/images/apple/hospital.png differ
diff --git a/plugins/emoji/public/images/apple/hotel.png b/plugins/emoji/public/images/apple/hotel.png
new file mode 100644
index 0000000000..a37c5940c7
Binary files /dev/null and b/plugins/emoji/public/images/apple/hotel.png differ
diff --git a/plugins/emoji/public/images/apple/hotsprings.png b/plugins/emoji/public/images/apple/hotsprings.png
new file mode 100644
index 0000000000..4f0072d9da
Binary files /dev/null and b/plugins/emoji/public/images/apple/hotsprings.png differ
diff --git a/plugins/emoji/public/images/apple/hourglass.png b/plugins/emoji/public/images/apple/hourglass.png
new file mode 100644
index 0000000000..37295ff816
Binary files /dev/null and b/plugins/emoji/public/images/apple/hourglass.png differ
diff --git a/plugins/emoji/public/images/apple/hourglass_flowing_sand.png b/plugins/emoji/public/images/apple/hourglass_flowing_sand.png
new file mode 100644
index 0000000000..12ce4252be
Binary files /dev/null and b/plugins/emoji/public/images/apple/hourglass_flowing_sand.png differ
diff --git a/plugins/emoji/public/images/apple/house.png b/plugins/emoji/public/images/apple/house.png
new file mode 100644
index 0000000000..4e17b37a8b
Binary files /dev/null and b/plugins/emoji/public/images/apple/house.png differ
diff --git a/plugins/emoji/public/images/apple/house_with_garden.png b/plugins/emoji/public/images/apple/house_with_garden.png
new file mode 100644
index 0000000000..0b0ada8f41
Binary files /dev/null and b/plugins/emoji/public/images/apple/house_with_garden.png differ
diff --git a/plugins/emoji/public/images/apple/hushed.png b/plugins/emoji/public/images/apple/hushed.png
new file mode 100644
index 0000000000..d91a51f634
Binary files /dev/null and b/plugins/emoji/public/images/apple/hushed.png differ
diff --git a/plugins/emoji/public/images/apple/ice_cream.png b/plugins/emoji/public/images/apple/ice_cream.png
new file mode 100644
index 0000000000..b04bcd69aa
Binary files /dev/null and b/plugins/emoji/public/images/apple/ice_cream.png differ
diff --git a/plugins/emoji/public/images/apple/icecream.png b/plugins/emoji/public/images/apple/icecream.png
new file mode 100644
index 0000000000..4af3cbbb10
Binary files /dev/null and b/plugins/emoji/public/images/apple/icecream.png differ
diff --git a/plugins/emoji/public/images/apple/id.png b/plugins/emoji/public/images/apple/id.png
new file mode 100644
index 0000000000..d2753bfd4e
Binary files /dev/null and b/plugins/emoji/public/images/apple/id.png differ
diff --git a/plugins/emoji/public/images/apple/ideograph_advantage.png b/plugins/emoji/public/images/apple/ideograph_advantage.png
new file mode 100644
index 0000000000..9287867239
Binary files /dev/null and b/plugins/emoji/public/images/apple/ideograph_advantage.png differ
diff --git a/plugins/emoji/public/images/apple/imp.png b/plugins/emoji/public/images/apple/imp.png
new file mode 100644
index 0000000000..10de3bbfb0
Binary files /dev/null and b/plugins/emoji/public/images/apple/imp.png differ
diff --git a/plugins/emoji/public/images/apple/inbox_tray.png b/plugins/emoji/public/images/apple/inbox_tray.png
new file mode 100644
index 0000000000..0f69d46093
Binary files /dev/null and b/plugins/emoji/public/images/apple/inbox_tray.png differ
diff --git a/plugins/emoji/public/images/apple/incoming_envelope.png b/plugins/emoji/public/images/apple/incoming_envelope.png
new file mode 100644
index 0000000000..fb0a4c8041
Binary files /dev/null and b/plugins/emoji/public/images/apple/incoming_envelope.png differ
diff --git a/plugins/emoji/public/images/apple/information_desk_person.png b/plugins/emoji/public/images/apple/information_desk_person.png
new file mode 100644
index 0000000000..8804a07a3d
Binary files /dev/null and b/plugins/emoji/public/images/apple/information_desk_person.png differ
diff --git a/plugins/emoji/public/images/apple/information_source.png b/plugins/emoji/public/images/apple/information_source.png
new file mode 100644
index 0000000000..e7b1384735
Binary files /dev/null and b/plugins/emoji/public/images/apple/information_source.png differ
diff --git a/plugins/emoji/public/images/apple/innocent.png b/plugins/emoji/public/images/apple/innocent.png
new file mode 100644
index 0000000000..04911a92ad
Binary files /dev/null and b/plugins/emoji/public/images/apple/innocent.png differ
diff --git a/plugins/emoji/public/images/apple/interrobang.png b/plugins/emoji/public/images/apple/interrobang.png
new file mode 100644
index 0000000000..6d4a85ec34
Binary files /dev/null and b/plugins/emoji/public/images/apple/interrobang.png differ
diff --git a/plugins/emoji/public/images/apple/iphone.png b/plugins/emoji/public/images/apple/iphone.png
new file mode 100644
index 0000000000..615468a4b7
Binary files /dev/null and b/plugins/emoji/public/images/apple/iphone.png differ
diff --git a/plugins/emoji/public/images/apple/it.png b/plugins/emoji/public/images/apple/it.png
new file mode 100644
index 0000000000..d1dee29e89
Binary files /dev/null and b/plugins/emoji/public/images/apple/it.png differ
diff --git a/plugins/emoji/public/images/apple/izakaya_lantern.png b/plugins/emoji/public/images/apple/izakaya_lantern.png
new file mode 100644
index 0000000000..d60b3974fb
Binary files /dev/null and b/plugins/emoji/public/images/apple/izakaya_lantern.png differ
diff --git a/plugins/emoji/public/images/apple/jack_o_lantern.png b/plugins/emoji/public/images/apple/jack_o_lantern.png
new file mode 100644
index 0000000000..c38956522d
Binary files /dev/null and b/plugins/emoji/public/images/apple/jack_o_lantern.png differ
diff --git a/plugins/emoji/public/images/apple/japan.png b/plugins/emoji/public/images/apple/japan.png
new file mode 100644
index 0000000000..e2d496c501
Binary files /dev/null and b/plugins/emoji/public/images/apple/japan.png differ
diff --git a/plugins/emoji/public/images/apple/japanese_castle.png b/plugins/emoji/public/images/apple/japanese_castle.png
new file mode 100644
index 0000000000..547d8075e5
Binary files /dev/null and b/plugins/emoji/public/images/apple/japanese_castle.png differ
diff --git a/plugins/emoji/public/images/apple/japanese_goblin.png b/plugins/emoji/public/images/apple/japanese_goblin.png
new file mode 100644
index 0000000000..039ccb519c
Binary files /dev/null and b/plugins/emoji/public/images/apple/japanese_goblin.png differ
diff --git a/plugins/emoji/public/images/apple/japanese_ogre.png b/plugins/emoji/public/images/apple/japanese_ogre.png
new file mode 100644
index 0000000000..5ad27b9774
Binary files /dev/null and b/plugins/emoji/public/images/apple/japanese_ogre.png differ
diff --git a/plugins/emoji/public/images/apple/jeans.png b/plugins/emoji/public/images/apple/jeans.png
new file mode 100644
index 0000000000..2ee3a9f5f7
Binary files /dev/null and b/plugins/emoji/public/images/apple/jeans.png differ
diff --git a/plugins/emoji/public/images/apple/joy.png b/plugins/emoji/public/images/apple/joy.png
new file mode 100644
index 0000000000..9264720e70
Binary files /dev/null and b/plugins/emoji/public/images/apple/joy.png differ
diff --git a/plugins/emoji/public/images/apple/joy_cat.png b/plugins/emoji/public/images/apple/joy_cat.png
new file mode 100644
index 0000000000..8d2cbd874c
Binary files /dev/null and b/plugins/emoji/public/images/apple/joy_cat.png differ
diff --git a/plugins/emoji/public/images/apple/jp.png b/plugins/emoji/public/images/apple/jp.png
new file mode 100644
index 0000000000..8487914a71
Binary files /dev/null and b/plugins/emoji/public/images/apple/jp.png differ
diff --git a/plugins/emoji/public/images/apple/key.png b/plugins/emoji/public/images/apple/key.png
new file mode 100644
index 0000000000..65c4521520
Binary files /dev/null and b/plugins/emoji/public/images/apple/key.png differ
diff --git a/plugins/emoji/public/images/apple/keycap_ten.png b/plugins/emoji/public/images/apple/keycap_ten.png
new file mode 100644
index 0000000000..506a793782
Binary files /dev/null and b/plugins/emoji/public/images/apple/keycap_ten.png differ
diff --git a/plugins/emoji/public/images/apple/kimono.png b/plugins/emoji/public/images/apple/kimono.png
new file mode 100644
index 0000000000..15ee907805
Binary files /dev/null and b/plugins/emoji/public/images/apple/kimono.png differ
diff --git a/plugins/emoji/public/images/apple/kiss.png b/plugins/emoji/public/images/apple/kiss.png
new file mode 100644
index 0000000000..9b90300253
Binary files /dev/null and b/plugins/emoji/public/images/apple/kiss.png differ
diff --git a/plugins/emoji/public/images/apple/kissing.png b/plugins/emoji/public/images/apple/kissing.png
new file mode 100644
index 0000000000..1611afdd62
Binary files /dev/null and b/plugins/emoji/public/images/apple/kissing.png differ
diff --git a/plugins/emoji/public/images/apple/kissing_cat.png b/plugins/emoji/public/images/apple/kissing_cat.png
new file mode 100644
index 0000000000..1b1d0ca783
Binary files /dev/null and b/plugins/emoji/public/images/apple/kissing_cat.png differ
diff --git a/plugins/emoji/public/images/apple/kissing_closed_eyes.png b/plugins/emoji/public/images/apple/kissing_closed_eyes.png
new file mode 100644
index 0000000000..d95e390971
Binary files /dev/null and b/plugins/emoji/public/images/apple/kissing_closed_eyes.png differ
diff --git a/plugins/emoji/public/images/apple/kissing_heart.png b/plugins/emoji/public/images/apple/kissing_heart.png
new file mode 100644
index 0000000000..e0791696fd
Binary files /dev/null and b/plugins/emoji/public/images/apple/kissing_heart.png differ
diff --git a/plugins/emoji/public/images/apple/kissing_smiling_eyes.png b/plugins/emoji/public/images/apple/kissing_smiling_eyes.png
new file mode 100644
index 0000000000..3f2b6391ea
Binary files /dev/null and b/plugins/emoji/public/images/apple/kissing_smiling_eyes.png differ
diff --git a/plugins/emoji/public/images/apple/knife.png b/plugins/emoji/public/images/apple/knife.png
new file mode 100644
index 0000000000..630397cd39
Binary files /dev/null and b/plugins/emoji/public/images/apple/knife.png differ
diff --git a/plugins/emoji/public/images/apple/koala.png b/plugins/emoji/public/images/apple/koala.png
new file mode 100644
index 0000000000..d36e64e3b1
Binary files /dev/null and b/plugins/emoji/public/images/apple/koala.png differ
diff --git a/plugins/emoji/public/images/apple/koko.png b/plugins/emoji/public/images/apple/koko.png
new file mode 100644
index 0000000000..5f8c3cb90a
Binary files /dev/null and b/plugins/emoji/public/images/apple/koko.png differ
diff --git a/plugins/emoji/public/images/apple/kr.png b/plugins/emoji/public/images/apple/kr.png
new file mode 100644
index 0000000000..5640546ef4
Binary files /dev/null and b/plugins/emoji/public/images/apple/kr.png differ
diff --git a/plugins/emoji/public/images/apple/lantern.png b/plugins/emoji/public/images/apple/lantern.png
new file mode 100644
index 0000000000..d60b3974fb
Binary files /dev/null and b/plugins/emoji/public/images/apple/lantern.png differ
diff --git a/plugins/emoji/public/images/apple/large_blue_circle.png b/plugins/emoji/public/images/apple/large_blue_circle.png
new file mode 100644
index 0000000000..b52f5165e2
Binary files /dev/null and b/plugins/emoji/public/images/apple/large_blue_circle.png differ
diff --git a/plugins/emoji/public/images/apple/large_blue_diamond.png b/plugins/emoji/public/images/apple/large_blue_diamond.png
new file mode 100644
index 0000000000..70b7eb05d7
Binary files /dev/null and b/plugins/emoji/public/images/apple/large_blue_diamond.png differ
diff --git a/plugins/emoji/public/images/apple/large_orange_diamond.png b/plugins/emoji/public/images/apple/large_orange_diamond.png
new file mode 100644
index 0000000000..585da56008
Binary files /dev/null and b/plugins/emoji/public/images/apple/large_orange_diamond.png differ
diff --git a/plugins/emoji/public/images/apple/last_quarter_moon.png b/plugins/emoji/public/images/apple/last_quarter_moon.png
new file mode 100644
index 0000000000..a212b1ee90
Binary files /dev/null and b/plugins/emoji/public/images/apple/last_quarter_moon.png differ
diff --git a/plugins/emoji/public/images/apple/last_quarter_moon_with_face.png b/plugins/emoji/public/images/apple/last_quarter_moon_with_face.png
new file mode 100644
index 0000000000..2c9f57694c
Binary files /dev/null and b/plugins/emoji/public/images/apple/last_quarter_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/apple/laughing.png b/plugins/emoji/public/images/apple/laughing.png
new file mode 100644
index 0000000000..85605c7329
Binary files /dev/null and b/plugins/emoji/public/images/apple/laughing.png differ
diff --git a/plugins/emoji/public/images/apple/leaves.png b/plugins/emoji/public/images/apple/leaves.png
new file mode 100644
index 0000000000..85bd905ea8
Binary files /dev/null and b/plugins/emoji/public/images/apple/leaves.png differ
diff --git a/plugins/emoji/public/images/apple/ledger.png b/plugins/emoji/public/images/apple/ledger.png
new file mode 100644
index 0000000000..85443655f7
Binary files /dev/null and b/plugins/emoji/public/images/apple/ledger.png differ
diff --git a/plugins/emoji/public/images/apple/left_luggage.png b/plugins/emoji/public/images/apple/left_luggage.png
new file mode 100644
index 0000000000..fa742b16a9
Binary files /dev/null and b/plugins/emoji/public/images/apple/left_luggage.png differ
diff --git a/plugins/emoji/public/images/apple/left_right_arrow.png b/plugins/emoji/public/images/apple/left_right_arrow.png
new file mode 100644
index 0000000000..bc198fc7ba
Binary files /dev/null and b/plugins/emoji/public/images/apple/left_right_arrow.png differ
diff --git a/plugins/emoji/public/images/apple/leftwards_arrow_with_hook.png b/plugins/emoji/public/images/apple/leftwards_arrow_with_hook.png
new file mode 100644
index 0000000000..857cfea259
Binary files /dev/null and b/plugins/emoji/public/images/apple/leftwards_arrow_with_hook.png differ
diff --git a/plugins/emoji/public/images/apple/lemon.png b/plugins/emoji/public/images/apple/lemon.png
new file mode 100644
index 0000000000..329cf127ff
Binary files /dev/null and b/plugins/emoji/public/images/apple/lemon.png differ
diff --git a/plugins/emoji/public/images/apple/leo.png b/plugins/emoji/public/images/apple/leo.png
new file mode 100644
index 0000000000..7f61595816
Binary files /dev/null and b/plugins/emoji/public/images/apple/leo.png differ
diff --git a/plugins/emoji/public/images/apple/leopard.png b/plugins/emoji/public/images/apple/leopard.png
new file mode 100644
index 0000000000..8451b91a3a
Binary files /dev/null and b/plugins/emoji/public/images/apple/leopard.png differ
diff --git a/plugins/emoji/public/images/apple/libra.png b/plugins/emoji/public/images/apple/libra.png
new file mode 100644
index 0000000000..2ba8db148b
Binary files /dev/null and b/plugins/emoji/public/images/apple/libra.png differ
diff --git a/plugins/emoji/public/images/apple/light_rail.png b/plugins/emoji/public/images/apple/light_rail.png
new file mode 100644
index 0000000000..2a4830d3d2
Binary files /dev/null and b/plugins/emoji/public/images/apple/light_rail.png differ
diff --git a/plugins/emoji/public/images/apple/link.png b/plugins/emoji/public/images/apple/link.png
new file mode 100644
index 0000000000..d9e51e4c0d
Binary files /dev/null and b/plugins/emoji/public/images/apple/link.png differ
diff --git a/plugins/emoji/public/images/apple/lips.png b/plugins/emoji/public/images/apple/lips.png
new file mode 100644
index 0000000000..24b496d2b1
Binary files /dev/null and b/plugins/emoji/public/images/apple/lips.png differ
diff --git a/plugins/emoji/public/images/apple/lipstick.png b/plugins/emoji/public/images/apple/lipstick.png
new file mode 100644
index 0000000000..fed2021e66
Binary files /dev/null and b/plugins/emoji/public/images/apple/lipstick.png differ
diff --git a/plugins/emoji/public/images/apple/lock.png b/plugins/emoji/public/images/apple/lock.png
new file mode 100644
index 0000000000..48370b7491
Binary files /dev/null and b/plugins/emoji/public/images/apple/lock.png differ
diff --git a/plugins/emoji/public/images/apple/lock_with_ink_pen.png b/plugins/emoji/public/images/apple/lock_with_ink_pen.png
new file mode 100644
index 0000000000..4490b88983
Binary files /dev/null and b/plugins/emoji/public/images/apple/lock_with_ink_pen.png differ
diff --git a/plugins/emoji/public/images/apple/lollipop.png b/plugins/emoji/public/images/apple/lollipop.png
new file mode 100644
index 0000000000..65c89afc42
Binary files /dev/null and b/plugins/emoji/public/images/apple/lollipop.png differ
diff --git a/plugins/emoji/public/images/apple/loop.png b/plugins/emoji/public/images/apple/loop.png
new file mode 100644
index 0000000000..36ecba6227
Binary files /dev/null and b/plugins/emoji/public/images/apple/loop.png differ
diff --git a/plugins/emoji/public/images/apple/loud_sound.png b/plugins/emoji/public/images/apple/loud_sound.png
new file mode 100644
index 0000000000..6531c18c7c
Binary files /dev/null and b/plugins/emoji/public/images/apple/loud_sound.png differ
diff --git a/plugins/emoji/public/images/apple/loudspeaker.png b/plugins/emoji/public/images/apple/loudspeaker.png
new file mode 100644
index 0000000000..4e5a409fcd
Binary files /dev/null and b/plugins/emoji/public/images/apple/loudspeaker.png differ
diff --git a/plugins/emoji/public/images/apple/love_hotel.png b/plugins/emoji/public/images/apple/love_hotel.png
new file mode 100644
index 0000000000..eea9d5a6e1
Binary files /dev/null and b/plugins/emoji/public/images/apple/love_hotel.png differ
diff --git a/plugins/emoji/public/images/apple/love_letter.png b/plugins/emoji/public/images/apple/love_letter.png
new file mode 100644
index 0000000000..b2a395ac92
Binary files /dev/null and b/plugins/emoji/public/images/apple/love_letter.png differ
diff --git a/plugins/emoji/public/images/apple/low_brightness.png b/plugins/emoji/public/images/apple/low_brightness.png
new file mode 100644
index 0000000000..7fbe82ae64
Binary files /dev/null and b/plugins/emoji/public/images/apple/low_brightness.png differ
diff --git a/plugins/emoji/public/images/apple/m.png b/plugins/emoji/public/images/apple/m.png
new file mode 100644
index 0000000000..c681410f04
Binary files /dev/null and b/plugins/emoji/public/images/apple/m.png differ
diff --git a/plugins/emoji/public/images/apple/mag.png b/plugins/emoji/public/images/apple/mag.png
new file mode 100644
index 0000000000..e523296872
Binary files /dev/null and b/plugins/emoji/public/images/apple/mag.png differ
diff --git a/plugins/emoji/public/images/apple/mag_right.png b/plugins/emoji/public/images/apple/mag_right.png
new file mode 100644
index 0000000000..21905ebbdd
Binary files /dev/null and b/plugins/emoji/public/images/apple/mag_right.png differ
diff --git a/plugins/emoji/public/images/apple/mahjong.png b/plugins/emoji/public/images/apple/mahjong.png
new file mode 100644
index 0000000000..347d6ad3a0
Binary files /dev/null and b/plugins/emoji/public/images/apple/mahjong.png differ
diff --git a/plugins/emoji/public/images/apple/mailbox.png b/plugins/emoji/public/images/apple/mailbox.png
new file mode 100644
index 0000000000..6fd5b72e72
Binary files /dev/null and b/plugins/emoji/public/images/apple/mailbox.png differ
diff --git a/plugins/emoji/public/images/apple/mailbox_closed.png b/plugins/emoji/public/images/apple/mailbox_closed.png
new file mode 100644
index 0000000000..fd314b8d3b
Binary files /dev/null and b/plugins/emoji/public/images/apple/mailbox_closed.png differ
diff --git a/plugins/emoji/public/images/apple/mailbox_with_mail.png b/plugins/emoji/public/images/apple/mailbox_with_mail.png
new file mode 100644
index 0000000000..6a0d191467
Binary files /dev/null and b/plugins/emoji/public/images/apple/mailbox_with_mail.png differ
diff --git a/plugins/emoji/public/images/apple/mailbox_with_no_mail.png b/plugins/emoji/public/images/apple/mailbox_with_no_mail.png
new file mode 100644
index 0000000000..c4bda7acfc
Binary files /dev/null and b/plugins/emoji/public/images/apple/mailbox_with_no_mail.png differ
diff --git a/plugins/emoji/public/images/apple/man.png b/plugins/emoji/public/images/apple/man.png
new file mode 100644
index 0000000000..686ba56b9e
Binary files /dev/null and b/plugins/emoji/public/images/apple/man.png differ
diff --git a/plugins/emoji/public/images/apple/man_with_gua_pi_mao.png b/plugins/emoji/public/images/apple/man_with_gua_pi_mao.png
new file mode 100644
index 0000000000..8d8e1fbe01
Binary files /dev/null and b/plugins/emoji/public/images/apple/man_with_gua_pi_mao.png differ
diff --git a/plugins/emoji/public/images/apple/man_with_turban.png b/plugins/emoji/public/images/apple/man_with_turban.png
new file mode 100644
index 0000000000..64f06b0f2f
Binary files /dev/null and b/plugins/emoji/public/images/apple/man_with_turban.png differ
diff --git a/plugins/emoji/public/images/apple/mans_shoe.png b/plugins/emoji/public/images/apple/mans_shoe.png
new file mode 100644
index 0000000000..710a276ecb
Binary files /dev/null and b/plugins/emoji/public/images/apple/mans_shoe.png differ
diff --git a/plugins/emoji/public/images/apple/maple_leaf.png b/plugins/emoji/public/images/apple/maple_leaf.png
new file mode 100644
index 0000000000..f609255298
Binary files /dev/null and b/plugins/emoji/public/images/apple/maple_leaf.png differ
diff --git a/plugins/emoji/public/images/apple/mask.png b/plugins/emoji/public/images/apple/mask.png
new file mode 100644
index 0000000000..8f8ead27db
Binary files /dev/null and b/plugins/emoji/public/images/apple/mask.png differ
diff --git a/plugins/emoji/public/images/apple/massage.png b/plugins/emoji/public/images/apple/massage.png
new file mode 100644
index 0000000000..f6974e76b0
Binary files /dev/null and b/plugins/emoji/public/images/apple/massage.png differ
diff --git a/plugins/emoji/public/images/apple/meat_on_bone.png b/plugins/emoji/public/images/apple/meat_on_bone.png
new file mode 100644
index 0000000000..750b0f3cc5
Binary files /dev/null and b/plugins/emoji/public/images/apple/meat_on_bone.png differ
diff --git a/plugins/emoji/public/images/apple/mega.png b/plugins/emoji/public/images/apple/mega.png
new file mode 100644
index 0000000000..04d972b1a4
Binary files /dev/null and b/plugins/emoji/public/images/apple/mega.png differ
diff --git a/plugins/emoji/public/images/apple/melon.png b/plugins/emoji/public/images/apple/melon.png
new file mode 100644
index 0000000000..1440d82857
Binary files /dev/null and b/plugins/emoji/public/images/apple/melon.png differ
diff --git a/plugins/emoji/public/images/apple/memo.png b/plugins/emoji/public/images/apple/memo.png
new file mode 100644
index 0000000000..57abb762d5
Binary files /dev/null and b/plugins/emoji/public/images/apple/memo.png differ
diff --git a/plugins/emoji/public/images/apple/mens.png b/plugins/emoji/public/images/apple/mens.png
new file mode 100644
index 0000000000..44c9351d03
Binary files /dev/null and b/plugins/emoji/public/images/apple/mens.png differ
diff --git a/plugins/emoji/public/images/apple/metro.png b/plugins/emoji/public/images/apple/metro.png
new file mode 100644
index 0000000000..4f73871969
Binary files /dev/null and b/plugins/emoji/public/images/apple/metro.png differ
diff --git a/plugins/emoji/public/images/apple/microphone.png b/plugins/emoji/public/images/apple/microphone.png
new file mode 100644
index 0000000000..31ade85df6
Binary files /dev/null and b/plugins/emoji/public/images/apple/microphone.png differ
diff --git a/plugins/emoji/public/images/apple/microscope.png b/plugins/emoji/public/images/apple/microscope.png
new file mode 100644
index 0000000000..62f2597597
Binary files /dev/null and b/plugins/emoji/public/images/apple/microscope.png differ
diff --git a/plugins/emoji/public/images/apple/milky_way.png b/plugins/emoji/public/images/apple/milky_way.png
new file mode 100644
index 0000000000..fe0eaa6455
Binary files /dev/null and b/plugins/emoji/public/images/apple/milky_way.png differ
diff --git a/plugins/emoji/public/images/apple/minibus.png b/plugins/emoji/public/images/apple/minibus.png
new file mode 100644
index 0000000000..ed9f6b93f3
Binary files /dev/null and b/plugins/emoji/public/images/apple/minibus.png differ
diff --git a/plugins/emoji/public/images/apple/minidisc.png b/plugins/emoji/public/images/apple/minidisc.png
new file mode 100644
index 0000000000..56af53b27f
Binary files /dev/null and b/plugins/emoji/public/images/apple/minidisc.png differ
diff --git a/plugins/emoji/public/images/apple/mobile_phone_off.png b/plugins/emoji/public/images/apple/mobile_phone_off.png
new file mode 100644
index 0000000000..ef83829954
Binary files /dev/null and b/plugins/emoji/public/images/apple/mobile_phone_off.png differ
diff --git a/plugins/emoji/public/images/apple/money_with_wings.png b/plugins/emoji/public/images/apple/money_with_wings.png
new file mode 100644
index 0000000000..2940d1798a
Binary files /dev/null and b/plugins/emoji/public/images/apple/money_with_wings.png differ
diff --git a/plugins/emoji/public/images/apple/moneybag.png b/plugins/emoji/public/images/apple/moneybag.png
new file mode 100644
index 0000000000..956fc0ffd7
Binary files /dev/null and b/plugins/emoji/public/images/apple/moneybag.png differ
diff --git a/plugins/emoji/public/images/apple/monkey.png b/plugins/emoji/public/images/apple/monkey.png
new file mode 100644
index 0000000000..52c9740d66
Binary files /dev/null and b/plugins/emoji/public/images/apple/monkey.png differ
diff --git a/plugins/emoji/public/images/apple/monkey_face.png b/plugins/emoji/public/images/apple/monkey_face.png
new file mode 100644
index 0000000000..c10b913a00
Binary files /dev/null and b/plugins/emoji/public/images/apple/monkey_face.png differ
diff --git a/plugins/emoji/public/images/apple/monorail.png b/plugins/emoji/public/images/apple/monorail.png
new file mode 100644
index 0000000000..8062fc7b6a
Binary files /dev/null and b/plugins/emoji/public/images/apple/monorail.png differ
diff --git a/plugins/emoji/public/images/apple/moon.png b/plugins/emoji/public/images/apple/moon.png
new file mode 100644
index 0000000000..03e9b3daba
Binary files /dev/null and b/plugins/emoji/public/images/apple/moon.png differ
diff --git a/plugins/emoji/public/images/apple/mortar_board.png b/plugins/emoji/public/images/apple/mortar_board.png
new file mode 100644
index 0000000000..d17e8cf074
Binary files /dev/null and b/plugins/emoji/public/images/apple/mortar_board.png differ
diff --git a/plugins/emoji/public/images/apple/mount_fuji.png b/plugins/emoji/public/images/apple/mount_fuji.png
new file mode 100644
index 0000000000..7bc05512f8
Binary files /dev/null and b/plugins/emoji/public/images/apple/mount_fuji.png differ
diff --git a/plugins/emoji/public/images/apple/mountain_bicyclist.png b/plugins/emoji/public/images/apple/mountain_bicyclist.png
new file mode 100644
index 0000000000..761dde0d9e
Binary files /dev/null and b/plugins/emoji/public/images/apple/mountain_bicyclist.png differ
diff --git a/plugins/emoji/public/images/apple/mountain_cableway.png b/plugins/emoji/public/images/apple/mountain_cableway.png
new file mode 100644
index 0000000000..b68440c0ee
Binary files /dev/null and b/plugins/emoji/public/images/apple/mountain_cableway.png differ
diff --git a/plugins/emoji/public/images/apple/mountain_railway.png b/plugins/emoji/public/images/apple/mountain_railway.png
new file mode 100644
index 0000000000..4c63b90883
Binary files /dev/null and b/plugins/emoji/public/images/apple/mountain_railway.png differ
diff --git a/plugins/emoji/public/images/apple/mouse.png b/plugins/emoji/public/images/apple/mouse.png
new file mode 100644
index 0000000000..7cd289d40d
Binary files /dev/null and b/plugins/emoji/public/images/apple/mouse.png differ
diff --git a/plugins/emoji/public/images/apple/mouse2.png b/plugins/emoji/public/images/apple/mouse2.png
new file mode 100644
index 0000000000..5eaab10842
Binary files /dev/null and b/plugins/emoji/public/images/apple/mouse2.png differ
diff --git a/plugins/emoji/public/images/apple/movie_camera.png b/plugins/emoji/public/images/apple/movie_camera.png
new file mode 100644
index 0000000000..86af960c98
Binary files /dev/null and b/plugins/emoji/public/images/apple/movie_camera.png differ
diff --git a/plugins/emoji/public/images/apple/moyai.png b/plugins/emoji/public/images/apple/moyai.png
new file mode 100644
index 0000000000..76a72f5654
Binary files /dev/null and b/plugins/emoji/public/images/apple/moyai.png differ
diff --git a/plugins/emoji/public/images/apple/muscle.png b/plugins/emoji/public/images/apple/muscle.png
new file mode 100644
index 0000000000..5778d0df7d
Binary files /dev/null and b/plugins/emoji/public/images/apple/muscle.png differ
diff --git a/plugins/emoji/public/images/apple/mushroom.png b/plugins/emoji/public/images/apple/mushroom.png
new file mode 100644
index 0000000000..5ed54b62da
Binary files /dev/null and b/plugins/emoji/public/images/apple/mushroom.png differ
diff --git a/plugins/emoji/public/images/apple/musical_keyboard.png b/plugins/emoji/public/images/apple/musical_keyboard.png
new file mode 100644
index 0000000000..e424342907
Binary files /dev/null and b/plugins/emoji/public/images/apple/musical_keyboard.png differ
diff --git a/plugins/emoji/public/images/apple/musical_note.png b/plugins/emoji/public/images/apple/musical_note.png
new file mode 100644
index 0000000000..83fc05faf9
Binary files /dev/null and b/plugins/emoji/public/images/apple/musical_note.png differ
diff --git a/plugins/emoji/public/images/apple/musical_score.png b/plugins/emoji/public/images/apple/musical_score.png
new file mode 100644
index 0000000000..5cf7032eba
Binary files /dev/null and b/plugins/emoji/public/images/apple/musical_score.png differ
diff --git a/plugins/emoji/public/images/apple/mute.png b/plugins/emoji/public/images/apple/mute.png
new file mode 100644
index 0000000000..ceb6d167e4
Binary files /dev/null and b/plugins/emoji/public/images/apple/mute.png differ
diff --git a/plugins/emoji/public/images/apple/nail_care.png b/plugins/emoji/public/images/apple/nail_care.png
new file mode 100644
index 0000000000..b32d0d377b
Binary files /dev/null and b/plugins/emoji/public/images/apple/nail_care.png differ
diff --git a/plugins/emoji/public/images/apple/name_badge.png b/plugins/emoji/public/images/apple/name_badge.png
new file mode 100644
index 0000000000..083eb8a7a8
Binary files /dev/null and b/plugins/emoji/public/images/apple/name_badge.png differ
diff --git a/plugins/emoji/public/images/apple/necktie.png b/plugins/emoji/public/images/apple/necktie.png
new file mode 100644
index 0000000000..0097e34e2d
Binary files /dev/null and b/plugins/emoji/public/images/apple/necktie.png differ
diff --git a/plugins/emoji/public/images/apple/negative_squared_cross_mark.png b/plugins/emoji/public/images/apple/negative_squared_cross_mark.png
new file mode 100644
index 0000000000..75f1c61b65
Binary files /dev/null and b/plugins/emoji/public/images/apple/negative_squared_cross_mark.png differ
diff --git a/plugins/emoji/public/images/apple/neutral_face.png b/plugins/emoji/public/images/apple/neutral_face.png
new file mode 100644
index 0000000000..8fc0b1cf98
Binary files /dev/null and b/plugins/emoji/public/images/apple/neutral_face.png differ
diff --git a/plugins/emoji/public/images/apple/new.png b/plugins/emoji/public/images/apple/new.png
new file mode 100644
index 0000000000..a4d4e3f2fe
Binary files /dev/null and b/plugins/emoji/public/images/apple/new.png differ
diff --git a/plugins/emoji/public/images/apple/new_moon.png b/plugins/emoji/public/images/apple/new_moon.png
new file mode 100644
index 0000000000..48b05c6870
Binary files /dev/null and b/plugins/emoji/public/images/apple/new_moon.png differ
diff --git a/plugins/emoji/public/images/apple/new_moon_with_face.png b/plugins/emoji/public/images/apple/new_moon_with_face.png
new file mode 100644
index 0000000000..e3ed1487b9
Binary files /dev/null and b/plugins/emoji/public/images/apple/new_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/apple/newspaper.png b/plugins/emoji/public/images/apple/newspaper.png
new file mode 100644
index 0000000000..1714f3d085
Binary files /dev/null and b/plugins/emoji/public/images/apple/newspaper.png differ
diff --git a/plugins/emoji/public/images/apple/ng.png b/plugins/emoji/public/images/apple/ng.png
new file mode 100644
index 0000000000..6081ffb672
Binary files /dev/null and b/plugins/emoji/public/images/apple/ng.png differ
diff --git a/plugins/emoji/public/images/apple/night_with_stars.png b/plugins/emoji/public/images/apple/night_with_stars.png
new file mode 100644
index 0000000000..d80bcc3bd0
Binary files /dev/null and b/plugins/emoji/public/images/apple/night_with_stars.png differ
diff --git a/plugins/emoji/public/images/apple/nine.png b/plugins/emoji/public/images/apple/nine.png
new file mode 100644
index 0000000000..3de2d1f0c7
Binary files /dev/null and b/plugins/emoji/public/images/apple/nine.png differ
diff --git a/plugins/emoji/public/images/apple/no_bell.png b/plugins/emoji/public/images/apple/no_bell.png
new file mode 100644
index 0000000000..66496e2d5f
Binary files /dev/null and b/plugins/emoji/public/images/apple/no_bell.png differ
diff --git a/plugins/emoji/public/images/apple/no_bicycles.png b/plugins/emoji/public/images/apple/no_bicycles.png
new file mode 100644
index 0000000000..24a2adad0c
Binary files /dev/null and b/plugins/emoji/public/images/apple/no_bicycles.png differ
diff --git a/plugins/emoji/public/images/apple/no_entry.png b/plugins/emoji/public/images/apple/no_entry.png
new file mode 100644
index 0000000000..8a0cec727f
Binary files /dev/null and b/plugins/emoji/public/images/apple/no_entry.png differ
diff --git a/plugins/emoji/public/images/apple/no_entry_sign.png b/plugins/emoji/public/images/apple/no_entry_sign.png
new file mode 100644
index 0000000000..e84384f49d
Binary files /dev/null and b/plugins/emoji/public/images/apple/no_entry_sign.png differ
diff --git a/plugins/emoji/public/images/apple/no_good.png b/plugins/emoji/public/images/apple/no_good.png
new file mode 100644
index 0000000000..883fa8a847
Binary files /dev/null and b/plugins/emoji/public/images/apple/no_good.png differ
diff --git a/plugins/emoji/public/images/apple/no_mobile_phones.png b/plugins/emoji/public/images/apple/no_mobile_phones.png
new file mode 100644
index 0000000000..40ddd0aab7
Binary files /dev/null and b/plugins/emoji/public/images/apple/no_mobile_phones.png differ
diff --git a/plugins/emoji/public/images/apple/no_mouth.png b/plugins/emoji/public/images/apple/no_mouth.png
new file mode 100644
index 0000000000..d8ae6e8c10
Binary files /dev/null and b/plugins/emoji/public/images/apple/no_mouth.png differ
diff --git a/plugins/emoji/public/images/apple/no_pedestrians.png b/plugins/emoji/public/images/apple/no_pedestrians.png
new file mode 100644
index 0000000000..7b598c5a02
Binary files /dev/null and b/plugins/emoji/public/images/apple/no_pedestrians.png differ
diff --git a/plugins/emoji/public/images/apple/no_smoking.png b/plugins/emoji/public/images/apple/no_smoking.png
new file mode 100644
index 0000000000..b6bd6309de
Binary files /dev/null and b/plugins/emoji/public/images/apple/no_smoking.png differ
diff --git a/plugins/emoji/public/images/apple/non-potable_water.png b/plugins/emoji/public/images/apple/non-potable_water.png
new file mode 100644
index 0000000000..4e96155bc9
Binary files /dev/null and b/plugins/emoji/public/images/apple/non-potable_water.png differ
diff --git a/plugins/emoji/public/images/apple/nose.png b/plugins/emoji/public/images/apple/nose.png
new file mode 100644
index 0000000000..403f6aacae
Binary files /dev/null and b/plugins/emoji/public/images/apple/nose.png differ
diff --git a/plugins/emoji/public/images/apple/notebook.png b/plugins/emoji/public/images/apple/notebook.png
new file mode 100644
index 0000000000..357871772f
Binary files /dev/null and b/plugins/emoji/public/images/apple/notebook.png differ
diff --git a/plugins/emoji/public/images/apple/notebook_with_decorative_cover.png b/plugins/emoji/public/images/apple/notebook_with_decorative_cover.png
new file mode 100644
index 0000000000..82e6871ccf
Binary files /dev/null and b/plugins/emoji/public/images/apple/notebook_with_decorative_cover.png differ
diff --git a/plugins/emoji/public/images/apple/notes.png b/plugins/emoji/public/images/apple/notes.png
new file mode 100644
index 0000000000..e593cfac72
Binary files /dev/null and b/plugins/emoji/public/images/apple/notes.png differ
diff --git a/plugins/emoji/public/images/apple/nut_and_bolt.png b/plugins/emoji/public/images/apple/nut_and_bolt.png
new file mode 100644
index 0000000000..afd5da08e0
Binary files /dev/null and b/plugins/emoji/public/images/apple/nut_and_bolt.png differ
diff --git a/plugins/emoji/public/images/apple/o.png b/plugins/emoji/public/images/apple/o.png
new file mode 100644
index 0000000000..fcf887e960
Binary files /dev/null and b/plugins/emoji/public/images/apple/o.png differ
diff --git a/plugins/emoji/public/images/apple/o2.png b/plugins/emoji/public/images/apple/o2.png
new file mode 100644
index 0000000000..c8ca117ad2
Binary files /dev/null and b/plugins/emoji/public/images/apple/o2.png differ
diff --git a/plugins/emoji/public/images/apple/ocean.png b/plugins/emoji/public/images/apple/ocean.png
new file mode 100644
index 0000000000..35798e4f39
Binary files /dev/null and b/plugins/emoji/public/images/apple/ocean.png differ
diff --git a/plugins/emoji/public/images/apple/octopus.png b/plugins/emoji/public/images/apple/octopus.png
new file mode 100644
index 0000000000..16727ff286
Binary files /dev/null and b/plugins/emoji/public/images/apple/octopus.png differ
diff --git a/plugins/emoji/public/images/apple/oden.png b/plugins/emoji/public/images/apple/oden.png
new file mode 100644
index 0000000000..9d9b18da20
Binary files /dev/null and b/plugins/emoji/public/images/apple/oden.png differ
diff --git a/plugins/emoji/public/images/apple/office.png b/plugins/emoji/public/images/apple/office.png
new file mode 100644
index 0000000000..e4d7afb377
Binary files /dev/null and b/plugins/emoji/public/images/apple/office.png differ
diff --git a/plugins/emoji/public/images/apple/ok.png b/plugins/emoji/public/images/apple/ok.png
new file mode 100644
index 0000000000..de3d08b66a
Binary files /dev/null and b/plugins/emoji/public/images/apple/ok.png differ
diff --git a/plugins/emoji/public/images/apple/ok_hand.png b/plugins/emoji/public/images/apple/ok_hand.png
new file mode 100644
index 0000000000..da70b346e1
Binary files /dev/null and b/plugins/emoji/public/images/apple/ok_hand.png differ
diff --git a/plugins/emoji/public/images/apple/ok_woman.png b/plugins/emoji/public/images/apple/ok_woman.png
new file mode 100644
index 0000000000..bdb7461b71
Binary files /dev/null and b/plugins/emoji/public/images/apple/ok_woman.png differ
diff --git a/plugins/emoji/public/images/apple/older_man.png b/plugins/emoji/public/images/apple/older_man.png
new file mode 100644
index 0000000000..e6e295553f
Binary files /dev/null and b/plugins/emoji/public/images/apple/older_man.png differ
diff --git a/plugins/emoji/public/images/apple/older_woman.png b/plugins/emoji/public/images/apple/older_woman.png
new file mode 100644
index 0000000000..d5224eb0b0
Binary files /dev/null and b/plugins/emoji/public/images/apple/older_woman.png differ
diff --git a/plugins/emoji/public/images/apple/on.png b/plugins/emoji/public/images/apple/on.png
new file mode 100644
index 0000000000..1d5c752ccf
Binary files /dev/null and b/plugins/emoji/public/images/apple/on.png differ
diff --git a/plugins/emoji/public/images/apple/oncoming_automobile.png b/plugins/emoji/public/images/apple/oncoming_automobile.png
new file mode 100644
index 0000000000..2361bf1537
Binary files /dev/null and b/plugins/emoji/public/images/apple/oncoming_automobile.png differ
diff --git a/plugins/emoji/public/images/apple/oncoming_bus.png b/plugins/emoji/public/images/apple/oncoming_bus.png
new file mode 100644
index 0000000000..f74afbbaa1
Binary files /dev/null and b/plugins/emoji/public/images/apple/oncoming_bus.png differ
diff --git a/plugins/emoji/public/images/apple/oncoming_police_car.png b/plugins/emoji/public/images/apple/oncoming_police_car.png
new file mode 100644
index 0000000000..9daf28ef11
Binary files /dev/null and b/plugins/emoji/public/images/apple/oncoming_police_car.png differ
diff --git a/plugins/emoji/public/images/apple/oncoming_taxi.png b/plugins/emoji/public/images/apple/oncoming_taxi.png
new file mode 100644
index 0000000000..944299846e
Binary files /dev/null and b/plugins/emoji/public/images/apple/oncoming_taxi.png differ
diff --git a/plugins/emoji/public/images/apple/one.png b/plugins/emoji/public/images/apple/one.png
new file mode 100644
index 0000000000..c6d6bd84f6
Binary files /dev/null and b/plugins/emoji/public/images/apple/one.png differ
diff --git a/plugins/emoji/public/images/apple/open_book.png b/plugins/emoji/public/images/apple/open_book.png
new file mode 100644
index 0000000000..e269adc7e9
Binary files /dev/null and b/plugins/emoji/public/images/apple/open_book.png differ
diff --git a/plugins/emoji/public/images/apple/open_file_folder.png b/plugins/emoji/public/images/apple/open_file_folder.png
new file mode 100644
index 0000000000..f248186181
Binary files /dev/null and b/plugins/emoji/public/images/apple/open_file_folder.png differ
diff --git a/plugins/emoji/public/images/apple/open_hands.png b/plugins/emoji/public/images/apple/open_hands.png
new file mode 100644
index 0000000000..3b5bf32b4f
Binary files /dev/null and b/plugins/emoji/public/images/apple/open_hands.png differ
diff --git a/plugins/emoji/public/images/apple/open_mouth.png b/plugins/emoji/public/images/apple/open_mouth.png
new file mode 100644
index 0000000000..738b8dfd05
Binary files /dev/null and b/plugins/emoji/public/images/apple/open_mouth.png differ
diff --git a/plugins/emoji/public/images/apple/ophiuchus.png b/plugins/emoji/public/images/apple/ophiuchus.png
new file mode 100644
index 0000000000..9fa22157e6
Binary files /dev/null and b/plugins/emoji/public/images/apple/ophiuchus.png differ
diff --git a/plugins/emoji/public/images/apple/orange_book.png b/plugins/emoji/public/images/apple/orange_book.png
new file mode 100644
index 0000000000..127cc17ba5
Binary files /dev/null and b/plugins/emoji/public/images/apple/orange_book.png differ
diff --git a/plugins/emoji/public/images/apple/outbox_tray.png b/plugins/emoji/public/images/apple/outbox_tray.png
new file mode 100644
index 0000000000..51697f3df3
Binary files /dev/null and b/plugins/emoji/public/images/apple/outbox_tray.png differ
diff --git a/plugins/emoji/public/images/apple/ox.png b/plugins/emoji/public/images/apple/ox.png
new file mode 100644
index 0000000000..9584882e04
Binary files /dev/null and b/plugins/emoji/public/images/apple/ox.png differ
diff --git a/plugins/emoji/public/images/apple/package.png b/plugins/emoji/public/images/apple/package.png
new file mode 100644
index 0000000000..f59164691f
Binary files /dev/null and b/plugins/emoji/public/images/apple/package.png differ
diff --git a/plugins/emoji/public/images/apple/page_facing_up.png b/plugins/emoji/public/images/apple/page_facing_up.png
new file mode 100644
index 0000000000..89f7b77c99
Binary files /dev/null and b/plugins/emoji/public/images/apple/page_facing_up.png differ
diff --git a/plugins/emoji/public/images/apple/page_with_curl.png b/plugins/emoji/public/images/apple/page_with_curl.png
new file mode 100644
index 0000000000..bfb32cbdac
Binary files /dev/null and b/plugins/emoji/public/images/apple/page_with_curl.png differ
diff --git a/plugins/emoji/public/images/apple/pager.png b/plugins/emoji/public/images/apple/pager.png
new file mode 100644
index 0000000000..19546e124f
Binary files /dev/null and b/plugins/emoji/public/images/apple/pager.png differ
diff --git a/plugins/emoji/public/images/apple/palm_tree.png b/plugins/emoji/public/images/apple/palm_tree.png
new file mode 100644
index 0000000000..970875c59b
Binary files /dev/null and b/plugins/emoji/public/images/apple/palm_tree.png differ
diff --git a/plugins/emoji/public/images/apple/panda_face.png b/plugins/emoji/public/images/apple/panda_face.png
new file mode 100644
index 0000000000..e958ed3cd2
Binary files /dev/null and b/plugins/emoji/public/images/apple/panda_face.png differ
diff --git a/plugins/emoji/public/images/apple/paperclip.png b/plugins/emoji/public/images/apple/paperclip.png
new file mode 100644
index 0000000000..c868a2d17b
Binary files /dev/null and b/plugins/emoji/public/images/apple/paperclip.png differ
diff --git a/plugins/emoji/public/images/apple/parking.png b/plugins/emoji/public/images/apple/parking.png
new file mode 100644
index 0000000000..1992173dbd
Binary files /dev/null and b/plugins/emoji/public/images/apple/parking.png differ
diff --git a/plugins/emoji/public/images/apple/part_alternation_mark.png b/plugins/emoji/public/images/apple/part_alternation_mark.png
new file mode 100644
index 0000000000..8bc91217cb
Binary files /dev/null and b/plugins/emoji/public/images/apple/part_alternation_mark.png differ
diff --git a/plugins/emoji/public/images/apple/partly_sunny.png b/plugins/emoji/public/images/apple/partly_sunny.png
new file mode 100644
index 0000000000..013707c152
Binary files /dev/null and b/plugins/emoji/public/images/apple/partly_sunny.png differ
diff --git a/plugins/emoji/public/images/apple/passport_control.png b/plugins/emoji/public/images/apple/passport_control.png
new file mode 100644
index 0000000000..a941d20f7b
Binary files /dev/null and b/plugins/emoji/public/images/apple/passport_control.png differ
diff --git a/plugins/emoji/public/images/apple/paw_prints.png b/plugins/emoji/public/images/apple/paw_prints.png
new file mode 100644
index 0000000000..603b28f5ed
Binary files /dev/null and b/plugins/emoji/public/images/apple/paw_prints.png differ
diff --git a/plugins/emoji/public/images/apple/peach.png b/plugins/emoji/public/images/apple/peach.png
new file mode 100644
index 0000000000..5d507ac300
Binary files /dev/null and b/plugins/emoji/public/images/apple/peach.png differ
diff --git a/plugins/emoji/public/images/apple/pear.png b/plugins/emoji/public/images/apple/pear.png
new file mode 100644
index 0000000000..45206b156c
Binary files /dev/null and b/plugins/emoji/public/images/apple/pear.png differ
diff --git a/plugins/emoji/public/images/apple/pencil.png b/plugins/emoji/public/images/apple/pencil.png
new file mode 100644
index 0000000000..57abb762d5
Binary files /dev/null and b/plugins/emoji/public/images/apple/pencil.png differ
diff --git a/plugins/emoji/public/images/apple/pencil2.png b/plugins/emoji/public/images/apple/pencil2.png
new file mode 100644
index 0000000000..36d68feb67
Binary files /dev/null and b/plugins/emoji/public/images/apple/pencil2.png differ
diff --git a/plugins/emoji/public/images/apple/penguin.png b/plugins/emoji/public/images/apple/penguin.png
new file mode 100644
index 0000000000..bcb20f5505
Binary files /dev/null and b/plugins/emoji/public/images/apple/penguin.png differ
diff --git a/plugins/emoji/public/images/apple/pensive.png b/plugins/emoji/public/images/apple/pensive.png
new file mode 100644
index 0000000000..f08e4308cd
Binary files /dev/null and b/plugins/emoji/public/images/apple/pensive.png differ
diff --git a/plugins/emoji/public/images/apple/performing_arts.png b/plugins/emoji/public/images/apple/performing_arts.png
new file mode 100644
index 0000000000..ec6058de67
Binary files /dev/null and b/plugins/emoji/public/images/apple/performing_arts.png differ
diff --git a/plugins/emoji/public/images/apple/persevere.png b/plugins/emoji/public/images/apple/persevere.png
new file mode 100644
index 0000000000..6914cd67d3
Binary files /dev/null and b/plugins/emoji/public/images/apple/persevere.png differ
diff --git a/plugins/emoji/public/images/apple/person_frowning.png b/plugins/emoji/public/images/apple/person_frowning.png
new file mode 100644
index 0000000000..a1425d60a1
Binary files /dev/null and b/plugins/emoji/public/images/apple/person_frowning.png differ
diff --git a/plugins/emoji/public/images/apple/person_with_blond_hair.png b/plugins/emoji/public/images/apple/person_with_blond_hair.png
new file mode 100644
index 0000000000..42b734a9c6
Binary files /dev/null and b/plugins/emoji/public/images/apple/person_with_blond_hair.png differ
diff --git a/plugins/emoji/public/images/apple/person_with_pouting_face.png b/plugins/emoji/public/images/apple/person_with_pouting_face.png
new file mode 100644
index 0000000000..5f1a366801
Binary files /dev/null and b/plugins/emoji/public/images/apple/person_with_pouting_face.png differ
diff --git a/plugins/emoji/public/images/apple/phone.png b/plugins/emoji/public/images/apple/phone.png
new file mode 100644
index 0000000000..fb1d51cdbc
Binary files /dev/null and b/plugins/emoji/public/images/apple/phone.png differ
diff --git a/plugins/emoji/public/images/apple/pig.png b/plugins/emoji/public/images/apple/pig.png
new file mode 100644
index 0000000000..adbbff8b85
Binary files /dev/null and b/plugins/emoji/public/images/apple/pig.png differ
diff --git a/plugins/emoji/public/images/apple/pig2.png b/plugins/emoji/public/images/apple/pig2.png
new file mode 100644
index 0000000000..b88c155503
Binary files /dev/null and b/plugins/emoji/public/images/apple/pig2.png differ
diff --git a/plugins/emoji/public/images/apple/pig_nose.png b/plugins/emoji/public/images/apple/pig_nose.png
new file mode 100644
index 0000000000..03ba68a03f
Binary files /dev/null and b/plugins/emoji/public/images/apple/pig_nose.png differ
diff --git a/plugins/emoji/public/images/apple/pill.png b/plugins/emoji/public/images/apple/pill.png
new file mode 100644
index 0000000000..6b14f15fd8
Binary files /dev/null and b/plugins/emoji/public/images/apple/pill.png differ
diff --git a/plugins/emoji/public/images/apple/pineapple.png b/plugins/emoji/public/images/apple/pineapple.png
new file mode 100644
index 0000000000..054a60e2e9
Binary files /dev/null and b/plugins/emoji/public/images/apple/pineapple.png differ
diff --git a/plugins/emoji/public/images/apple/pisces.png b/plugins/emoji/public/images/apple/pisces.png
new file mode 100644
index 0000000000..4bedc908df
Binary files /dev/null and b/plugins/emoji/public/images/apple/pisces.png differ
diff --git a/plugins/emoji/public/images/apple/pizza.png b/plugins/emoji/public/images/apple/pizza.png
new file mode 100644
index 0000000000..4595819180
Binary files /dev/null and b/plugins/emoji/public/images/apple/pizza.png differ
diff --git a/plugins/emoji/public/images/apple/point_down.png b/plugins/emoji/public/images/apple/point_down.png
new file mode 100644
index 0000000000..a0187533c0
Binary files /dev/null and b/plugins/emoji/public/images/apple/point_down.png differ
diff --git a/plugins/emoji/public/images/apple/point_left.png b/plugins/emoji/public/images/apple/point_left.png
new file mode 100644
index 0000000000..e6a0f0f38e
Binary files /dev/null and b/plugins/emoji/public/images/apple/point_left.png differ
diff --git a/plugins/emoji/public/images/apple/point_right.png b/plugins/emoji/public/images/apple/point_right.png
new file mode 100644
index 0000000000..193cb21036
Binary files /dev/null and b/plugins/emoji/public/images/apple/point_right.png differ
diff --git a/plugins/emoji/public/images/apple/point_up.png b/plugins/emoji/public/images/apple/point_up.png
new file mode 100644
index 0000000000..fe4b03fd38
Binary files /dev/null and b/plugins/emoji/public/images/apple/point_up.png differ
diff --git a/plugins/emoji/public/images/apple/point_up_2.png b/plugins/emoji/public/images/apple/point_up_2.png
new file mode 100644
index 0000000000..531273376e
Binary files /dev/null and b/plugins/emoji/public/images/apple/point_up_2.png differ
diff --git a/plugins/emoji/public/images/apple/police_car.png b/plugins/emoji/public/images/apple/police_car.png
new file mode 100644
index 0000000000..84527e1254
Binary files /dev/null and b/plugins/emoji/public/images/apple/police_car.png differ
diff --git a/plugins/emoji/public/images/apple/poodle.png b/plugins/emoji/public/images/apple/poodle.png
new file mode 100644
index 0000000000..2c750091a0
Binary files /dev/null and b/plugins/emoji/public/images/apple/poodle.png differ
diff --git a/plugins/emoji/public/images/apple/poop.png b/plugins/emoji/public/images/apple/poop.png
new file mode 100644
index 0000000000..75544655b3
Binary files /dev/null and b/plugins/emoji/public/images/apple/poop.png differ
diff --git a/plugins/emoji/public/images/apple/post_office.png b/plugins/emoji/public/images/apple/post_office.png
new file mode 100644
index 0000000000..6de9f0a19c
Binary files /dev/null and b/plugins/emoji/public/images/apple/post_office.png differ
diff --git a/plugins/emoji/public/images/apple/postal_horn.png b/plugins/emoji/public/images/apple/postal_horn.png
new file mode 100644
index 0000000000..d2dc714ded
Binary files /dev/null and b/plugins/emoji/public/images/apple/postal_horn.png differ
diff --git a/plugins/emoji/public/images/apple/postbox.png b/plugins/emoji/public/images/apple/postbox.png
new file mode 100644
index 0000000000..6c807b9d97
Binary files /dev/null and b/plugins/emoji/public/images/apple/postbox.png differ
diff --git a/plugins/emoji/public/images/apple/potable_water.png b/plugins/emoji/public/images/apple/potable_water.png
new file mode 100644
index 0000000000..9a73c001f8
Binary files /dev/null and b/plugins/emoji/public/images/apple/potable_water.png differ
diff --git a/plugins/emoji/public/images/apple/pouch.png b/plugins/emoji/public/images/apple/pouch.png
new file mode 100644
index 0000000000..765b285fc7
Binary files /dev/null and b/plugins/emoji/public/images/apple/pouch.png differ
diff --git a/plugins/emoji/public/images/apple/poultry_leg.png b/plugins/emoji/public/images/apple/poultry_leg.png
new file mode 100644
index 0000000000..70251a8e94
Binary files /dev/null and b/plugins/emoji/public/images/apple/poultry_leg.png differ
diff --git a/plugins/emoji/public/images/apple/pound.png b/plugins/emoji/public/images/apple/pound.png
new file mode 100644
index 0000000000..a479ce6e46
Binary files /dev/null and b/plugins/emoji/public/images/apple/pound.png differ
diff --git a/plugins/emoji/public/images/apple/pouting_cat.png b/plugins/emoji/public/images/apple/pouting_cat.png
new file mode 100644
index 0000000000..b3c4e44ddb
Binary files /dev/null and b/plugins/emoji/public/images/apple/pouting_cat.png differ
diff --git a/plugins/emoji/public/images/apple/pray.png b/plugins/emoji/public/images/apple/pray.png
new file mode 100644
index 0000000000..0087b99abb
Binary files /dev/null and b/plugins/emoji/public/images/apple/pray.png differ
diff --git a/plugins/emoji/public/images/apple/princess.png b/plugins/emoji/public/images/apple/princess.png
new file mode 100644
index 0000000000..c175263ce4
Binary files /dev/null and b/plugins/emoji/public/images/apple/princess.png differ
diff --git a/plugins/emoji/public/images/apple/punch.png b/plugins/emoji/public/images/apple/punch.png
new file mode 100644
index 0000000000..1c2768cfc9
Binary files /dev/null and b/plugins/emoji/public/images/apple/punch.png differ
diff --git a/plugins/emoji/public/images/apple/purple_heart.png b/plugins/emoji/public/images/apple/purple_heart.png
new file mode 100644
index 0000000000..cc9f2b4686
Binary files /dev/null and b/plugins/emoji/public/images/apple/purple_heart.png differ
diff --git a/plugins/emoji/public/images/apple/purse.png b/plugins/emoji/public/images/apple/purse.png
new file mode 100644
index 0000000000..41ab614a12
Binary files /dev/null and b/plugins/emoji/public/images/apple/purse.png differ
diff --git a/plugins/emoji/public/images/apple/pushpin.png b/plugins/emoji/public/images/apple/pushpin.png
new file mode 100644
index 0000000000..cda2c126c2
Binary files /dev/null and b/plugins/emoji/public/images/apple/pushpin.png differ
diff --git a/plugins/emoji/public/images/apple/put_litter_in_its_place.png b/plugins/emoji/public/images/apple/put_litter_in_its_place.png
new file mode 100644
index 0000000000..3a2e7caffc
Binary files /dev/null and b/plugins/emoji/public/images/apple/put_litter_in_its_place.png differ
diff --git a/plugins/emoji/public/images/apple/question.png b/plugins/emoji/public/images/apple/question.png
new file mode 100644
index 0000000000..5dcd490073
Binary files /dev/null and b/plugins/emoji/public/images/apple/question.png differ
diff --git a/plugins/emoji/public/images/apple/rabbit.png b/plugins/emoji/public/images/apple/rabbit.png
new file mode 100644
index 0000000000..7f8f08aa38
Binary files /dev/null and b/plugins/emoji/public/images/apple/rabbit.png differ
diff --git a/plugins/emoji/public/images/apple/rabbit2.png b/plugins/emoji/public/images/apple/rabbit2.png
new file mode 100644
index 0000000000..7e9469f376
Binary files /dev/null and b/plugins/emoji/public/images/apple/rabbit2.png differ
diff --git a/plugins/emoji/public/images/apple/racehorse.png b/plugins/emoji/public/images/apple/racehorse.png
new file mode 100644
index 0000000000..5a3e1566f2
Binary files /dev/null and b/plugins/emoji/public/images/apple/racehorse.png differ
diff --git a/plugins/emoji/public/images/apple/radio.png b/plugins/emoji/public/images/apple/radio.png
new file mode 100644
index 0000000000..dcdeeff223
Binary files /dev/null and b/plugins/emoji/public/images/apple/radio.png differ
diff --git a/plugins/emoji/public/images/apple/radio_button.png b/plugins/emoji/public/images/apple/radio_button.png
new file mode 100644
index 0000000000..f2f2be4a50
Binary files /dev/null and b/plugins/emoji/public/images/apple/radio_button.png differ
diff --git a/plugins/emoji/public/images/apple/rage.png b/plugins/emoji/public/images/apple/rage.png
new file mode 100644
index 0000000000..84ef537606
Binary files /dev/null and b/plugins/emoji/public/images/apple/rage.png differ
diff --git a/plugins/emoji/public/images/apple/railway_car.png b/plugins/emoji/public/images/apple/railway_car.png
new file mode 100644
index 0000000000..2464ff0c0d
Binary files /dev/null and b/plugins/emoji/public/images/apple/railway_car.png differ
diff --git a/plugins/emoji/public/images/apple/rainbow.png b/plugins/emoji/public/images/apple/rainbow.png
new file mode 100644
index 0000000000..7bce80f7b9
Binary files /dev/null and b/plugins/emoji/public/images/apple/rainbow.png differ
diff --git a/plugins/emoji/public/images/apple/raised_hand.png b/plugins/emoji/public/images/apple/raised_hand.png
new file mode 100644
index 0000000000..acdb2fd378
Binary files /dev/null and b/plugins/emoji/public/images/apple/raised_hand.png differ
diff --git a/plugins/emoji/public/images/apple/raised_hands.png b/plugins/emoji/public/images/apple/raised_hands.png
new file mode 100644
index 0000000000..eb9e659e71
Binary files /dev/null and b/plugins/emoji/public/images/apple/raised_hands.png differ
diff --git a/plugins/emoji/public/images/apple/raising_hand.png b/plugins/emoji/public/images/apple/raising_hand.png
new file mode 100644
index 0000000000..8b2d62fb2a
Binary files /dev/null and b/plugins/emoji/public/images/apple/raising_hand.png differ
diff --git a/plugins/emoji/public/images/apple/ram.png b/plugins/emoji/public/images/apple/ram.png
new file mode 100644
index 0000000000..3c63d85a5f
Binary files /dev/null and b/plugins/emoji/public/images/apple/ram.png differ
diff --git a/plugins/emoji/public/images/apple/ramen.png b/plugins/emoji/public/images/apple/ramen.png
new file mode 100644
index 0000000000..76cafae015
Binary files /dev/null and b/plugins/emoji/public/images/apple/ramen.png differ
diff --git a/plugins/emoji/public/images/apple/rat.png b/plugins/emoji/public/images/apple/rat.png
new file mode 100644
index 0000000000..267883ebdc
Binary files /dev/null and b/plugins/emoji/public/images/apple/rat.png differ
diff --git a/plugins/emoji/public/images/apple/recycle.png b/plugins/emoji/public/images/apple/recycle.png
new file mode 100644
index 0000000000..a58af6e26d
Binary files /dev/null and b/plugins/emoji/public/images/apple/recycle.png differ
diff --git a/plugins/emoji/public/images/apple/red_car.png b/plugins/emoji/public/images/apple/red_car.png
new file mode 100644
index 0000000000..0a35f6e5d7
Binary files /dev/null and b/plugins/emoji/public/images/apple/red_car.png differ
diff --git a/plugins/emoji/public/images/apple/red_circle.png b/plugins/emoji/public/images/apple/red_circle.png
new file mode 100644
index 0000000000..2734885bbd
Binary files /dev/null and b/plugins/emoji/public/images/apple/red_circle.png differ
diff --git a/plugins/emoji/public/images/apple/registered.png b/plugins/emoji/public/images/apple/registered.png
new file mode 100644
index 0000000000..961b2b24b3
Binary files /dev/null and b/plugins/emoji/public/images/apple/registered.png differ
diff --git a/plugins/emoji/public/images/apple/relaxed.png b/plugins/emoji/public/images/apple/relaxed.png
new file mode 100644
index 0000000000..ef7aa7e22a
Binary files /dev/null and b/plugins/emoji/public/images/apple/relaxed.png differ
diff --git a/plugins/emoji/public/images/apple/relieved.png b/plugins/emoji/public/images/apple/relieved.png
new file mode 100644
index 0000000000..d97e9e0253
Binary files /dev/null and b/plugins/emoji/public/images/apple/relieved.png differ
diff --git a/plugins/emoji/public/images/apple/repeat.png b/plugins/emoji/public/images/apple/repeat.png
new file mode 100644
index 0000000000..07686580ba
Binary files /dev/null and b/plugins/emoji/public/images/apple/repeat.png differ
diff --git a/plugins/emoji/public/images/apple/repeat_one.png b/plugins/emoji/public/images/apple/repeat_one.png
new file mode 100644
index 0000000000..2fa085cc57
Binary files /dev/null and b/plugins/emoji/public/images/apple/repeat_one.png differ
diff --git a/plugins/emoji/public/images/apple/restroom.png b/plugins/emoji/public/images/apple/restroom.png
new file mode 100644
index 0000000000..2ab7e08692
Binary files /dev/null and b/plugins/emoji/public/images/apple/restroom.png differ
diff --git a/plugins/emoji/public/images/apple/revolving_hearts.png b/plugins/emoji/public/images/apple/revolving_hearts.png
new file mode 100644
index 0000000000..9441aed5a0
Binary files /dev/null and b/plugins/emoji/public/images/apple/revolving_hearts.png differ
diff --git a/plugins/emoji/public/images/apple/rewind.png b/plugins/emoji/public/images/apple/rewind.png
new file mode 100644
index 0000000000..989fa59b23
Binary files /dev/null and b/plugins/emoji/public/images/apple/rewind.png differ
diff --git a/plugins/emoji/public/images/apple/ribbon.png b/plugins/emoji/public/images/apple/ribbon.png
new file mode 100644
index 0000000000..0615ec7d74
Binary files /dev/null and b/plugins/emoji/public/images/apple/ribbon.png differ
diff --git a/plugins/emoji/public/images/apple/rice.png b/plugins/emoji/public/images/apple/rice.png
new file mode 100644
index 0000000000..c8bcbb013a
Binary files /dev/null and b/plugins/emoji/public/images/apple/rice.png differ
diff --git a/plugins/emoji/public/images/apple/rice_ball.png b/plugins/emoji/public/images/apple/rice_ball.png
new file mode 100644
index 0000000000..c6baf5945b
Binary files /dev/null and b/plugins/emoji/public/images/apple/rice_ball.png differ
diff --git a/plugins/emoji/public/images/apple/rice_cracker.png b/plugins/emoji/public/images/apple/rice_cracker.png
new file mode 100644
index 0000000000..5e63687500
Binary files /dev/null and b/plugins/emoji/public/images/apple/rice_cracker.png differ
diff --git a/plugins/emoji/public/images/apple/rice_scene.png b/plugins/emoji/public/images/apple/rice_scene.png
new file mode 100644
index 0000000000..d755cfcf57
Binary files /dev/null and b/plugins/emoji/public/images/apple/rice_scene.png differ
diff --git a/plugins/emoji/public/images/apple/ring.png b/plugins/emoji/public/images/apple/ring.png
new file mode 100644
index 0000000000..3f505e0fd3
Binary files /dev/null and b/plugins/emoji/public/images/apple/ring.png differ
diff --git a/plugins/emoji/public/images/apple/rocket.png b/plugins/emoji/public/images/apple/rocket.png
new file mode 100644
index 0000000000..465bf55a31
Binary files /dev/null and b/plugins/emoji/public/images/apple/rocket.png differ
diff --git a/plugins/emoji/public/images/apple/roller_coaster.png b/plugins/emoji/public/images/apple/roller_coaster.png
new file mode 100644
index 0000000000..9fe50f5578
Binary files /dev/null and b/plugins/emoji/public/images/apple/roller_coaster.png differ
diff --git a/plugins/emoji/public/images/apple/rooster.png b/plugins/emoji/public/images/apple/rooster.png
new file mode 100644
index 0000000000..1d5c734480
Binary files /dev/null and b/plugins/emoji/public/images/apple/rooster.png differ
diff --git a/plugins/emoji/public/images/apple/rose.png b/plugins/emoji/public/images/apple/rose.png
new file mode 100644
index 0000000000..827adec83f
Binary files /dev/null and b/plugins/emoji/public/images/apple/rose.png differ
diff --git a/plugins/emoji/public/images/apple/rotating_light.png b/plugins/emoji/public/images/apple/rotating_light.png
new file mode 100644
index 0000000000..6cb79f57d2
Binary files /dev/null and b/plugins/emoji/public/images/apple/rotating_light.png differ
diff --git a/plugins/emoji/public/images/apple/round_pushpin.png b/plugins/emoji/public/images/apple/round_pushpin.png
new file mode 100644
index 0000000000..07d5cfdf6d
Binary files /dev/null and b/plugins/emoji/public/images/apple/round_pushpin.png differ
diff --git a/plugins/emoji/public/images/apple/rowboat.png b/plugins/emoji/public/images/apple/rowboat.png
new file mode 100644
index 0000000000..f9182401fb
Binary files /dev/null and b/plugins/emoji/public/images/apple/rowboat.png differ
diff --git a/plugins/emoji/public/images/apple/ru.png b/plugins/emoji/public/images/apple/ru.png
new file mode 100644
index 0000000000..32ae0669f9
Binary files /dev/null and b/plugins/emoji/public/images/apple/ru.png differ
diff --git a/plugins/emoji/public/images/apple/rugby_football.png b/plugins/emoji/public/images/apple/rugby_football.png
new file mode 100644
index 0000000000..efee31a3dd
Binary files /dev/null and b/plugins/emoji/public/images/apple/rugby_football.png differ
diff --git a/plugins/emoji/public/images/apple/runner.png b/plugins/emoji/public/images/apple/runner.png
new file mode 100644
index 0000000000..5aa40befed
Binary files /dev/null and b/plugins/emoji/public/images/apple/runner.png differ
diff --git a/plugins/emoji/public/images/apple/running.png b/plugins/emoji/public/images/apple/running.png
new file mode 100644
index 0000000000..5aa40befed
Binary files /dev/null and b/plugins/emoji/public/images/apple/running.png differ
diff --git a/plugins/emoji/public/images/apple/running_shirt_with_sash.png b/plugins/emoji/public/images/apple/running_shirt_with_sash.png
new file mode 100644
index 0000000000..d75e999a0a
Binary files /dev/null and b/plugins/emoji/public/images/apple/running_shirt_with_sash.png differ
diff --git a/plugins/emoji/public/images/apple/sa.png b/plugins/emoji/public/images/apple/sa.png
new file mode 100644
index 0000000000..12748e19c4
Binary files /dev/null and b/plugins/emoji/public/images/apple/sa.png differ
diff --git a/plugins/emoji/public/images/apple/sagittarius.png b/plugins/emoji/public/images/apple/sagittarius.png
new file mode 100644
index 0000000000..d0660139f2
Binary files /dev/null and b/plugins/emoji/public/images/apple/sagittarius.png differ
diff --git a/plugins/emoji/public/images/apple/sailboat.png b/plugins/emoji/public/images/apple/sailboat.png
new file mode 100644
index 0000000000..a175599015
Binary files /dev/null and b/plugins/emoji/public/images/apple/sailboat.png differ
diff --git a/plugins/emoji/public/images/apple/sake.png b/plugins/emoji/public/images/apple/sake.png
new file mode 100644
index 0000000000..162924f6c6
Binary files /dev/null and b/plugins/emoji/public/images/apple/sake.png differ
diff --git a/plugins/emoji/public/images/apple/sandal.png b/plugins/emoji/public/images/apple/sandal.png
new file mode 100644
index 0000000000..5ec65cda60
Binary files /dev/null and b/plugins/emoji/public/images/apple/sandal.png differ
diff --git a/plugins/emoji/public/images/apple/santa.png b/plugins/emoji/public/images/apple/santa.png
new file mode 100644
index 0000000000..9f23fc3f77
Binary files /dev/null and b/plugins/emoji/public/images/apple/santa.png differ
diff --git a/plugins/emoji/public/images/apple/satellite.png b/plugins/emoji/public/images/apple/satellite.png
new file mode 100644
index 0000000000..bc140cdda5
Binary files /dev/null and b/plugins/emoji/public/images/apple/satellite.png differ
diff --git a/plugins/emoji/public/images/apple/satisfied.png b/plugins/emoji/public/images/apple/satisfied.png
new file mode 100644
index 0000000000..85605c7329
Binary files /dev/null and b/plugins/emoji/public/images/apple/satisfied.png differ
diff --git a/plugins/emoji/public/images/apple/saxophone.png b/plugins/emoji/public/images/apple/saxophone.png
new file mode 100644
index 0000000000..4efc3eaf32
Binary files /dev/null and b/plugins/emoji/public/images/apple/saxophone.png differ
diff --git a/plugins/emoji/public/images/apple/school.png b/plugins/emoji/public/images/apple/school.png
new file mode 100644
index 0000000000..df4d599a4e
Binary files /dev/null and b/plugins/emoji/public/images/apple/school.png differ
diff --git a/plugins/emoji/public/images/apple/school_satchel.png b/plugins/emoji/public/images/apple/school_satchel.png
new file mode 100644
index 0000000000..042dc2e9a5
Binary files /dev/null and b/plugins/emoji/public/images/apple/school_satchel.png differ
diff --git a/plugins/emoji/public/images/apple/scissors.png b/plugins/emoji/public/images/apple/scissors.png
new file mode 100644
index 0000000000..5673b36f2a
Binary files /dev/null and b/plugins/emoji/public/images/apple/scissors.png differ
diff --git a/plugins/emoji/public/images/apple/scorpius.png b/plugins/emoji/public/images/apple/scorpius.png
new file mode 100644
index 0000000000..b78c68c93d
Binary files /dev/null and b/plugins/emoji/public/images/apple/scorpius.png differ
diff --git a/plugins/emoji/public/images/apple/scream.png b/plugins/emoji/public/images/apple/scream.png
new file mode 100644
index 0000000000..225b74bd4b
Binary files /dev/null and b/plugins/emoji/public/images/apple/scream.png differ
diff --git a/plugins/emoji/public/images/apple/scream_cat.png b/plugins/emoji/public/images/apple/scream_cat.png
new file mode 100644
index 0000000000..2624d8cc1a
Binary files /dev/null and b/plugins/emoji/public/images/apple/scream_cat.png differ
diff --git a/plugins/emoji/public/images/apple/scroll.png b/plugins/emoji/public/images/apple/scroll.png
new file mode 100644
index 0000000000..24e771bd0c
Binary files /dev/null and b/plugins/emoji/public/images/apple/scroll.png differ
diff --git a/plugins/emoji/public/images/apple/seat.png b/plugins/emoji/public/images/apple/seat.png
new file mode 100644
index 0000000000..f8ddceac4e
Binary files /dev/null and b/plugins/emoji/public/images/apple/seat.png differ
diff --git a/plugins/emoji/public/images/apple/secret.png b/plugins/emoji/public/images/apple/secret.png
new file mode 100644
index 0000000000..309f0e7fad
Binary files /dev/null and b/plugins/emoji/public/images/apple/secret.png differ
diff --git a/plugins/emoji/public/images/apple/see_no_evil.png b/plugins/emoji/public/images/apple/see_no_evil.png
new file mode 100644
index 0000000000..2adaa35e76
Binary files /dev/null and b/plugins/emoji/public/images/apple/see_no_evil.png differ
diff --git a/plugins/emoji/public/images/apple/seedling.png b/plugins/emoji/public/images/apple/seedling.png
new file mode 100644
index 0000000000..a6ca1ab133
Binary files /dev/null and b/plugins/emoji/public/images/apple/seedling.png differ
diff --git a/plugins/emoji/public/images/apple/seven.png b/plugins/emoji/public/images/apple/seven.png
new file mode 100644
index 0000000000..2698a004fc
Binary files /dev/null and b/plugins/emoji/public/images/apple/seven.png differ
diff --git a/plugins/emoji/public/images/apple/shaved_ice.png b/plugins/emoji/public/images/apple/shaved_ice.png
new file mode 100644
index 0000000000..05ada7bacc
Binary files /dev/null and b/plugins/emoji/public/images/apple/shaved_ice.png differ
diff --git a/plugins/emoji/public/images/apple/sheep.png b/plugins/emoji/public/images/apple/sheep.png
new file mode 100644
index 0000000000..e7bc2c5e87
Binary files /dev/null and b/plugins/emoji/public/images/apple/sheep.png differ
diff --git a/plugins/emoji/public/images/apple/shell.png b/plugins/emoji/public/images/apple/shell.png
new file mode 100644
index 0000000000..3efa0986ef
Binary files /dev/null and b/plugins/emoji/public/images/apple/shell.png differ
diff --git a/plugins/emoji/public/images/apple/ship.png b/plugins/emoji/public/images/apple/ship.png
new file mode 100644
index 0000000000..0360442620
Binary files /dev/null and b/plugins/emoji/public/images/apple/ship.png differ
diff --git a/plugins/emoji/public/images/apple/shirt.png b/plugins/emoji/public/images/apple/shirt.png
new file mode 100644
index 0000000000..5ac2001128
Binary files /dev/null and b/plugins/emoji/public/images/apple/shirt.png differ
diff --git a/plugins/emoji/public/images/apple/shit.png b/plugins/emoji/public/images/apple/shit.png
new file mode 100644
index 0000000000..75544655b3
Binary files /dev/null and b/plugins/emoji/public/images/apple/shit.png differ
diff --git a/plugins/emoji/public/images/apple/shoe.png b/plugins/emoji/public/images/apple/shoe.png
new file mode 100644
index 0000000000..710a276ecb
Binary files /dev/null and b/plugins/emoji/public/images/apple/shoe.png differ
diff --git a/plugins/emoji/public/images/apple/shower.png b/plugins/emoji/public/images/apple/shower.png
new file mode 100644
index 0000000000..ad59c4cda6
Binary files /dev/null and b/plugins/emoji/public/images/apple/shower.png differ
diff --git a/plugins/emoji/public/images/apple/signal_strength.png b/plugins/emoji/public/images/apple/signal_strength.png
new file mode 100644
index 0000000000..24eaacd1d3
Binary files /dev/null and b/plugins/emoji/public/images/apple/signal_strength.png differ
diff --git a/plugins/emoji/public/images/apple/six.png b/plugins/emoji/public/images/apple/six.png
new file mode 100644
index 0000000000..c4b910fed9
Binary files /dev/null and b/plugins/emoji/public/images/apple/six.png differ
diff --git a/plugins/emoji/public/images/apple/six_pointed_star.png b/plugins/emoji/public/images/apple/six_pointed_star.png
new file mode 100644
index 0000000000..4fb66f9739
Binary files /dev/null and b/plugins/emoji/public/images/apple/six_pointed_star.png differ
diff --git a/plugins/emoji/public/images/apple/ski.png b/plugins/emoji/public/images/apple/ski.png
new file mode 100644
index 0000000000..0def1408f9
Binary files /dev/null and b/plugins/emoji/public/images/apple/ski.png differ
diff --git a/plugins/emoji/public/images/apple/skull.png b/plugins/emoji/public/images/apple/skull.png
new file mode 100644
index 0000000000..31b683f63c
Binary files /dev/null and b/plugins/emoji/public/images/apple/skull.png differ
diff --git a/plugins/emoji/public/images/apple/sleeping.png b/plugins/emoji/public/images/apple/sleeping.png
new file mode 100644
index 0000000000..d6632941db
Binary files /dev/null and b/plugins/emoji/public/images/apple/sleeping.png differ
diff --git a/plugins/emoji/public/images/apple/sleepy.png b/plugins/emoji/public/images/apple/sleepy.png
new file mode 100644
index 0000000000..167f1ca4b4
Binary files /dev/null and b/plugins/emoji/public/images/apple/sleepy.png differ
diff --git a/plugins/emoji/public/images/apple/slot_machine.png b/plugins/emoji/public/images/apple/slot_machine.png
new file mode 100644
index 0000000000..ea34b6e6a8
Binary files /dev/null and b/plugins/emoji/public/images/apple/slot_machine.png differ
diff --git a/plugins/emoji/public/images/apple/small_blue_diamond.png b/plugins/emoji/public/images/apple/small_blue_diamond.png
new file mode 100644
index 0000000000..13b9265734
Binary files /dev/null and b/plugins/emoji/public/images/apple/small_blue_diamond.png differ
diff --git a/plugins/emoji/public/images/apple/small_orange_diamond.png b/plugins/emoji/public/images/apple/small_orange_diamond.png
new file mode 100644
index 0000000000..289cec5470
Binary files /dev/null and b/plugins/emoji/public/images/apple/small_orange_diamond.png differ
diff --git a/plugins/emoji/public/images/apple/small_red_triangle.png b/plugins/emoji/public/images/apple/small_red_triangle.png
new file mode 100644
index 0000000000..2a89c9c2e7
Binary files /dev/null and b/plugins/emoji/public/images/apple/small_red_triangle.png differ
diff --git a/plugins/emoji/public/images/apple/small_red_triangle_down.png b/plugins/emoji/public/images/apple/small_red_triangle_down.png
new file mode 100644
index 0000000000..28bc487d82
Binary files /dev/null and b/plugins/emoji/public/images/apple/small_red_triangle_down.png differ
diff --git a/plugins/emoji/public/images/apple/smile.png b/plugins/emoji/public/images/apple/smile.png
new file mode 100644
index 0000000000..e7af2c2abf
Binary files /dev/null and b/plugins/emoji/public/images/apple/smile.png differ
diff --git a/plugins/emoji/public/images/apple/smile_cat.png b/plugins/emoji/public/images/apple/smile_cat.png
new file mode 100644
index 0000000000..8193d8560b
Binary files /dev/null and b/plugins/emoji/public/images/apple/smile_cat.png differ
diff --git a/plugins/emoji/public/images/apple/smiley.png b/plugins/emoji/public/images/apple/smiley.png
new file mode 100644
index 0000000000..e532985943
Binary files /dev/null and b/plugins/emoji/public/images/apple/smiley.png differ
diff --git a/plugins/emoji/public/images/apple/smiley_cat.png b/plugins/emoji/public/images/apple/smiley_cat.png
new file mode 100644
index 0000000000..5c8ac75b3b
Binary files /dev/null and b/plugins/emoji/public/images/apple/smiley_cat.png differ
diff --git a/plugins/emoji/public/images/apple/smiling_imp.png b/plugins/emoji/public/images/apple/smiling_imp.png
new file mode 100644
index 0000000000..9cf8066546
Binary files /dev/null and b/plugins/emoji/public/images/apple/smiling_imp.png differ
diff --git a/plugins/emoji/public/images/apple/smirk.png b/plugins/emoji/public/images/apple/smirk.png
new file mode 100644
index 0000000000..94c2a21b69
Binary files /dev/null and b/plugins/emoji/public/images/apple/smirk.png differ
diff --git a/plugins/emoji/public/images/apple/smirk_cat.png b/plugins/emoji/public/images/apple/smirk_cat.png
new file mode 100644
index 0000000000..c648b50acc
Binary files /dev/null and b/plugins/emoji/public/images/apple/smirk_cat.png differ
diff --git a/plugins/emoji/public/images/apple/smoking.png b/plugins/emoji/public/images/apple/smoking.png
new file mode 100644
index 0000000000..cc50b385b5
Binary files /dev/null and b/plugins/emoji/public/images/apple/smoking.png differ
diff --git a/plugins/emoji/public/images/apple/snail.png b/plugins/emoji/public/images/apple/snail.png
new file mode 100644
index 0000000000..cab0e8cdc5
Binary files /dev/null and b/plugins/emoji/public/images/apple/snail.png differ
diff --git a/plugins/emoji/public/images/apple/snake.png b/plugins/emoji/public/images/apple/snake.png
new file mode 100644
index 0000000000..1ecc42bbca
Binary files /dev/null and b/plugins/emoji/public/images/apple/snake.png differ
diff --git a/plugins/emoji/public/images/apple/snowboarder.png b/plugins/emoji/public/images/apple/snowboarder.png
new file mode 100644
index 0000000000..709ad319a4
Binary files /dev/null and b/plugins/emoji/public/images/apple/snowboarder.png differ
diff --git a/plugins/emoji/public/images/apple/snowflake.png b/plugins/emoji/public/images/apple/snowflake.png
new file mode 100644
index 0000000000..116e4c9856
Binary files /dev/null and b/plugins/emoji/public/images/apple/snowflake.png differ
diff --git a/plugins/emoji/public/images/apple/snowman.png b/plugins/emoji/public/images/apple/snowman.png
new file mode 100644
index 0000000000..c08464217d
Binary files /dev/null and b/plugins/emoji/public/images/apple/snowman.png differ
diff --git a/plugins/emoji/public/images/apple/sob.png b/plugins/emoji/public/images/apple/sob.png
new file mode 100644
index 0000000000..6ccdfa9f2d
Binary files /dev/null and b/plugins/emoji/public/images/apple/sob.png differ
diff --git a/plugins/emoji/public/images/apple/soccer.png b/plugins/emoji/public/images/apple/soccer.png
new file mode 100644
index 0000000000..23064dabc5
Binary files /dev/null and b/plugins/emoji/public/images/apple/soccer.png differ
diff --git a/plugins/emoji/public/images/apple/soon.png b/plugins/emoji/public/images/apple/soon.png
new file mode 100644
index 0000000000..803fd845a0
Binary files /dev/null and b/plugins/emoji/public/images/apple/soon.png differ
diff --git a/plugins/emoji/public/images/apple/sos.png b/plugins/emoji/public/images/apple/sos.png
new file mode 100644
index 0000000000..31cd7e49fd
Binary files /dev/null and b/plugins/emoji/public/images/apple/sos.png differ
diff --git a/plugins/emoji/public/images/apple/sound.png b/plugins/emoji/public/images/apple/sound.png
new file mode 100644
index 0000000000..a2bb894f6c
Binary files /dev/null and b/plugins/emoji/public/images/apple/sound.png differ
diff --git a/plugins/emoji/public/images/apple/space_invader.png b/plugins/emoji/public/images/apple/space_invader.png
new file mode 100644
index 0000000000..e212c3ddd8
Binary files /dev/null and b/plugins/emoji/public/images/apple/space_invader.png differ
diff --git a/plugins/emoji/public/images/apple/spades.png b/plugins/emoji/public/images/apple/spades.png
new file mode 100644
index 0000000000..2551e77ee9
Binary files /dev/null and b/plugins/emoji/public/images/apple/spades.png differ
diff --git a/plugins/emoji/public/images/apple/spaghetti.png b/plugins/emoji/public/images/apple/spaghetti.png
new file mode 100644
index 0000000000..be166e778c
Binary files /dev/null and b/plugins/emoji/public/images/apple/spaghetti.png differ
diff --git a/plugins/emoji/public/images/apple/sparkle.png b/plugins/emoji/public/images/apple/sparkle.png
new file mode 100644
index 0000000000..acdeb83b75
Binary files /dev/null and b/plugins/emoji/public/images/apple/sparkle.png differ
diff --git a/plugins/emoji/public/images/apple/sparkler.png b/plugins/emoji/public/images/apple/sparkler.png
new file mode 100644
index 0000000000..6abec8b92a
Binary files /dev/null and b/plugins/emoji/public/images/apple/sparkler.png differ
diff --git a/plugins/emoji/public/images/apple/sparkles.png b/plugins/emoji/public/images/apple/sparkles.png
new file mode 100644
index 0000000000..e86b72a296
Binary files /dev/null and b/plugins/emoji/public/images/apple/sparkles.png differ
diff --git a/plugins/emoji/public/images/apple/sparkling_heart.png b/plugins/emoji/public/images/apple/sparkling_heart.png
new file mode 100644
index 0000000000..1952618fb6
Binary files /dev/null and b/plugins/emoji/public/images/apple/sparkling_heart.png differ
diff --git a/plugins/emoji/public/images/apple/speak_no_evil.png b/plugins/emoji/public/images/apple/speak_no_evil.png
new file mode 100644
index 0000000000..cedb6892ad
Binary files /dev/null and b/plugins/emoji/public/images/apple/speak_no_evil.png differ
diff --git a/plugins/emoji/public/images/apple/speaker.png b/plugins/emoji/public/images/apple/speaker.png
new file mode 100644
index 0000000000..f9dad6af57
Binary files /dev/null and b/plugins/emoji/public/images/apple/speaker.png differ
diff --git a/plugins/emoji/public/images/apple/speech_balloon.png b/plugins/emoji/public/images/apple/speech_balloon.png
new file mode 100644
index 0000000000..39821d58a2
Binary files /dev/null and b/plugins/emoji/public/images/apple/speech_balloon.png differ
diff --git a/plugins/emoji/public/images/apple/speedboat.png b/plugins/emoji/public/images/apple/speedboat.png
new file mode 100644
index 0000000000..9052496512
Binary files /dev/null and b/plugins/emoji/public/images/apple/speedboat.png differ
diff --git a/plugins/emoji/public/images/apple/star.png b/plugins/emoji/public/images/apple/star.png
new file mode 100644
index 0000000000..ddbfb4ca73
Binary files /dev/null and b/plugins/emoji/public/images/apple/star.png differ
diff --git a/plugins/emoji/public/images/apple/star2.png b/plugins/emoji/public/images/apple/star2.png
new file mode 100644
index 0000000000..6d1cb20b26
Binary files /dev/null and b/plugins/emoji/public/images/apple/star2.png differ
diff --git a/plugins/emoji/public/images/apple/stars.png b/plugins/emoji/public/images/apple/stars.png
new file mode 100644
index 0000000000..76da7f3f8a
Binary files /dev/null and b/plugins/emoji/public/images/apple/stars.png differ
diff --git a/plugins/emoji/public/images/apple/station.png b/plugins/emoji/public/images/apple/station.png
new file mode 100644
index 0000000000..3bb66d1b73
Binary files /dev/null and b/plugins/emoji/public/images/apple/station.png differ
diff --git a/plugins/emoji/public/images/apple/statue_of_liberty.png b/plugins/emoji/public/images/apple/statue_of_liberty.png
new file mode 100644
index 0000000000..e96a9d6b39
Binary files /dev/null and b/plugins/emoji/public/images/apple/statue_of_liberty.png differ
diff --git a/plugins/emoji/public/images/apple/steam_locomotive.png b/plugins/emoji/public/images/apple/steam_locomotive.png
new file mode 100644
index 0000000000..8e4f0f54df
Binary files /dev/null and b/plugins/emoji/public/images/apple/steam_locomotive.png differ
diff --git a/plugins/emoji/public/images/apple/stew.png b/plugins/emoji/public/images/apple/stew.png
new file mode 100644
index 0000000000..af7b46f0b6
Binary files /dev/null and b/plugins/emoji/public/images/apple/stew.png differ
diff --git a/plugins/emoji/public/images/apple/straight_ruler.png b/plugins/emoji/public/images/apple/straight_ruler.png
new file mode 100644
index 0000000000..64dbdc3ab0
Binary files /dev/null and b/plugins/emoji/public/images/apple/straight_ruler.png differ
diff --git a/plugins/emoji/public/images/apple/strawberry.png b/plugins/emoji/public/images/apple/strawberry.png
new file mode 100644
index 0000000000..de5570ad2e
Binary files /dev/null and b/plugins/emoji/public/images/apple/strawberry.png differ
diff --git a/plugins/emoji/public/images/apple/stuck_out_tongue.png b/plugins/emoji/public/images/apple/stuck_out_tongue.png
new file mode 100644
index 0000000000..e3dd39e4d2
Binary files /dev/null and b/plugins/emoji/public/images/apple/stuck_out_tongue.png differ
diff --git a/plugins/emoji/public/images/apple/stuck_out_tongue_closed_eyes.png b/plugins/emoji/public/images/apple/stuck_out_tongue_closed_eyes.png
new file mode 100644
index 0000000000..e6267b1840
Binary files /dev/null and b/plugins/emoji/public/images/apple/stuck_out_tongue_closed_eyes.png differ
diff --git a/plugins/emoji/public/images/apple/stuck_out_tongue_winking_eye.png b/plugins/emoji/public/images/apple/stuck_out_tongue_winking_eye.png
new file mode 100644
index 0000000000..ec5f1f85d3
Binary files /dev/null and b/plugins/emoji/public/images/apple/stuck_out_tongue_winking_eye.png differ
diff --git a/plugins/emoji/public/images/apple/sun_with_face.png b/plugins/emoji/public/images/apple/sun_with_face.png
new file mode 100644
index 0000000000..6d651eb137
Binary files /dev/null and b/plugins/emoji/public/images/apple/sun_with_face.png differ
diff --git a/plugins/emoji/public/images/apple/sunflower.png b/plugins/emoji/public/images/apple/sunflower.png
new file mode 100644
index 0000000000..cb9445fd52
Binary files /dev/null and b/plugins/emoji/public/images/apple/sunflower.png differ
diff --git a/plugins/emoji/public/images/apple/sunglasses.png b/plugins/emoji/public/images/apple/sunglasses.png
new file mode 100644
index 0000000000..018e7a9e1b
Binary files /dev/null and b/plugins/emoji/public/images/apple/sunglasses.png differ
diff --git a/plugins/emoji/public/images/apple/sunny.png b/plugins/emoji/public/images/apple/sunny.png
new file mode 100644
index 0000000000..8581935a3f
Binary files /dev/null and b/plugins/emoji/public/images/apple/sunny.png differ
diff --git a/plugins/emoji/public/images/apple/sunrise.png b/plugins/emoji/public/images/apple/sunrise.png
new file mode 100644
index 0000000000..63b1016d83
Binary files /dev/null and b/plugins/emoji/public/images/apple/sunrise.png differ
diff --git a/plugins/emoji/public/images/apple/sunrise_over_mountains.png b/plugins/emoji/public/images/apple/sunrise_over_mountains.png
new file mode 100644
index 0000000000..cf69bee42d
Binary files /dev/null and b/plugins/emoji/public/images/apple/sunrise_over_mountains.png differ
diff --git a/plugins/emoji/public/images/apple/surfer.png b/plugins/emoji/public/images/apple/surfer.png
new file mode 100644
index 0000000000..927666b224
Binary files /dev/null and b/plugins/emoji/public/images/apple/surfer.png differ
diff --git a/plugins/emoji/public/images/apple/sushi.png b/plugins/emoji/public/images/apple/sushi.png
new file mode 100644
index 0000000000..9d9ae82420
Binary files /dev/null and b/plugins/emoji/public/images/apple/sushi.png differ
diff --git a/plugins/emoji/public/images/apple/suspension_railway.png b/plugins/emoji/public/images/apple/suspension_railway.png
new file mode 100644
index 0000000000..d7bcb9efa0
Binary files /dev/null and b/plugins/emoji/public/images/apple/suspension_railway.png differ
diff --git a/plugins/emoji/public/images/apple/sweat.png b/plugins/emoji/public/images/apple/sweat.png
new file mode 100644
index 0000000000..5589e908ce
Binary files /dev/null and b/plugins/emoji/public/images/apple/sweat.png differ
diff --git a/plugins/emoji/public/images/apple/sweat_drops.png b/plugins/emoji/public/images/apple/sweat_drops.png
new file mode 100644
index 0000000000..b828bf7d50
Binary files /dev/null and b/plugins/emoji/public/images/apple/sweat_drops.png differ
diff --git a/plugins/emoji/public/images/apple/sweat_smile.png b/plugins/emoji/public/images/apple/sweat_smile.png
new file mode 100644
index 0000000000..d7fe48fdac
Binary files /dev/null and b/plugins/emoji/public/images/apple/sweat_smile.png differ
diff --git a/plugins/emoji/public/images/apple/sweet_potato.png b/plugins/emoji/public/images/apple/sweet_potato.png
new file mode 100644
index 0000000000..5f74aa2e4f
Binary files /dev/null and b/plugins/emoji/public/images/apple/sweet_potato.png differ
diff --git a/plugins/emoji/public/images/apple/swimmer.png b/plugins/emoji/public/images/apple/swimmer.png
new file mode 100644
index 0000000000..72abc88e92
Binary files /dev/null and b/plugins/emoji/public/images/apple/swimmer.png differ
diff --git a/plugins/emoji/public/images/apple/symbols.png b/plugins/emoji/public/images/apple/symbols.png
new file mode 100644
index 0000000000..4600f5da96
Binary files /dev/null and b/plugins/emoji/public/images/apple/symbols.png differ
diff --git a/plugins/emoji/public/images/apple/syringe.png b/plugins/emoji/public/images/apple/syringe.png
new file mode 100644
index 0000000000..3ebb56b729
Binary files /dev/null and b/plugins/emoji/public/images/apple/syringe.png differ
diff --git a/plugins/emoji/public/images/apple/tada.png b/plugins/emoji/public/images/apple/tada.png
new file mode 100644
index 0000000000..42d11c3019
Binary files /dev/null and b/plugins/emoji/public/images/apple/tada.png differ
diff --git a/plugins/emoji/public/images/apple/tanabata_tree.png b/plugins/emoji/public/images/apple/tanabata_tree.png
new file mode 100644
index 0000000000..d078ed2e98
Binary files /dev/null and b/plugins/emoji/public/images/apple/tanabata_tree.png differ
diff --git a/plugins/emoji/public/images/apple/tangerine.png b/plugins/emoji/public/images/apple/tangerine.png
new file mode 100644
index 0000000000..f14f05f04d
Binary files /dev/null and b/plugins/emoji/public/images/apple/tangerine.png differ
diff --git a/plugins/emoji/public/images/apple/taurus.png b/plugins/emoji/public/images/apple/taurus.png
new file mode 100644
index 0000000000..e2da313988
Binary files /dev/null and b/plugins/emoji/public/images/apple/taurus.png differ
diff --git a/plugins/emoji/public/images/apple/taxi.png b/plugins/emoji/public/images/apple/taxi.png
new file mode 100644
index 0000000000..bb0a4f1ec4
Binary files /dev/null and b/plugins/emoji/public/images/apple/taxi.png differ
diff --git a/plugins/emoji/public/images/apple/tea.png b/plugins/emoji/public/images/apple/tea.png
new file mode 100644
index 0000000000..04ae7c7ab8
Binary files /dev/null and b/plugins/emoji/public/images/apple/tea.png differ
diff --git a/plugins/emoji/public/images/apple/telephone.png b/plugins/emoji/public/images/apple/telephone.png
new file mode 100644
index 0000000000..fb1d51cdbc
Binary files /dev/null and b/plugins/emoji/public/images/apple/telephone.png differ
diff --git a/plugins/emoji/public/images/apple/telephone_receiver.png b/plugins/emoji/public/images/apple/telephone_receiver.png
new file mode 100644
index 0000000000..eb084a0759
Binary files /dev/null and b/plugins/emoji/public/images/apple/telephone_receiver.png differ
diff --git a/plugins/emoji/public/images/apple/telescope.png b/plugins/emoji/public/images/apple/telescope.png
new file mode 100644
index 0000000000..10998259a5
Binary files /dev/null and b/plugins/emoji/public/images/apple/telescope.png differ
diff --git a/plugins/emoji/public/images/apple/tennis.png b/plugins/emoji/public/images/apple/tennis.png
new file mode 100644
index 0000000000..b07a7f4d2f
Binary files /dev/null and b/plugins/emoji/public/images/apple/tennis.png differ
diff --git a/plugins/emoji/public/images/apple/tent.png b/plugins/emoji/public/images/apple/tent.png
new file mode 100644
index 0000000000..c87edc4b40
Binary files /dev/null and b/plugins/emoji/public/images/apple/tent.png differ
diff --git a/plugins/emoji/public/images/apple/thought_balloon.png b/plugins/emoji/public/images/apple/thought_balloon.png
new file mode 100644
index 0000000000..3ddecff684
Binary files /dev/null and b/plugins/emoji/public/images/apple/thought_balloon.png differ
diff --git a/plugins/emoji/public/images/apple/three.png b/plugins/emoji/public/images/apple/three.png
new file mode 100644
index 0000000000..8a381d9ce9
Binary files /dev/null and b/plugins/emoji/public/images/apple/three.png differ
diff --git a/plugins/emoji/public/images/apple/thumbsdown.png b/plugins/emoji/public/images/apple/thumbsdown.png
new file mode 100644
index 0000000000..c7fb4c0649
Binary files /dev/null and b/plugins/emoji/public/images/apple/thumbsdown.png differ
diff --git a/plugins/emoji/public/images/apple/thumbsup.png b/plugins/emoji/public/images/apple/thumbsup.png
new file mode 100644
index 0000000000..e1d89aada6
Binary files /dev/null and b/plugins/emoji/public/images/apple/thumbsup.png differ
diff --git a/plugins/emoji/public/images/apple/ticket.png b/plugins/emoji/public/images/apple/ticket.png
new file mode 100644
index 0000000000..0b4cf7eff1
Binary files /dev/null and b/plugins/emoji/public/images/apple/ticket.png differ
diff --git a/plugins/emoji/public/images/apple/tiger.png b/plugins/emoji/public/images/apple/tiger.png
new file mode 100644
index 0000000000..570abedef5
Binary files /dev/null and b/plugins/emoji/public/images/apple/tiger.png differ
diff --git a/plugins/emoji/public/images/apple/tiger2.png b/plugins/emoji/public/images/apple/tiger2.png
new file mode 100644
index 0000000000..44b3a8c2f5
Binary files /dev/null and b/plugins/emoji/public/images/apple/tiger2.png differ
diff --git a/plugins/emoji/public/images/apple/tired_face.png b/plugins/emoji/public/images/apple/tired_face.png
new file mode 100644
index 0000000000..e8a9bd3412
Binary files /dev/null and b/plugins/emoji/public/images/apple/tired_face.png differ
diff --git a/plugins/emoji/public/images/apple/tm.png b/plugins/emoji/public/images/apple/tm.png
new file mode 100644
index 0000000000..0cc8e8d042
Binary files /dev/null and b/plugins/emoji/public/images/apple/tm.png differ
diff --git a/plugins/emoji/public/images/apple/toilet.png b/plugins/emoji/public/images/apple/toilet.png
new file mode 100644
index 0000000000..0bd6f40bab
Binary files /dev/null and b/plugins/emoji/public/images/apple/toilet.png differ
diff --git a/plugins/emoji/public/images/apple/tokyo_tower.png b/plugins/emoji/public/images/apple/tokyo_tower.png
new file mode 100644
index 0000000000..cbfde4fb01
Binary files /dev/null and b/plugins/emoji/public/images/apple/tokyo_tower.png differ
diff --git a/plugins/emoji/public/images/apple/tomato.png b/plugins/emoji/public/images/apple/tomato.png
new file mode 100644
index 0000000000..9313ca766f
Binary files /dev/null and b/plugins/emoji/public/images/apple/tomato.png differ
diff --git a/plugins/emoji/public/images/apple/tongue.png b/plugins/emoji/public/images/apple/tongue.png
new file mode 100644
index 0000000000..6dfe52b86a
Binary files /dev/null and b/plugins/emoji/public/images/apple/tongue.png differ
diff --git a/plugins/emoji/public/images/apple/top.png b/plugins/emoji/public/images/apple/top.png
new file mode 100644
index 0000000000..ffe47f9530
Binary files /dev/null and b/plugins/emoji/public/images/apple/top.png differ
diff --git a/plugins/emoji/public/images/apple/tophat.png b/plugins/emoji/public/images/apple/tophat.png
new file mode 100644
index 0000000000..4ba7f97e71
Binary files /dev/null and b/plugins/emoji/public/images/apple/tophat.png differ
diff --git a/plugins/emoji/public/images/apple/tractor.png b/plugins/emoji/public/images/apple/tractor.png
new file mode 100644
index 0000000000..b19452aa41
Binary files /dev/null and b/plugins/emoji/public/images/apple/tractor.png differ
diff --git a/plugins/emoji/public/images/apple/traffic_light.png b/plugins/emoji/public/images/apple/traffic_light.png
new file mode 100644
index 0000000000..d8152e2e1e
Binary files /dev/null and b/plugins/emoji/public/images/apple/traffic_light.png differ
diff --git a/plugins/emoji/public/images/apple/train.png b/plugins/emoji/public/images/apple/train.png
new file mode 100644
index 0000000000..58720cf4ff
Binary files /dev/null and b/plugins/emoji/public/images/apple/train.png differ
diff --git a/plugins/emoji/public/images/apple/train2.png b/plugins/emoji/public/images/apple/train2.png
new file mode 100644
index 0000000000..9814da0a9d
Binary files /dev/null and b/plugins/emoji/public/images/apple/train2.png differ
diff --git a/plugins/emoji/public/images/apple/tram.png b/plugins/emoji/public/images/apple/tram.png
new file mode 100644
index 0000000000..17824fd52c
Binary files /dev/null and b/plugins/emoji/public/images/apple/tram.png differ
diff --git a/plugins/emoji/public/images/apple/triangular_flag_on_post.png b/plugins/emoji/public/images/apple/triangular_flag_on_post.png
new file mode 100644
index 0000000000..d938209f4d
Binary files /dev/null and b/plugins/emoji/public/images/apple/triangular_flag_on_post.png differ
diff --git a/plugins/emoji/public/images/apple/triangular_ruler.png b/plugins/emoji/public/images/apple/triangular_ruler.png
new file mode 100644
index 0000000000..502a924b84
Binary files /dev/null and b/plugins/emoji/public/images/apple/triangular_ruler.png differ
diff --git a/plugins/emoji/public/images/apple/trident.png b/plugins/emoji/public/images/apple/trident.png
new file mode 100644
index 0000000000..0d86906324
Binary files /dev/null and b/plugins/emoji/public/images/apple/trident.png differ
diff --git a/plugins/emoji/public/images/apple/triumph.png b/plugins/emoji/public/images/apple/triumph.png
new file mode 100644
index 0000000000..da654216ce
Binary files /dev/null and b/plugins/emoji/public/images/apple/triumph.png differ
diff --git a/plugins/emoji/public/images/apple/trolleybus.png b/plugins/emoji/public/images/apple/trolleybus.png
new file mode 100644
index 0000000000..7a7d20510a
Binary files /dev/null and b/plugins/emoji/public/images/apple/trolleybus.png differ
diff --git a/plugins/emoji/public/images/apple/trophy.png b/plugins/emoji/public/images/apple/trophy.png
new file mode 100644
index 0000000000..e000c64663
Binary files /dev/null and b/plugins/emoji/public/images/apple/trophy.png differ
diff --git a/plugins/emoji/public/images/apple/tropical_drink.png b/plugins/emoji/public/images/apple/tropical_drink.png
new file mode 100644
index 0000000000..108950ed90
Binary files /dev/null and b/plugins/emoji/public/images/apple/tropical_drink.png differ
diff --git a/plugins/emoji/public/images/apple/tropical_fish.png b/plugins/emoji/public/images/apple/tropical_fish.png
new file mode 100644
index 0000000000..d6604096fa
Binary files /dev/null and b/plugins/emoji/public/images/apple/tropical_fish.png differ
diff --git a/plugins/emoji/public/images/apple/truck.png b/plugins/emoji/public/images/apple/truck.png
new file mode 100644
index 0000000000..62aa3a7429
Binary files /dev/null and b/plugins/emoji/public/images/apple/truck.png differ
diff --git a/plugins/emoji/public/images/apple/trumpet.png b/plugins/emoji/public/images/apple/trumpet.png
new file mode 100644
index 0000000000..e623887d8d
Binary files /dev/null and b/plugins/emoji/public/images/apple/trumpet.png differ
diff --git a/plugins/emoji/public/images/apple/tshirt.png b/plugins/emoji/public/images/apple/tshirt.png
new file mode 100644
index 0000000000..5ac2001128
Binary files /dev/null and b/plugins/emoji/public/images/apple/tshirt.png differ
diff --git a/plugins/emoji/public/images/apple/tulip.png b/plugins/emoji/public/images/apple/tulip.png
new file mode 100644
index 0000000000..bc0a77590e
Binary files /dev/null and b/plugins/emoji/public/images/apple/tulip.png differ
diff --git a/plugins/emoji/public/images/apple/turtle.png b/plugins/emoji/public/images/apple/turtle.png
new file mode 100644
index 0000000000..997a19b1bd
Binary files /dev/null and b/plugins/emoji/public/images/apple/turtle.png differ
diff --git a/plugins/emoji/public/images/apple/tv.png b/plugins/emoji/public/images/apple/tv.png
new file mode 100644
index 0000000000..5bb841038b
Binary files /dev/null and b/plugins/emoji/public/images/apple/tv.png differ
diff --git a/plugins/emoji/public/images/apple/twisted_rightwards_arrows.png b/plugins/emoji/public/images/apple/twisted_rightwards_arrows.png
new file mode 100644
index 0000000000..474daa46e5
Binary files /dev/null and b/plugins/emoji/public/images/apple/twisted_rightwards_arrows.png differ
diff --git a/plugins/emoji/public/images/apple/two.png b/plugins/emoji/public/images/apple/two.png
new file mode 100644
index 0000000000..f7f745f927
Binary files /dev/null and b/plugins/emoji/public/images/apple/two.png differ
diff --git a/plugins/emoji/public/images/apple/two_hearts.png b/plugins/emoji/public/images/apple/two_hearts.png
new file mode 100644
index 0000000000..e3d18215c6
Binary files /dev/null and b/plugins/emoji/public/images/apple/two_hearts.png differ
diff --git a/plugins/emoji/public/images/apple/two_men_holding_hands.png b/plugins/emoji/public/images/apple/two_men_holding_hands.png
new file mode 100644
index 0000000000..1fe5d323e1
Binary files /dev/null and b/plugins/emoji/public/images/apple/two_men_holding_hands.png differ
diff --git a/plugins/emoji/public/images/apple/two_women_holding_hands.png b/plugins/emoji/public/images/apple/two_women_holding_hands.png
new file mode 100644
index 0000000000..7fc9f038a5
Binary files /dev/null and b/plugins/emoji/public/images/apple/two_women_holding_hands.png differ
diff --git a/plugins/emoji/public/images/apple/u5272.png b/plugins/emoji/public/images/apple/u5272.png
new file mode 100644
index 0000000000..619b23dad4
Binary files /dev/null and b/plugins/emoji/public/images/apple/u5272.png differ
diff --git a/plugins/emoji/public/images/apple/u5408.png b/plugins/emoji/public/images/apple/u5408.png
new file mode 100644
index 0000000000..2df7ef8496
Binary files /dev/null and b/plugins/emoji/public/images/apple/u5408.png differ
diff --git a/plugins/emoji/public/images/apple/u55b6.png b/plugins/emoji/public/images/apple/u55b6.png
new file mode 100644
index 0000000000..d2f22e4ccf
Binary files /dev/null and b/plugins/emoji/public/images/apple/u55b6.png differ
diff --git a/plugins/emoji/public/images/apple/u6307.png b/plugins/emoji/public/images/apple/u6307.png
new file mode 100644
index 0000000000..acea4049f3
Binary files /dev/null and b/plugins/emoji/public/images/apple/u6307.png differ
diff --git a/plugins/emoji/public/images/apple/u6708.png b/plugins/emoji/public/images/apple/u6708.png
new file mode 100644
index 0000000000..868a0f3d8c
Binary files /dev/null and b/plugins/emoji/public/images/apple/u6708.png differ
diff --git a/plugins/emoji/public/images/apple/u6709.png b/plugins/emoji/public/images/apple/u6709.png
new file mode 100644
index 0000000000..d792be751f
Binary files /dev/null and b/plugins/emoji/public/images/apple/u6709.png differ
diff --git a/plugins/emoji/public/images/apple/u6e80.png b/plugins/emoji/public/images/apple/u6e80.png
new file mode 100644
index 0000000000..afe620cd4b
Binary files /dev/null and b/plugins/emoji/public/images/apple/u6e80.png differ
diff --git a/plugins/emoji/public/images/apple/u7121.png b/plugins/emoji/public/images/apple/u7121.png
new file mode 100644
index 0000000000..5f6eacc455
Binary files /dev/null and b/plugins/emoji/public/images/apple/u7121.png differ
diff --git a/plugins/emoji/public/images/apple/u7533.png b/plugins/emoji/public/images/apple/u7533.png
new file mode 100644
index 0000000000..72d92d7ac5
Binary files /dev/null and b/plugins/emoji/public/images/apple/u7533.png differ
diff --git a/plugins/emoji/public/images/apple/u7981.png b/plugins/emoji/public/images/apple/u7981.png
new file mode 100644
index 0000000000..d4fefcefbf
Binary files /dev/null and b/plugins/emoji/public/images/apple/u7981.png differ
diff --git a/plugins/emoji/public/images/apple/u7a7a.png b/plugins/emoji/public/images/apple/u7a7a.png
new file mode 100644
index 0000000000..f459a49757
Binary files /dev/null and b/plugins/emoji/public/images/apple/u7a7a.png differ
diff --git a/plugins/emoji/public/images/apple/uk.png b/plugins/emoji/public/images/apple/uk.png
new file mode 100644
index 0000000000..15bbcdd2f6
Binary files /dev/null and b/plugins/emoji/public/images/apple/uk.png differ
diff --git a/plugins/emoji/public/images/apple/umbrella.png b/plugins/emoji/public/images/apple/umbrella.png
new file mode 100644
index 0000000000..690e5f20bf
Binary files /dev/null and b/plugins/emoji/public/images/apple/umbrella.png differ
diff --git a/plugins/emoji/public/images/apple/unamused.png b/plugins/emoji/public/images/apple/unamused.png
new file mode 100644
index 0000000000..9d4e1592e4
Binary files /dev/null and b/plugins/emoji/public/images/apple/unamused.png differ
diff --git a/plugins/emoji/public/images/apple/underage.png b/plugins/emoji/public/images/apple/underage.png
new file mode 100644
index 0000000000..79a3bdb4ef
Binary files /dev/null and b/plugins/emoji/public/images/apple/underage.png differ
diff --git a/plugins/emoji/public/images/apple/unlock.png b/plugins/emoji/public/images/apple/unlock.png
new file mode 100644
index 0000000000..c76b2c6985
Binary files /dev/null and b/plugins/emoji/public/images/apple/unlock.png differ
diff --git a/plugins/emoji/public/images/apple/up.png b/plugins/emoji/public/images/apple/up.png
new file mode 100644
index 0000000000..18b903b3b9
Binary files /dev/null and b/plugins/emoji/public/images/apple/up.png differ
diff --git a/plugins/emoji/public/images/apple/us.png b/plugins/emoji/public/images/apple/us.png
new file mode 100644
index 0000000000..442107fdbf
Binary files /dev/null and b/plugins/emoji/public/images/apple/us.png differ
diff --git a/plugins/emoji/public/images/apple/v.png b/plugins/emoji/public/images/apple/v.png
new file mode 100644
index 0000000000..03ce0681a5
Binary files /dev/null and b/plugins/emoji/public/images/apple/v.png differ
diff --git a/plugins/emoji/public/images/apple/vertical_traffic_light.png b/plugins/emoji/public/images/apple/vertical_traffic_light.png
new file mode 100644
index 0000000000..9252606e81
Binary files /dev/null and b/plugins/emoji/public/images/apple/vertical_traffic_light.png differ
diff --git a/plugins/emoji/public/images/apple/vhs.png b/plugins/emoji/public/images/apple/vhs.png
new file mode 100644
index 0000000000..4d3d7b2534
Binary files /dev/null and b/plugins/emoji/public/images/apple/vhs.png differ
diff --git a/plugins/emoji/public/images/apple/vibration_mode.png b/plugins/emoji/public/images/apple/vibration_mode.png
new file mode 100644
index 0000000000..c9966afd49
Binary files /dev/null and b/plugins/emoji/public/images/apple/vibration_mode.png differ
diff --git a/plugins/emoji/public/images/apple/video_camera.png b/plugins/emoji/public/images/apple/video_camera.png
new file mode 100644
index 0000000000..974872c306
Binary files /dev/null and b/plugins/emoji/public/images/apple/video_camera.png differ
diff --git a/plugins/emoji/public/images/apple/video_game.png b/plugins/emoji/public/images/apple/video_game.png
new file mode 100644
index 0000000000..0742cee842
Binary files /dev/null and b/plugins/emoji/public/images/apple/video_game.png differ
diff --git a/plugins/emoji/public/images/apple/violin.png b/plugins/emoji/public/images/apple/violin.png
new file mode 100644
index 0000000000..ef17449c85
Binary files /dev/null and b/plugins/emoji/public/images/apple/violin.png differ
diff --git a/plugins/emoji/public/images/apple/virgo.png b/plugins/emoji/public/images/apple/virgo.png
new file mode 100644
index 0000000000..e1a00855f7
Binary files /dev/null and b/plugins/emoji/public/images/apple/virgo.png differ
diff --git a/plugins/emoji/public/images/apple/volcano.png b/plugins/emoji/public/images/apple/volcano.png
new file mode 100644
index 0000000000..3e59f065a2
Binary files /dev/null and b/plugins/emoji/public/images/apple/volcano.png differ
diff --git a/plugins/emoji/public/images/apple/vs.png b/plugins/emoji/public/images/apple/vs.png
new file mode 100644
index 0000000000..991bc54337
Binary files /dev/null and b/plugins/emoji/public/images/apple/vs.png differ
diff --git a/plugins/emoji/public/images/apple/walking.png b/plugins/emoji/public/images/apple/walking.png
new file mode 100644
index 0000000000..25d9635e3e
Binary files /dev/null and b/plugins/emoji/public/images/apple/walking.png differ
diff --git a/plugins/emoji/public/images/apple/waning_crescent_moon.png b/plugins/emoji/public/images/apple/waning_crescent_moon.png
new file mode 100644
index 0000000000..d6873a6653
Binary files /dev/null and b/plugins/emoji/public/images/apple/waning_crescent_moon.png differ
diff --git a/plugins/emoji/public/images/apple/waning_gibbous_moon.png b/plugins/emoji/public/images/apple/waning_gibbous_moon.png
new file mode 100644
index 0000000000..1ae88a5e92
Binary files /dev/null and b/plugins/emoji/public/images/apple/waning_gibbous_moon.png differ
diff --git a/plugins/emoji/public/images/apple/warning.png b/plugins/emoji/public/images/apple/warning.png
new file mode 100644
index 0000000000..9e51d2b78b
Binary files /dev/null and b/plugins/emoji/public/images/apple/warning.png differ
diff --git a/plugins/emoji/public/images/apple/watch.png b/plugins/emoji/public/images/apple/watch.png
new file mode 100644
index 0000000000..a6097211ef
Binary files /dev/null and b/plugins/emoji/public/images/apple/watch.png differ
diff --git a/plugins/emoji/public/images/apple/water_buffalo.png b/plugins/emoji/public/images/apple/water_buffalo.png
new file mode 100644
index 0000000000..06f523561e
Binary files /dev/null and b/plugins/emoji/public/images/apple/water_buffalo.png differ
diff --git a/plugins/emoji/public/images/apple/watermelon.png b/plugins/emoji/public/images/apple/watermelon.png
new file mode 100644
index 0000000000..3afaaee2d5
Binary files /dev/null and b/plugins/emoji/public/images/apple/watermelon.png differ
diff --git a/plugins/emoji/public/images/apple/wave.png b/plugins/emoji/public/images/apple/wave.png
new file mode 100644
index 0000000000..cb4a618f56
Binary files /dev/null and b/plugins/emoji/public/images/apple/wave.png differ
diff --git a/plugins/emoji/public/images/apple/wavy_dash.png b/plugins/emoji/public/images/apple/wavy_dash.png
new file mode 100644
index 0000000000..fb4b9e96c8
Binary files /dev/null and b/plugins/emoji/public/images/apple/wavy_dash.png differ
diff --git a/plugins/emoji/public/images/apple/waxing_crescent_moon.png b/plugins/emoji/public/images/apple/waxing_crescent_moon.png
new file mode 100644
index 0000000000..11c43fba42
Binary files /dev/null and b/plugins/emoji/public/images/apple/waxing_crescent_moon.png differ
diff --git a/plugins/emoji/public/images/apple/waxing_gibbous_moon.png b/plugins/emoji/public/images/apple/waxing_gibbous_moon.png
new file mode 100644
index 0000000000..03e9b3daba
Binary files /dev/null and b/plugins/emoji/public/images/apple/waxing_gibbous_moon.png differ
diff --git a/plugins/emoji/public/images/apple/wc.png b/plugins/emoji/public/images/apple/wc.png
new file mode 100644
index 0000000000..8ddf680c1d
Binary files /dev/null and b/plugins/emoji/public/images/apple/wc.png differ
diff --git a/plugins/emoji/public/images/apple/weary.png b/plugins/emoji/public/images/apple/weary.png
new file mode 100644
index 0000000000..8a189ccf04
Binary files /dev/null and b/plugins/emoji/public/images/apple/weary.png differ
diff --git a/plugins/emoji/public/images/apple/wedding.png b/plugins/emoji/public/images/apple/wedding.png
new file mode 100644
index 0000000000..b104a68c34
Binary files /dev/null and b/plugins/emoji/public/images/apple/wedding.png differ
diff --git a/plugins/emoji/public/images/apple/whale.png b/plugins/emoji/public/images/apple/whale.png
new file mode 100644
index 0000000000..45ed0a7705
Binary files /dev/null and b/plugins/emoji/public/images/apple/whale.png differ
diff --git a/plugins/emoji/public/images/apple/whale2.png b/plugins/emoji/public/images/apple/whale2.png
new file mode 100644
index 0000000000..b25d44c209
Binary files /dev/null and b/plugins/emoji/public/images/apple/whale2.png differ
diff --git a/plugins/emoji/public/images/apple/wheelchair.png b/plugins/emoji/public/images/apple/wheelchair.png
new file mode 100644
index 0000000000..4091fd2747
Binary files /dev/null and b/plugins/emoji/public/images/apple/wheelchair.png differ
diff --git a/plugins/emoji/public/images/apple/white_check_mark.png b/plugins/emoji/public/images/apple/white_check_mark.png
new file mode 100644
index 0000000000..420b9b8e1c
Binary files /dev/null and b/plugins/emoji/public/images/apple/white_check_mark.png differ
diff --git a/plugins/emoji/public/images/apple/white_circle.png b/plugins/emoji/public/images/apple/white_circle.png
new file mode 100644
index 0000000000..ac1a3908e3
Binary files /dev/null and b/plugins/emoji/public/images/apple/white_circle.png differ
diff --git a/plugins/emoji/public/images/apple/white_flower.png b/plugins/emoji/public/images/apple/white_flower.png
new file mode 100644
index 0000000000..0687f0835e
Binary files /dev/null and b/plugins/emoji/public/images/apple/white_flower.png differ
diff --git a/plugins/emoji/public/images/apple/white_large_square.png b/plugins/emoji/public/images/apple/white_large_square.png
new file mode 100644
index 0000000000..c9b6916a28
Binary files /dev/null and b/plugins/emoji/public/images/apple/white_large_square.png differ
diff --git a/plugins/emoji/public/images/apple/white_medium_small_square.png b/plugins/emoji/public/images/apple/white_medium_small_square.png
new file mode 100644
index 0000000000..ce959faecd
Binary files /dev/null and b/plugins/emoji/public/images/apple/white_medium_small_square.png differ
diff --git a/plugins/emoji/public/images/apple/white_medium_square.png b/plugins/emoji/public/images/apple/white_medium_square.png
new file mode 100644
index 0000000000..11d576bd99
Binary files /dev/null and b/plugins/emoji/public/images/apple/white_medium_square.png differ
diff --git a/plugins/emoji/public/images/apple/white_small_square.png b/plugins/emoji/public/images/apple/white_small_square.png
new file mode 100644
index 0000000000..8f5b2fb366
Binary files /dev/null and b/plugins/emoji/public/images/apple/white_small_square.png differ
diff --git a/plugins/emoji/public/images/apple/white_square_button.png b/plugins/emoji/public/images/apple/white_square_button.png
new file mode 100644
index 0000000000..3500c14be4
Binary files /dev/null and b/plugins/emoji/public/images/apple/white_square_button.png differ
diff --git a/plugins/emoji/public/images/apple/wind_chime.png b/plugins/emoji/public/images/apple/wind_chime.png
new file mode 100644
index 0000000000..856f00ed0d
Binary files /dev/null and b/plugins/emoji/public/images/apple/wind_chime.png differ
diff --git a/plugins/emoji/public/images/apple/wine_glass.png b/plugins/emoji/public/images/apple/wine_glass.png
new file mode 100644
index 0000000000..1b890898bd
Binary files /dev/null and b/plugins/emoji/public/images/apple/wine_glass.png differ
diff --git a/plugins/emoji/public/images/apple/wink.png b/plugins/emoji/public/images/apple/wink.png
new file mode 100644
index 0000000000..cb3e0a85c4
Binary files /dev/null and b/plugins/emoji/public/images/apple/wink.png differ
diff --git a/plugins/emoji/public/images/apple/wolf.png b/plugins/emoji/public/images/apple/wolf.png
new file mode 100644
index 0000000000..09a7a7f85d
Binary files /dev/null and b/plugins/emoji/public/images/apple/wolf.png differ
diff --git a/plugins/emoji/public/images/apple/woman.png b/plugins/emoji/public/images/apple/woman.png
new file mode 100644
index 0000000000..5bc0ddc717
Binary files /dev/null and b/plugins/emoji/public/images/apple/woman.png differ
diff --git a/plugins/emoji/public/images/apple/womans_clothes.png b/plugins/emoji/public/images/apple/womans_clothes.png
new file mode 100644
index 0000000000..5ec1fad0ca
Binary files /dev/null and b/plugins/emoji/public/images/apple/womans_clothes.png differ
diff --git a/plugins/emoji/public/images/apple/womans_hat.png b/plugins/emoji/public/images/apple/womans_hat.png
new file mode 100644
index 0000000000..f5a1e8f747
Binary files /dev/null and b/plugins/emoji/public/images/apple/womans_hat.png differ
diff --git a/plugins/emoji/public/images/apple/womens.png b/plugins/emoji/public/images/apple/womens.png
new file mode 100644
index 0000000000..eba510785c
Binary files /dev/null and b/plugins/emoji/public/images/apple/womens.png differ
diff --git a/plugins/emoji/public/images/apple/worried.png b/plugins/emoji/public/images/apple/worried.png
new file mode 100644
index 0000000000..c242dfd7eb
Binary files /dev/null and b/plugins/emoji/public/images/apple/worried.png differ
diff --git a/plugins/emoji/public/images/apple/wrench.png b/plugins/emoji/public/images/apple/wrench.png
new file mode 100644
index 0000000000..838d39f32d
Binary files /dev/null and b/plugins/emoji/public/images/apple/wrench.png differ
diff --git a/plugins/emoji/public/images/apple/x.png b/plugins/emoji/public/images/apple/x.png
new file mode 100644
index 0000000000..d2ce369ed5
Binary files /dev/null and b/plugins/emoji/public/images/apple/x.png differ
diff --git a/plugins/emoji/public/images/apple/yellow_heart.png b/plugins/emoji/public/images/apple/yellow_heart.png
new file mode 100644
index 0000000000..ed7f153cd7
Binary files /dev/null and b/plugins/emoji/public/images/apple/yellow_heart.png differ
diff --git a/plugins/emoji/public/images/apple/yen.png b/plugins/emoji/public/images/apple/yen.png
new file mode 100644
index 0000000000..c695a78ecd
Binary files /dev/null and b/plugins/emoji/public/images/apple/yen.png differ
diff --git a/plugins/emoji/public/images/apple/yum.png b/plugins/emoji/public/images/apple/yum.png
new file mode 100644
index 0000000000..eca503caec
Binary files /dev/null and b/plugins/emoji/public/images/apple/yum.png differ
diff --git a/plugins/emoji/public/images/apple/zap.png b/plugins/emoji/public/images/apple/zap.png
new file mode 100644
index 0000000000..09bdfdec19
Binary files /dev/null and b/plugins/emoji/public/images/apple/zap.png differ
diff --git a/plugins/emoji/public/images/apple/zero.png b/plugins/emoji/public/images/apple/zero.png
new file mode 100644
index 0000000000..3b0a620bf6
Binary files /dev/null and b/plugins/emoji/public/images/apple/zero.png differ
diff --git a/plugins/emoji/public/images/apple/zzz.png b/plugins/emoji/public/images/apple/zzz.png
new file mode 100644
index 0000000000..9e9d08a65c
Binary files /dev/null and b/plugins/emoji/public/images/apple/zzz.png differ
diff --git a/plugins/emoji/public/images/aquarius.png b/plugins/emoji/public/images/aquarius.png
deleted file mode 120000
index b6d30383d0..0000000000
--- a/plugins/emoji/public/images/aquarius.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2652.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/aries.png b/plugins/emoji/public/images/aries.png
deleted file mode 120000
index ca868c7f6b..0000000000
--- a/plugins/emoji/public/images/aries.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2648.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_backward.png b/plugins/emoji/public/images/arrow_backward.png
deleted file mode 120000
index 5c0c90da3e..0000000000
--- a/plugins/emoji/public/images/arrow_backward.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/25c0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_double_down.png b/plugins/emoji/public/images/arrow_double_down.png
deleted file mode 120000
index 548e425074..0000000000
--- a/plugins/emoji/public/images/arrow_double_down.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/23ec.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_double_up.png b/plugins/emoji/public/images/arrow_double_up.png
deleted file mode 120000
index 0c01270502..0000000000
--- a/plugins/emoji/public/images/arrow_double_up.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/23eb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_down.png b/plugins/emoji/public/images/arrow_down.png
deleted file mode 120000
index 566f72c231..0000000000
--- a/plugins/emoji/public/images/arrow_down.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2b07.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_down_small.png b/plugins/emoji/public/images/arrow_down_small.png
deleted file mode 120000
index 8431dfccce..0000000000
--- a/plugins/emoji/public/images/arrow_down_small.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f53d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_forward.png b/plugins/emoji/public/images/arrow_forward.png
deleted file mode 120000
index 7ffbaf72b4..0000000000
--- a/plugins/emoji/public/images/arrow_forward.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/25b6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_heading_down.png b/plugins/emoji/public/images/arrow_heading_down.png
deleted file mode 120000
index 934028fe2e..0000000000
--- a/plugins/emoji/public/images/arrow_heading_down.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2935.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_heading_up.png b/plugins/emoji/public/images/arrow_heading_up.png
deleted file mode 120000
index 25bfe6ac52..0000000000
--- a/plugins/emoji/public/images/arrow_heading_up.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2934.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_left.png b/plugins/emoji/public/images/arrow_left.png
deleted file mode 120000
index 3f947d0eaa..0000000000
--- a/plugins/emoji/public/images/arrow_left.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2b05.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_lower_left.png b/plugins/emoji/public/images/arrow_lower_left.png
deleted file mode 120000
index 62db4d3725..0000000000
--- a/plugins/emoji/public/images/arrow_lower_left.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2199.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_lower_right.png b/plugins/emoji/public/images/arrow_lower_right.png
deleted file mode 120000
index c3748cf7c0..0000000000
--- a/plugins/emoji/public/images/arrow_lower_right.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2198.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_right.png b/plugins/emoji/public/images/arrow_right.png
deleted file mode 120000
index 2f9b2c7f53..0000000000
--- a/plugins/emoji/public/images/arrow_right.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/27a1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_right_hook.png b/plugins/emoji/public/images/arrow_right_hook.png
deleted file mode 120000
index 5a3039cee5..0000000000
--- a/plugins/emoji/public/images/arrow_right_hook.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/21aa.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_up.png b/plugins/emoji/public/images/arrow_up.png
deleted file mode 120000
index 90f1430340..0000000000
--- a/plugins/emoji/public/images/arrow_up.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2b06.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_up_down.png b/plugins/emoji/public/images/arrow_up_down.png
deleted file mode 120000
index 5e0689401e..0000000000
--- a/plugins/emoji/public/images/arrow_up_down.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2195.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_up_small.png b/plugins/emoji/public/images/arrow_up_small.png
deleted file mode 120000
index 9973a430b7..0000000000
--- a/plugins/emoji/public/images/arrow_up_small.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f53c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_upper_left.png b/plugins/emoji/public/images/arrow_upper_left.png
deleted file mode 120000
index 9b8c763fa9..0000000000
--- a/plugins/emoji/public/images/arrow_upper_left.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2196.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrow_upper_right.png b/plugins/emoji/public/images/arrow_upper_right.png
deleted file mode 120000
index ed0e48635f..0000000000
--- a/plugins/emoji/public/images/arrow_upper_right.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2197.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrows_clockwise.png b/plugins/emoji/public/images/arrows_clockwise.png
deleted file mode 120000
index ba9d84f4ab..0000000000
--- a/plugins/emoji/public/images/arrows_clockwise.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f503.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/arrows_counterclockwise.png b/plugins/emoji/public/images/arrows_counterclockwise.png
deleted file mode 120000
index 6ed37bd08a..0000000000
--- a/plugins/emoji/public/images/arrows_counterclockwise.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f504.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/art.png b/plugins/emoji/public/images/art.png
deleted file mode 120000
index 62f5e4c552..0000000000
--- a/plugins/emoji/public/images/art.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/articulated_lorry.png b/plugins/emoji/public/images/articulated_lorry.png
deleted file mode 120000
index eb1bd5e5e2..0000000000
--- a/plugins/emoji/public/images/articulated_lorry.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f69b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/astonished.png b/plugins/emoji/public/images/astonished.png
deleted file mode 120000
index 1c45fdbbf6..0000000000
--- a/plugins/emoji/public/images/astonished.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f632.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/athletic_shoe.png b/plugins/emoji/public/images/athletic_shoe.png
deleted file mode 120000
index e103445666..0000000000
--- a/plugins/emoji/public/images/athletic_shoe.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f45f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/atm.png b/plugins/emoji/public/images/atm.png
deleted file mode 120000
index c9e7d78798..0000000000
--- a/plugins/emoji/public/images/atm.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/b.png b/plugins/emoji/public/images/b.png
deleted file mode 120000
index bd6f45b31b..0000000000
--- a/plugins/emoji/public/images/b.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f171.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/baby.png b/plugins/emoji/public/images/baby.png
deleted file mode 120000
index 34b50d27bd..0000000000
--- a/plugins/emoji/public/images/baby.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f476.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/baby_bottle.png b/plugins/emoji/public/images/baby_bottle.png
deleted file mode 120000
index 45ebf95c95..0000000000
--- a/plugins/emoji/public/images/baby_bottle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f37c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/baby_chick.png b/plugins/emoji/public/images/baby_chick.png
deleted file mode 120000
index a2afe9925c..0000000000
--- a/plugins/emoji/public/images/baby_chick.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f424.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/baby_symbol.png b/plugins/emoji/public/images/baby_symbol.png
deleted file mode 120000
index 442059ce4b..0000000000
--- a/plugins/emoji/public/images/baby_symbol.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6bc.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/back.png b/plugins/emoji/public/images/back.png
deleted file mode 120000
index 13583ebef8..0000000000
--- a/plugins/emoji/public/images/back.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f519.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/baggage_claim.png b/plugins/emoji/public/images/baggage_claim.png
deleted file mode 120000
index f658d3a6bd..0000000000
--- a/plugins/emoji/public/images/baggage_claim.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6c4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/balloon.png b/plugins/emoji/public/images/balloon.png
deleted file mode 120000
index eb086d96eb..0000000000
--- a/plugins/emoji/public/images/balloon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f388.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ballot_box_with_check.png b/plugins/emoji/public/images/ballot_box_with_check.png
deleted file mode 120000
index b695327b84..0000000000
--- a/plugins/emoji/public/images/ballot_box_with_check.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2611.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bamboo.png b/plugins/emoji/public/images/bamboo.png
deleted file mode 120000
index e53a4c8e9c..0000000000
--- a/plugins/emoji/public/images/bamboo.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f38d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/banana.png b/plugins/emoji/public/images/banana.png
deleted file mode 120000
index b68fc18b1d..0000000000
--- a/plugins/emoji/public/images/banana.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f34c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bangbang.png b/plugins/emoji/public/images/bangbang.png
deleted file mode 120000
index 12fbcfcbbb..0000000000
--- a/plugins/emoji/public/images/bangbang.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/203c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bank.png b/plugins/emoji/public/images/bank.png
deleted file mode 120000
index 1574a3738f..0000000000
--- a/plugins/emoji/public/images/bank.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bar_chart.png b/plugins/emoji/public/images/bar_chart.png
deleted file mode 120000
index 9df86b6e17..0000000000
--- a/plugins/emoji/public/images/bar_chart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ca.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/barber.png b/plugins/emoji/public/images/barber.png
deleted file mode 120000
index 8260a72117..0000000000
--- a/plugins/emoji/public/images/barber.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f488.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/baseball.png b/plugins/emoji/public/images/baseball.png
deleted file mode 120000
index e47b7da5cd..0000000000
--- a/plugins/emoji/public/images/baseball.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26be.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/basketball.png b/plugins/emoji/public/images/basketball.png
deleted file mode 120000
index 99d5593d69..0000000000
--- a/plugins/emoji/public/images/basketball.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bath.png b/plugins/emoji/public/images/bath.png
deleted file mode 120000
index 72f5438818..0000000000
--- a/plugins/emoji/public/images/bath.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6c0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bathtub.png b/plugins/emoji/public/images/bathtub.png
deleted file mode 120000
index c1e9bd9eb6..0000000000
--- a/plugins/emoji/public/images/bathtub.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6c1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/battery.png b/plugins/emoji/public/images/battery.png
deleted file mode 120000
index afbf9d7db6..0000000000
--- a/plugins/emoji/public/images/battery.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f50b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bear.png b/plugins/emoji/public/images/bear.png
deleted file mode 120000
index f9f1439619..0000000000
--- a/plugins/emoji/public/images/bear.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f43b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bee.png b/plugins/emoji/public/images/bee.png
deleted file mode 120000
index d1768eca5e..0000000000
--- a/plugins/emoji/public/images/bee.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f41d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/beer.png b/plugins/emoji/public/images/beer.png
deleted file mode 120000
index 86d1ba6587..0000000000
--- a/plugins/emoji/public/images/beer.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f37a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/beers.png b/plugins/emoji/public/images/beers.png
deleted file mode 120000
index 8f22041721..0000000000
--- a/plugins/emoji/public/images/beers.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f37b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/beetle.png b/plugins/emoji/public/images/beetle.png
deleted file mode 120000
index 3ef684fcd7..0000000000
--- a/plugins/emoji/public/images/beetle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f41e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/beginner.png b/plugins/emoji/public/images/beginner.png
deleted file mode 120000
index 8fc7324d8d..0000000000
--- a/plugins/emoji/public/images/beginner.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f530.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bell.png b/plugins/emoji/public/images/bell.png
deleted file mode 120000
index b85a2240a2..0000000000
--- a/plugins/emoji/public/images/bell.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f514.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bento.png b/plugins/emoji/public/images/bento.png
deleted file mode 120000
index 24ca0a3ffe..0000000000
--- a/plugins/emoji/public/images/bento.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f371.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bicyclist.png b/plugins/emoji/public/images/bicyclist.png
deleted file mode 120000
index 8481c53663..0000000000
--- a/plugins/emoji/public/images/bicyclist.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bike.png b/plugins/emoji/public/images/bike.png
deleted file mode 120000
index a92aa799f7..0000000000
--- a/plugins/emoji/public/images/bike.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bikini.png b/plugins/emoji/public/images/bikini.png
deleted file mode 120000
index 708f6ef1c2..0000000000
--- a/plugins/emoji/public/images/bikini.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f459.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bird.png b/plugins/emoji/public/images/bird.png
deleted file mode 120000
index 2d659832a2..0000000000
--- a/plugins/emoji/public/images/bird.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f426.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/birthday.png b/plugins/emoji/public/images/birthday.png
deleted file mode 120000
index a1a0285283..0000000000
--- a/plugins/emoji/public/images/birthday.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f382.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/black_circle.png b/plugins/emoji/public/images/black_circle.png
deleted file mode 120000
index 99487ce5c1..0000000000
--- a/plugins/emoji/public/images/black_circle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26ab.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/black_joker.png b/plugins/emoji/public/images/black_joker.png
deleted file mode 120000
index f9ece1e8be..0000000000
--- a/plugins/emoji/public/images/black_joker.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f0cf.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/black_large_square.png b/plugins/emoji/public/images/black_large_square.png
deleted file mode 120000
index f753b44cf8..0000000000
--- a/plugins/emoji/public/images/black_large_square.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2b1b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/black_medium_small_square.png b/plugins/emoji/public/images/black_medium_small_square.png
deleted file mode 120000
index bda52623de..0000000000
--- a/plugins/emoji/public/images/black_medium_small_square.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/25fe.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/black_medium_square.png b/plugins/emoji/public/images/black_medium_square.png
deleted file mode 120000
index a33419a644..0000000000
--- a/plugins/emoji/public/images/black_medium_square.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/25fc.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/black_nib.png b/plugins/emoji/public/images/black_nib.png
deleted file mode 120000
index 7f1b374781..0000000000
--- a/plugins/emoji/public/images/black_nib.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2712.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/black_small_square.png b/plugins/emoji/public/images/black_small_square.png
deleted file mode 120000
index fb7e6b2755..0000000000
--- a/plugins/emoji/public/images/black_small_square.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/25aa.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/black_square_button.png b/plugins/emoji/public/images/black_square_button.png
deleted file mode 120000
index 025e098abc..0000000000
--- a/plugins/emoji/public/images/black_square_button.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f532.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/blossom.png b/plugins/emoji/public/images/blossom.png
deleted file mode 120000
index f96cde049b..0000000000
--- a/plugins/emoji/public/images/blossom.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f33c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/blowfish.png b/plugins/emoji/public/images/blowfish.png
deleted file mode 120000
index a346e5d1e3..0000000000
--- a/plugins/emoji/public/images/blowfish.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f421.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/blue_book.png b/plugins/emoji/public/images/blue_book.png
deleted file mode 120000
index 26b023c7a9..0000000000
--- a/plugins/emoji/public/images/blue_book.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/blue_car.png b/plugins/emoji/public/images/blue_car.png
deleted file mode 120000
index 013ad21b8d..0000000000
--- a/plugins/emoji/public/images/blue_car.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f699.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/blue_heart.png b/plugins/emoji/public/images/blue_heart.png
deleted file mode 120000
index 8e50cba222..0000000000
--- a/plugins/emoji/public/images/blue_heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f499.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/blush.png b/plugins/emoji/public/images/blush.png
deleted file mode 120000
index 7b2737082c..0000000000
--- a/plugins/emoji/public/images/blush.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f60a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/boar.png b/plugins/emoji/public/images/boar.png
deleted file mode 120000
index 45605fa493..0000000000
--- a/plugins/emoji/public/images/boar.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f417.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/boat.png b/plugins/emoji/public/images/boat.png
deleted file mode 120000
index e134ebd6c2..0000000000
--- a/plugins/emoji/public/images/boat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26f5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bomb.png b/plugins/emoji/public/images/bomb.png
deleted file mode 120000
index 6535f3b54d..0000000000
--- a/plugins/emoji/public/images/bomb.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/book.png b/plugins/emoji/public/images/book.png
deleted file mode 120000
index c95e97943c..0000000000
--- a/plugins/emoji/public/images/book.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bookmark.png b/plugins/emoji/public/images/bookmark.png
deleted file mode 120000
index ed7288f4f2..0000000000
--- a/plugins/emoji/public/images/bookmark.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f516.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bookmark_tabs.png b/plugins/emoji/public/images/bookmark_tabs.png
deleted file mode 120000
index 9dbad631b4..0000000000
--- a/plugins/emoji/public/images/bookmark_tabs.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/books.png b/plugins/emoji/public/images/books.png
deleted file mode 120000
index d023c04422..0000000000
--- a/plugins/emoji/public/images/books.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4da.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/boom.png b/plugins/emoji/public/images/boom.png
deleted file mode 120000
index ac298e5b3a..0000000000
--- a/plugins/emoji/public/images/boom.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/boot.png b/plugins/emoji/public/images/boot.png
deleted file mode 120000
index c14905a0a9..0000000000
--- a/plugins/emoji/public/images/boot.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f462.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bouquet.png b/plugins/emoji/public/images/bouquet.png
deleted file mode 120000
index 2410596498..0000000000
--- a/plugins/emoji/public/images/bouquet.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f490.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bow.png b/plugins/emoji/public/images/bow.png
deleted file mode 120000
index 6a866fedad..0000000000
--- a/plugins/emoji/public/images/bow.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f647.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bowling.png b/plugins/emoji/public/images/bowling.png
deleted file mode 120000
index 1d1b3f320e..0000000000
--- a/plugins/emoji/public/images/bowling.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bowtie.png b/plugins/emoji/public/images/bowtie.png
deleted file mode 100755
index 28ff0c787d..0000000000
Binary files a/plugins/emoji/public/images/bowtie.png and /dev/null differ
diff --git a/plugins/emoji/public/images/boy.png b/plugins/emoji/public/images/boy.png
deleted file mode 120000
index 9594fe6e2c..0000000000
--- a/plugins/emoji/public/images/boy.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f466.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bread.png b/plugins/emoji/public/images/bread.png
deleted file mode 120000
index 5a0410d697..0000000000
--- a/plugins/emoji/public/images/bread.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f35e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bride_with_veil.png b/plugins/emoji/public/images/bride_with_veil.png
deleted file mode 120000
index 92f4fb37a7..0000000000
--- a/plugins/emoji/public/images/bride_with_veil.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f470.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bridge_at_night.png b/plugins/emoji/public/images/bridge_at_night.png
deleted file mode 120000
index fb57a388b1..0000000000
--- a/plugins/emoji/public/images/bridge_at_night.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f309.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/briefcase.png b/plugins/emoji/public/images/briefcase.png
deleted file mode 120000
index e8007a5a6e..0000000000
--- a/plugins/emoji/public/images/briefcase.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4bc.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/broken_heart.png b/plugins/emoji/public/images/broken_heart.png
deleted file mode 120000
index 518b1ed883..0000000000
--- a/plugins/emoji/public/images/broken_heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f494.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bug.png b/plugins/emoji/public/images/bug.png
deleted file mode 120000
index b95dc8634b..0000000000
--- a/plugins/emoji/public/images/bug.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f41b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bulb.png b/plugins/emoji/public/images/bulb.png
deleted file mode 120000
index 27a2776a85..0000000000
--- a/plugins/emoji/public/images/bulb.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bullettrain_front.png b/plugins/emoji/public/images/bullettrain_front.png
deleted file mode 120000
index 76e8377162..0000000000
--- a/plugins/emoji/public/images/bullettrain_front.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f685.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bullettrain_side.png b/plugins/emoji/public/images/bullettrain_side.png
deleted file mode 120000
index 137e01f202..0000000000
--- a/plugins/emoji/public/images/bullettrain_side.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f684.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bus.png b/plugins/emoji/public/images/bus.png
deleted file mode 120000
index 72eb3b16f9..0000000000
--- a/plugins/emoji/public/images/bus.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f68c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/busstop.png b/plugins/emoji/public/images/busstop.png
deleted file mode 120000
index 3804faaa77..0000000000
--- a/plugins/emoji/public/images/busstop.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f68f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/bust_in_silhouette.png b/plugins/emoji/public/images/bust_in_silhouette.png
deleted file mode 120000
index 9d9bf34cd9..0000000000
--- a/plugins/emoji/public/images/bust_in_silhouette.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f464.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/busts_in_silhouette.png b/plugins/emoji/public/images/busts_in_silhouette.png
deleted file mode 120000
index b36b340fe0..0000000000
--- a/plugins/emoji/public/images/busts_in_silhouette.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f465.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cactus.png b/plugins/emoji/public/images/cactus.png
deleted file mode 120000
index 97cf52b0ec..0000000000
--- a/plugins/emoji/public/images/cactus.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f335.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cake.png b/plugins/emoji/public/images/cake.png
deleted file mode 120000
index 88b7b6c20c..0000000000
--- a/plugins/emoji/public/images/cake.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f370.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/calendar.png b/plugins/emoji/public/images/calendar.png
deleted file mode 120000
index fa75c5cd71..0000000000
--- a/plugins/emoji/public/images/calendar.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/calling.png b/plugins/emoji/public/images/calling.png
deleted file mode 120000
index 2db7f57407..0000000000
--- a/plugins/emoji/public/images/calling.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4f2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/camel.png b/plugins/emoji/public/images/camel.png
deleted file mode 120000
index 6a908a3fb9..0000000000
--- a/plugins/emoji/public/images/camel.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f42b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/camera.png b/plugins/emoji/public/images/camera.png
deleted file mode 120000
index 722dfbb179..0000000000
--- a/plugins/emoji/public/images/camera.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4f7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cancer.png b/plugins/emoji/public/images/cancer.png
deleted file mode 120000
index 1c028f4c70..0000000000
--- a/plugins/emoji/public/images/cancer.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/264b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/candy.png b/plugins/emoji/public/images/candy.png
deleted file mode 120000
index d2db024ebb..0000000000
--- a/plugins/emoji/public/images/candy.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f36c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/capital_abcd.png b/plugins/emoji/public/images/capital_abcd.png
deleted file mode 120000
index 2df445b130..0000000000
--- a/plugins/emoji/public/images/capital_abcd.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f520.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/capricorn.png b/plugins/emoji/public/images/capricorn.png
deleted file mode 120000
index b90edabd64..0000000000
--- a/plugins/emoji/public/images/capricorn.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2651.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/car.png b/plugins/emoji/public/images/car.png
deleted file mode 120000
index 5c765c0c78..0000000000
--- a/plugins/emoji/public/images/car.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f697.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/card_index.png b/plugins/emoji/public/images/card_index.png
deleted file mode 120000
index ed12eadefa..0000000000
--- a/plugins/emoji/public/images/card_index.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/carousel_horse.png b/plugins/emoji/public/images/carousel_horse.png
deleted file mode 120000
index 714231536b..0000000000
--- a/plugins/emoji/public/images/carousel_horse.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cat.png b/plugins/emoji/public/images/cat.png
deleted file mode 120000
index 700563ce09..0000000000
--- a/plugins/emoji/public/images/cat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f431.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cat2.png b/plugins/emoji/public/images/cat2.png
deleted file mode 120000
index 5b63192d41..0000000000
--- a/plugins/emoji/public/images/cat2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f408.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cd.png b/plugins/emoji/public/images/cd.png
deleted file mode 120000
index 5dd4bc3ec4..0000000000
--- a/plugins/emoji/public/images/cd.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4bf.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/chart.png b/plugins/emoji/public/images/chart.png
deleted file mode 120000
index 72658a574d..0000000000
--- a/plugins/emoji/public/images/chart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/chart_with_downwards_trend.png b/plugins/emoji/public/images/chart_with_downwards_trend.png
deleted file mode 120000
index ed6490a910..0000000000
--- a/plugins/emoji/public/images/chart_with_downwards_trend.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/chart_with_upwards_trend.png b/plugins/emoji/public/images/chart_with_upwards_trend.png
deleted file mode 120000
index e50ad380b9..0000000000
--- a/plugins/emoji/public/images/chart_with_upwards_trend.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/checkered_flag.png b/plugins/emoji/public/images/checkered_flag.png
deleted file mode 120000
index 6c229117d9..0000000000
--- a/plugins/emoji/public/images/checkered_flag.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cherries.png b/plugins/emoji/public/images/cherries.png
deleted file mode 120000
index 4c3c2fc43f..0000000000
--- a/plugins/emoji/public/images/cherries.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f352.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cherry_blossom.png b/plugins/emoji/public/images/cherry_blossom.png
deleted file mode 120000
index d008f09b5c..0000000000
--- a/plugins/emoji/public/images/cherry_blossom.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f338.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/chestnut.png b/plugins/emoji/public/images/chestnut.png
deleted file mode 120000
index 4d6ca48afa..0000000000
--- a/plugins/emoji/public/images/chestnut.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f330.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/chicken.png b/plugins/emoji/public/images/chicken.png
deleted file mode 120000
index 20eb3ed95a..0000000000
--- a/plugins/emoji/public/images/chicken.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f414.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/children_crossing.png b/plugins/emoji/public/images/children_crossing.png
deleted file mode 120000
index f91803a5d8..0000000000
--- a/plugins/emoji/public/images/children_crossing.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/chocolate_bar.png b/plugins/emoji/public/images/chocolate_bar.png
deleted file mode 120000
index fc35f40173..0000000000
--- a/plugins/emoji/public/images/chocolate_bar.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f36b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/christmas_tree.png b/plugins/emoji/public/images/christmas_tree.png
deleted file mode 120000
index b283cd9ab0..0000000000
--- a/plugins/emoji/public/images/christmas_tree.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f384.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/church.png b/plugins/emoji/public/images/church.png
deleted file mode 120000
index b0d9fb862d..0000000000
--- a/plugins/emoji/public/images/church.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26ea.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cinema.png b/plugins/emoji/public/images/cinema.png
deleted file mode 120000
index fecd94b360..0000000000
--- a/plugins/emoji/public/images/cinema.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/circus_tent.png b/plugins/emoji/public/images/circus_tent.png
deleted file mode 120000
index c481d05f23..0000000000
--- a/plugins/emoji/public/images/circus_tent.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3aa.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/city_sunrise.png b/plugins/emoji/public/images/city_sunrise.png
deleted file mode 120000
index bf60493e9a..0000000000
--- a/plugins/emoji/public/images/city_sunrise.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f307.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/city_sunset.png b/plugins/emoji/public/images/city_sunset.png
deleted file mode 120000
index b9f6acafc2..0000000000
--- a/plugins/emoji/public/images/city_sunset.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f306.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cl.png b/plugins/emoji/public/images/cl.png
deleted file mode 120000
index b891eb9494..0000000000
--- a/plugins/emoji/public/images/cl.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f191.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clap.png b/plugins/emoji/public/images/clap.png
deleted file mode 120000
index e512723d1e..0000000000
--- a/plugins/emoji/public/images/clap.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f44f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clapper.png b/plugins/emoji/public/images/clapper.png
deleted file mode 120000
index aa80aa0d99..0000000000
--- a/plugins/emoji/public/images/clapper.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ac.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clipboard.png b/plugins/emoji/public/images/clipboard.png
deleted file mode 120000
index bed675bb06..0000000000
--- a/plugins/emoji/public/images/clipboard.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4cb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock1.png b/plugins/emoji/public/images/clock1.png
deleted file mode 120000
index babfece25d..0000000000
--- a/plugins/emoji/public/images/clock1.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f550.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock10.png b/plugins/emoji/public/images/clock10.png
deleted file mode 120000
index 3b4611b0b0..0000000000
--- a/plugins/emoji/public/images/clock10.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f559.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock1030.png b/plugins/emoji/public/images/clock1030.png
deleted file mode 120000
index 832d8ede02..0000000000
--- a/plugins/emoji/public/images/clock1030.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f565.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock11.png b/plugins/emoji/public/images/clock11.png
deleted file mode 120000
index 00d230a4b6..0000000000
--- a/plugins/emoji/public/images/clock11.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f55a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock1130.png b/plugins/emoji/public/images/clock1130.png
deleted file mode 120000
index 7bd6ac61f1..0000000000
--- a/plugins/emoji/public/images/clock1130.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f566.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock12.png b/plugins/emoji/public/images/clock12.png
deleted file mode 120000
index b578a975e1..0000000000
--- a/plugins/emoji/public/images/clock12.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f55b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock1230.png b/plugins/emoji/public/images/clock1230.png
deleted file mode 120000
index b8b0dd7a7a..0000000000
--- a/plugins/emoji/public/images/clock1230.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f567.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock130.png b/plugins/emoji/public/images/clock130.png
deleted file mode 120000
index d58c12b71a..0000000000
--- a/plugins/emoji/public/images/clock130.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f55c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock2.png b/plugins/emoji/public/images/clock2.png
deleted file mode 120000
index 6865c87a34..0000000000
--- a/plugins/emoji/public/images/clock2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f551.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock230.png b/plugins/emoji/public/images/clock230.png
deleted file mode 120000
index c4bf1af15c..0000000000
--- a/plugins/emoji/public/images/clock230.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f55d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock3.png b/plugins/emoji/public/images/clock3.png
deleted file mode 120000
index 9295a8d344..0000000000
--- a/plugins/emoji/public/images/clock3.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f552.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock330.png b/plugins/emoji/public/images/clock330.png
deleted file mode 120000
index 68c67d03f9..0000000000
--- a/plugins/emoji/public/images/clock330.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f55e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock4.png b/plugins/emoji/public/images/clock4.png
deleted file mode 120000
index 94e718f2b1..0000000000
--- a/plugins/emoji/public/images/clock4.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f553.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock430.png b/plugins/emoji/public/images/clock430.png
deleted file mode 120000
index 725b1327a8..0000000000
--- a/plugins/emoji/public/images/clock430.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f55f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock5.png b/plugins/emoji/public/images/clock5.png
deleted file mode 120000
index fadf05b54a..0000000000
--- a/plugins/emoji/public/images/clock5.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f554.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock530.png b/plugins/emoji/public/images/clock530.png
deleted file mode 120000
index 59f0f4077f..0000000000
--- a/plugins/emoji/public/images/clock530.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f560.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock6.png b/plugins/emoji/public/images/clock6.png
deleted file mode 120000
index 3daab67e93..0000000000
--- a/plugins/emoji/public/images/clock6.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f555.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock630.png b/plugins/emoji/public/images/clock630.png
deleted file mode 120000
index b452a61526..0000000000
--- a/plugins/emoji/public/images/clock630.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f561.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock7.png b/plugins/emoji/public/images/clock7.png
deleted file mode 120000
index a248b84d8a..0000000000
--- a/plugins/emoji/public/images/clock7.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f556.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock730.png b/plugins/emoji/public/images/clock730.png
deleted file mode 120000
index fc8551a853..0000000000
--- a/plugins/emoji/public/images/clock730.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f562.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock8.png b/plugins/emoji/public/images/clock8.png
deleted file mode 120000
index 0238886ce7..0000000000
--- a/plugins/emoji/public/images/clock8.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f557.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock830.png b/plugins/emoji/public/images/clock830.png
deleted file mode 120000
index 3ebfd1a8fe..0000000000
--- a/plugins/emoji/public/images/clock830.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f563.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock9.png b/plugins/emoji/public/images/clock9.png
deleted file mode 120000
index 0dfa6a0820..0000000000
--- a/plugins/emoji/public/images/clock9.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f558.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clock930.png b/plugins/emoji/public/images/clock930.png
deleted file mode 120000
index 7071800dd4..0000000000
--- a/plugins/emoji/public/images/clock930.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f564.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/closed_book.png b/plugins/emoji/public/images/closed_book.png
deleted file mode 120000
index a2d7786f7b..0000000000
--- a/plugins/emoji/public/images/closed_book.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/closed_lock_with_key.png b/plugins/emoji/public/images/closed_lock_with_key.png
deleted file mode 120000
index 49be232101..0000000000
--- a/plugins/emoji/public/images/closed_lock_with_key.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f510.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/closed_umbrella.png b/plugins/emoji/public/images/closed_umbrella.png
deleted file mode 120000
index fce0465945..0000000000
--- a/plugins/emoji/public/images/closed_umbrella.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f302.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cloud.png b/plugins/emoji/public/images/cloud.png
deleted file mode 120000
index 6352e5410a..0000000000
--- a/plugins/emoji/public/images/cloud.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2601.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/clubs.png b/plugins/emoji/public/images/clubs.png
deleted file mode 120000
index b53d3ad262..0000000000
--- a/plugins/emoji/public/images/clubs.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2663.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cn.png b/plugins/emoji/public/images/cn.png
deleted file mode 120000
index 13dae9fb07..0000000000
--- a/plugins/emoji/public/images/cn.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1e8-1f1f3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cocktail.png b/plugins/emoji/public/images/cocktail.png
deleted file mode 120000
index c104cec5c0..0000000000
--- a/plugins/emoji/public/images/cocktail.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f378.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/coffee.png b/plugins/emoji/public/images/coffee.png
deleted file mode 120000
index 9e0eb9eae8..0000000000
--- a/plugins/emoji/public/images/coffee.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2615.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cold_sweat.png b/plugins/emoji/public/images/cold_sweat.png
deleted file mode 120000
index 9e55bf1e8a..0000000000
--- a/plugins/emoji/public/images/cold_sweat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f630.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/collision.png b/plugins/emoji/public/images/collision.png
deleted file mode 120000
index ac298e5b3a..0000000000
--- a/plugins/emoji/public/images/collision.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/computer.png b/plugins/emoji/public/images/computer.png
deleted file mode 120000
index ba794f3d12..0000000000
--- a/plugins/emoji/public/images/computer.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4bb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/confetti_ball.png b/plugins/emoji/public/images/confetti_ball.png
deleted file mode 120000
index 4e45ed7552..0000000000
--- a/plugins/emoji/public/images/confetti_ball.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f38a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/confounded.png b/plugins/emoji/public/images/confounded.png
deleted file mode 120000
index 1c2a66fc27..0000000000
--- a/plugins/emoji/public/images/confounded.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f616.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/confused.png b/plugins/emoji/public/images/confused.png
deleted file mode 120000
index fba2ddb94e..0000000000
--- a/plugins/emoji/public/images/confused.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f615.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/congratulations.png b/plugins/emoji/public/images/congratulations.png
deleted file mode 120000
index 08cd271abc..0000000000
--- a/plugins/emoji/public/images/congratulations.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/3297.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/construction.png b/plugins/emoji/public/images/construction.png
deleted file mode 120000
index 46ccad2b06..0000000000
--- a/plugins/emoji/public/images/construction.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/construction_worker.png b/plugins/emoji/public/images/construction_worker.png
deleted file mode 120000
index d707a0bd43..0000000000
--- a/plugins/emoji/public/images/construction_worker.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f477.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/convenience_store.png b/plugins/emoji/public/images/convenience_store.png
deleted file mode 120000
index aa75ece8af..0000000000
--- a/plugins/emoji/public/images/convenience_store.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ea.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cookie.png b/plugins/emoji/public/images/cookie.png
deleted file mode 120000
index e26336948b..0000000000
--- a/plugins/emoji/public/images/cookie.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f36a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cool.png b/plugins/emoji/public/images/cool.png
deleted file mode 120000
index 4ba3e49b3e..0000000000
--- a/plugins/emoji/public/images/cool.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f192.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cop.png b/plugins/emoji/public/images/cop.png
deleted file mode 120000
index bb0aa2e2aa..0000000000
--- a/plugins/emoji/public/images/cop.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f46e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/copyright.png b/plugins/emoji/public/images/copyright.png
deleted file mode 120000
index c3ad410edf..0000000000
--- a/plugins/emoji/public/images/copyright.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/00a9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/corn.png b/plugins/emoji/public/images/corn.png
deleted file mode 120000
index 9cb7d3ef73..0000000000
--- a/plugins/emoji/public/images/corn.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f33d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/couple.png b/plugins/emoji/public/images/couple.png
deleted file mode 120000
index d4e2873018..0000000000
--- a/plugins/emoji/public/images/couple.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f46b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/couple_with_heart.png b/plugins/emoji/public/images/couple_with_heart.png
deleted file mode 120000
index 3354817f24..0000000000
--- a/plugins/emoji/public/images/couple_with_heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f491.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/couplekiss.png b/plugins/emoji/public/images/couplekiss.png
deleted file mode 120000
index 7c89b32f9c..0000000000
--- a/plugins/emoji/public/images/couplekiss.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f48f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cow.png b/plugins/emoji/public/images/cow.png
deleted file mode 120000
index 78dd69826f..0000000000
--- a/plugins/emoji/public/images/cow.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f42e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cow2.png b/plugins/emoji/public/images/cow2.png
deleted file mode 120000
index 66e42f9db3..0000000000
--- a/plugins/emoji/public/images/cow2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f404.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/credit_card.png b/plugins/emoji/public/images/credit_card.png
deleted file mode 120000
index f1b2040ff8..0000000000
--- a/plugins/emoji/public/images/credit_card.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/crescent_moon.png b/plugins/emoji/public/images/crescent_moon.png
deleted file mode 120000
index c24506ae03..0000000000
--- a/plugins/emoji/public/images/crescent_moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f319.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/crocodile.png b/plugins/emoji/public/images/crocodile.png
deleted file mode 120000
index 74edced8a3..0000000000
--- a/plugins/emoji/public/images/crocodile.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f40a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/crossed_flags.png b/plugins/emoji/public/images/crossed_flags.png
deleted file mode 120000
index c8355a7601..0000000000
--- a/plugins/emoji/public/images/crossed_flags.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f38c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/crown.png b/plugins/emoji/public/images/crown.png
deleted file mode 120000
index 9c22c50003..0000000000
--- a/plugins/emoji/public/images/crown.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f451.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cry.png b/plugins/emoji/public/images/cry.png
deleted file mode 120000
index 6026054822..0000000000
--- a/plugins/emoji/public/images/cry.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f622.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/crying_cat_face.png b/plugins/emoji/public/images/crying_cat_face.png
deleted file mode 120000
index 59cc6d46bc..0000000000
--- a/plugins/emoji/public/images/crying_cat_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f63f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/crystal_ball.png b/plugins/emoji/public/images/crystal_ball.png
deleted file mode 120000
index db7f0298c2..0000000000
--- a/plugins/emoji/public/images/crystal_ball.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f52e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cupid.png b/plugins/emoji/public/images/cupid.png
deleted file mode 120000
index 21fd46a7f8..0000000000
--- a/plugins/emoji/public/images/cupid.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f498.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/curly_loop.png b/plugins/emoji/public/images/curly_loop.png
deleted file mode 120000
index edd47cb2c8..0000000000
--- a/plugins/emoji/public/images/curly_loop.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/27b0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/currency_exchange.png b/plugins/emoji/public/images/currency_exchange.png
deleted file mode 120000
index f169d71764..0000000000
--- a/plugins/emoji/public/images/currency_exchange.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/curry.png b/plugins/emoji/public/images/curry.png
deleted file mode 120000
index 4302387834..0000000000
--- a/plugins/emoji/public/images/curry.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f35b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/custard.png b/plugins/emoji/public/images/custard.png
deleted file mode 120000
index 25b31e9c12..0000000000
--- a/plugins/emoji/public/images/custard.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f36e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/customs.png b/plugins/emoji/public/images/customs.png
deleted file mode 120000
index 486f2789ca..0000000000
--- a/plugins/emoji/public/images/customs.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6c3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/cyclone.png b/plugins/emoji/public/images/cyclone.png
deleted file mode 120000
index 4af8f622fb..0000000000
--- a/plugins/emoji/public/images/cyclone.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f300.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dancer.png b/plugins/emoji/public/images/dancer.png
deleted file mode 120000
index 2ef414f8ca..0000000000
--- a/plugins/emoji/public/images/dancer.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f483.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dancers.png b/plugins/emoji/public/images/dancers.png
deleted file mode 120000
index 2d9f681706..0000000000
--- a/plugins/emoji/public/images/dancers.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f46f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dango.png b/plugins/emoji/public/images/dango.png
deleted file mode 120000
index ebdf73e659..0000000000
--- a/plugins/emoji/public/images/dango.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f361.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dart.png b/plugins/emoji/public/images/dart.png
deleted file mode 120000
index fc947a9448..0000000000
--- a/plugins/emoji/public/images/dart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3af.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dash.png b/plugins/emoji/public/images/dash.png
deleted file mode 120000
index e78b67a95b..0000000000
--- a/plugins/emoji/public/images/dash.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/date.png b/plugins/emoji/public/images/date.png
deleted file mode 120000
index 9b2460cf23..0000000000
--- a/plugins/emoji/public/images/date.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/de.png b/plugins/emoji/public/images/de.png
deleted file mode 120000
index aa7924088e..0000000000
--- a/plugins/emoji/public/images/de.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1e9-1f1ea.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/deciduous_tree.png b/plugins/emoji/public/images/deciduous_tree.png
deleted file mode 120000
index f84c1cd43a..0000000000
--- a/plugins/emoji/public/images/deciduous_tree.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f333.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/department_store.png b/plugins/emoji/public/images/department_store.png
deleted file mode 120000
index bd1a150cec..0000000000
--- a/plugins/emoji/public/images/department_store.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ec.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/diamond_shape_with_a_dot_inside.png b/plugins/emoji/public/images/diamond_shape_with_a_dot_inside.png
deleted file mode 120000
index 9ca70fc936..0000000000
--- a/plugins/emoji/public/images/diamond_shape_with_a_dot_inside.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/diamonds.png b/plugins/emoji/public/images/diamonds.png
deleted file mode 120000
index 1475b75e20..0000000000
--- a/plugins/emoji/public/images/diamonds.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2666.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/disappointed.png b/plugins/emoji/public/images/disappointed.png
deleted file mode 120000
index 32b4024f00..0000000000
--- a/plugins/emoji/public/images/disappointed.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f61e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/disappointed_relieved.png b/plugins/emoji/public/images/disappointed_relieved.png
deleted file mode 120000
index 0ada0bda2b..0000000000
--- a/plugins/emoji/public/images/disappointed_relieved.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f625.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dizzy.png b/plugins/emoji/public/images/dizzy.png
deleted file mode 120000
index d8f02d9b40..0000000000
--- a/plugins/emoji/public/images/dizzy.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ab.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dizzy_face.png b/plugins/emoji/public/images/dizzy_face.png
deleted file mode 120000
index 6c1725d0e0..0000000000
--- a/plugins/emoji/public/images/dizzy_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f635.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/do_not_litter.png b/plugins/emoji/public/images/do_not_litter.png
deleted file mode 120000
index 2aad4879c4..0000000000
--- a/plugins/emoji/public/images/do_not_litter.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6af.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dog.png b/plugins/emoji/public/images/dog.png
deleted file mode 120000
index 1cfc670448..0000000000
--- a/plugins/emoji/public/images/dog.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f436.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dog2.png b/plugins/emoji/public/images/dog2.png
deleted file mode 120000
index e447911e29..0000000000
--- a/plugins/emoji/public/images/dog2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f415.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dollar.png b/plugins/emoji/public/images/dollar.png
deleted file mode 120000
index 5f57b39b6d..0000000000
--- a/plugins/emoji/public/images/dollar.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dolls.png b/plugins/emoji/public/images/dolls.png
deleted file mode 120000
index c5bbe9f771..0000000000
--- a/plugins/emoji/public/images/dolls.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f38e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dolphin.png b/plugins/emoji/public/images/dolphin.png
deleted file mode 120000
index 608d04011e..0000000000
--- a/plugins/emoji/public/images/dolphin.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f42c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/door.png b/plugins/emoji/public/images/door.png
deleted file mode 120000
index 2892c68070..0000000000
--- a/plugins/emoji/public/images/door.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6aa.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/doughnut.png b/plugins/emoji/public/images/doughnut.png
deleted file mode 120000
index 3f4be9b306..0000000000
--- a/plugins/emoji/public/images/doughnut.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f369.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dragon.png b/plugins/emoji/public/images/dragon.png
deleted file mode 120000
index 72564c6535..0000000000
--- a/plugins/emoji/public/images/dragon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f409.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dragon_face.png b/plugins/emoji/public/images/dragon_face.png
deleted file mode 120000
index 91a1c3ae08..0000000000
--- a/plugins/emoji/public/images/dragon_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f432.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dress.png b/plugins/emoji/public/images/dress.png
deleted file mode 120000
index b8c868679b..0000000000
--- a/plugins/emoji/public/images/dress.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f457.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dromedary_camel.png b/plugins/emoji/public/images/dromedary_camel.png
deleted file mode 120000
index cb20f59c15..0000000000
--- a/plugins/emoji/public/images/dromedary_camel.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f42a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/droplet.png b/plugins/emoji/public/images/droplet.png
deleted file mode 120000
index cfac4591e0..0000000000
--- a/plugins/emoji/public/images/droplet.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/dvd.png b/plugins/emoji/public/images/dvd.png
deleted file mode 120000
index 086e083fe5..0000000000
--- a/plugins/emoji/public/images/dvd.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/e-mail.png b/plugins/emoji/public/images/e-mail.png
deleted file mode 120000
index 06849d1877..0000000000
--- a/plugins/emoji/public/images/e-mail.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ear.png b/plugins/emoji/public/images/ear.png
deleted file mode 120000
index e1a626bc4e..0000000000
--- a/plugins/emoji/public/images/ear.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f442.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ear_of_rice.png b/plugins/emoji/public/images/ear_of_rice.png
deleted file mode 120000
index 1c346905cc..0000000000
--- a/plugins/emoji/public/images/ear_of_rice.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f33e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/earth_africa.png b/plugins/emoji/public/images/earth_africa.png
deleted file mode 120000
index f8c52577bc..0000000000
--- a/plugins/emoji/public/images/earth_africa.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f30d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/earth_americas.png b/plugins/emoji/public/images/earth_americas.png
deleted file mode 120000
index 6caf59dac5..0000000000
--- a/plugins/emoji/public/images/earth_americas.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f30e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/earth_asia.png b/plugins/emoji/public/images/earth_asia.png
deleted file mode 120000
index 2934b85aa6..0000000000
--- a/plugins/emoji/public/images/earth_asia.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f30f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/egg.png b/plugins/emoji/public/images/egg.png
deleted file mode 120000
index 9e55c9fded..0000000000
--- a/plugins/emoji/public/images/egg.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f373.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/eggplant.png b/plugins/emoji/public/images/eggplant.png
deleted file mode 120000
index a3341a9654..0000000000
--- a/plugins/emoji/public/images/eggplant.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f346.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/eight.png b/plugins/emoji/public/images/eight.png
deleted file mode 120000
index c585323cd3..0000000000
--- a/plugins/emoji/public/images/eight.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0038.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/eight_pointed_black_star.png b/plugins/emoji/public/images/eight_pointed_black_star.png
deleted file mode 120000
index 99aab6ae0f..0000000000
--- a/plugins/emoji/public/images/eight_pointed_black_star.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2734.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/eight_spoked_asterisk.png b/plugins/emoji/public/images/eight_spoked_asterisk.png
deleted file mode 120000
index cfcd8f4f41..0000000000
--- a/plugins/emoji/public/images/eight_spoked_asterisk.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2733.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/electric_plug.png b/plugins/emoji/public/images/electric_plug.png
deleted file mode 120000
index 1f9b2bb055..0000000000
--- a/plugins/emoji/public/images/electric_plug.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f50c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/elephant.png b/plugins/emoji/public/images/elephant.png
deleted file mode 120000
index 66566e5459..0000000000
--- a/plugins/emoji/public/images/elephant.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f418.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/email.png b/plugins/emoji/public/images/email.png
deleted file mode 120000
index d4e66d388c..0000000000
--- a/plugins/emoji/public/images/email.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2709.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/unicode/1f44d.png b/plugins/emoji/public/images/emoji_one/+1.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f44d.png
rename to plugins/emoji/public/images/emoji_one/+1.png
diff --git a/plugins/emoji/public/images/unicode/1f44e.png b/plugins/emoji/public/images/emoji_one/-1.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f44e.png
rename to plugins/emoji/public/images/emoji_one/-1.png
diff --git a/plugins/emoji/public/images/unicode/1f4af.png b/plugins/emoji/public/images/emoji_one/100.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4af.png
rename to plugins/emoji/public/images/emoji_one/100.png
diff --git a/plugins/emoji/public/images/unicode/1f522.png b/plugins/emoji/public/images/emoji_one/1234.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f522.png
rename to plugins/emoji/public/images/emoji_one/1234.png
diff --git a/plugins/emoji/public/images/unicode/1f3b1.png b/plugins/emoji/public/images/emoji_one/8ball.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b1.png
rename to plugins/emoji/public/images/emoji_one/8ball.png
diff --git a/plugins/emoji/public/images/unicode/1f170.png b/plugins/emoji/public/images/emoji_one/a.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f170.png
rename to plugins/emoji/public/images/emoji_one/a.png
diff --git a/plugins/emoji/public/images/unicode/1f18e.png b/plugins/emoji/public/images/emoji_one/ab.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f18e.png
rename to plugins/emoji/public/images/emoji_one/ab.png
diff --git a/plugins/emoji/public/images/unicode/1f524.png b/plugins/emoji/public/images/emoji_one/abc.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f524.png
rename to plugins/emoji/public/images/emoji_one/abc.png
diff --git a/plugins/emoji/public/images/unicode/1f521.png b/plugins/emoji/public/images/emoji_one/abcd.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f521.png
rename to plugins/emoji/public/images/emoji_one/abcd.png
diff --git a/plugins/emoji/public/images/unicode/1f251.png b/plugins/emoji/public/images/emoji_one/accept.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f251.png
rename to plugins/emoji/public/images/emoji_one/accept.png
diff --git a/plugins/emoji/public/images/unicode/1f6a1.png b/plugins/emoji/public/images/emoji_one/aerial_tramway.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a1.png
rename to plugins/emoji/public/images/emoji_one/aerial_tramway.png
diff --git a/plugins/emoji/public/images/unicode/2708.png b/plugins/emoji/public/images/emoji_one/airplane.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2708.png
rename to plugins/emoji/public/images/emoji_one/airplane.png
diff --git a/plugins/emoji/public/images/unicode/23f0.png b/plugins/emoji/public/images/emoji_one/alarm_clock.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/23f0.png
rename to plugins/emoji/public/images/emoji_one/alarm_clock.png
diff --git a/plugins/emoji/public/images/unicode/1f47d.png b/plugins/emoji/public/images/emoji_one/alien.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f47d.png
rename to plugins/emoji/public/images/emoji_one/alien.png
diff --git a/plugins/emoji/public/images/unicode/1f691.png b/plugins/emoji/public/images/emoji_one/ambulance.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f691.png
rename to plugins/emoji/public/images/emoji_one/ambulance.png
diff --git a/plugins/emoji/public/images/unicode/2693.png b/plugins/emoji/public/images/emoji_one/anchor.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2693.png
rename to plugins/emoji/public/images/emoji_one/anchor.png
diff --git a/plugins/emoji/public/images/unicode/1f47c.png b/plugins/emoji/public/images/emoji_one/angel.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f47c.png
rename to plugins/emoji/public/images/emoji_one/angel.png
diff --git a/plugins/emoji/public/images/unicode/1f4a2.png b/plugins/emoji/public/images/emoji_one/anger.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a2.png
rename to plugins/emoji/public/images/emoji_one/anger.png
diff --git a/plugins/emoji/public/images/unicode/1f620.png b/plugins/emoji/public/images/emoji_one/angry.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f620.png
rename to plugins/emoji/public/images/emoji_one/angry.png
diff --git a/plugins/emoji/public/images/unicode/1f627.png b/plugins/emoji/public/images/emoji_one/anguished.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f627.png
rename to plugins/emoji/public/images/emoji_one/anguished.png
diff --git a/plugins/emoji/public/images/unicode/1f41c.png b/plugins/emoji/public/images/emoji_one/ant.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f41c.png
rename to plugins/emoji/public/images/emoji_one/ant.png
diff --git a/plugins/emoji/public/images/unicode/1f34e.png b/plugins/emoji/public/images/emoji_one/apple.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f34e.png
rename to plugins/emoji/public/images/emoji_one/apple.png
diff --git a/plugins/emoji/public/images/unicode/2652.png b/plugins/emoji/public/images/emoji_one/aquarius.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2652.png
rename to plugins/emoji/public/images/emoji_one/aquarius.png
diff --git a/plugins/emoji/public/images/unicode/2648.png b/plugins/emoji/public/images/emoji_one/aries.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2648.png
rename to plugins/emoji/public/images/emoji_one/aries.png
diff --git a/plugins/emoji/public/images/unicode/25c0.png b/plugins/emoji/public/images/emoji_one/arrow_backward.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/25c0.png
rename to plugins/emoji/public/images/emoji_one/arrow_backward.png
diff --git a/plugins/emoji/public/images/unicode/23ec.png b/plugins/emoji/public/images/emoji_one/arrow_double_down.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/23ec.png
rename to plugins/emoji/public/images/emoji_one/arrow_double_down.png
diff --git a/plugins/emoji/public/images/unicode/23eb.png b/plugins/emoji/public/images/emoji_one/arrow_double_up.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/23eb.png
rename to plugins/emoji/public/images/emoji_one/arrow_double_up.png
diff --git a/plugins/emoji/public/images/unicode/2b07.png b/plugins/emoji/public/images/emoji_one/arrow_down.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2b07.png
rename to plugins/emoji/public/images/emoji_one/arrow_down.png
diff --git a/plugins/emoji/public/images/unicode/1f53d.png b/plugins/emoji/public/images/emoji_one/arrow_down_small.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f53d.png
rename to plugins/emoji/public/images/emoji_one/arrow_down_small.png
diff --git a/plugins/emoji/public/images/unicode/25b6.png b/plugins/emoji/public/images/emoji_one/arrow_forward.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/25b6.png
rename to plugins/emoji/public/images/emoji_one/arrow_forward.png
diff --git a/plugins/emoji/public/images/unicode/2935.png b/plugins/emoji/public/images/emoji_one/arrow_heading_down.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2935.png
rename to plugins/emoji/public/images/emoji_one/arrow_heading_down.png
diff --git a/plugins/emoji/public/images/unicode/2934.png b/plugins/emoji/public/images/emoji_one/arrow_heading_up.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2934.png
rename to plugins/emoji/public/images/emoji_one/arrow_heading_up.png
diff --git a/plugins/emoji/public/images/unicode/2b05.png b/plugins/emoji/public/images/emoji_one/arrow_left.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2b05.png
rename to plugins/emoji/public/images/emoji_one/arrow_left.png
diff --git a/plugins/emoji/public/images/unicode/2199.png b/plugins/emoji/public/images/emoji_one/arrow_lower_left.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2199.png
rename to plugins/emoji/public/images/emoji_one/arrow_lower_left.png
diff --git a/plugins/emoji/public/images/unicode/2198.png b/plugins/emoji/public/images/emoji_one/arrow_lower_right.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2198.png
rename to plugins/emoji/public/images/emoji_one/arrow_lower_right.png
diff --git a/plugins/emoji/public/images/unicode/27a1.png b/plugins/emoji/public/images/emoji_one/arrow_right.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/27a1.png
rename to plugins/emoji/public/images/emoji_one/arrow_right.png
diff --git a/plugins/emoji/public/images/unicode/21aa.png b/plugins/emoji/public/images/emoji_one/arrow_right_hook.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/21aa.png
rename to plugins/emoji/public/images/emoji_one/arrow_right_hook.png
diff --git a/plugins/emoji/public/images/unicode/2b06.png b/plugins/emoji/public/images/emoji_one/arrow_up.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2b06.png
rename to plugins/emoji/public/images/emoji_one/arrow_up.png
diff --git a/plugins/emoji/public/images/unicode/2195.png b/plugins/emoji/public/images/emoji_one/arrow_up_down.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2195.png
rename to plugins/emoji/public/images/emoji_one/arrow_up_down.png
diff --git a/plugins/emoji/public/images/unicode/1f53c.png b/plugins/emoji/public/images/emoji_one/arrow_up_small.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f53c.png
rename to plugins/emoji/public/images/emoji_one/arrow_up_small.png
diff --git a/plugins/emoji/public/images/unicode/2196.png b/plugins/emoji/public/images/emoji_one/arrow_upper_left.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2196.png
rename to plugins/emoji/public/images/emoji_one/arrow_upper_left.png
diff --git a/plugins/emoji/public/images/unicode/2197.png b/plugins/emoji/public/images/emoji_one/arrow_upper_right.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2197.png
rename to plugins/emoji/public/images/emoji_one/arrow_upper_right.png
diff --git a/plugins/emoji/public/images/unicode/1f503.png b/plugins/emoji/public/images/emoji_one/arrows_clockwise.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f503.png
rename to plugins/emoji/public/images/emoji_one/arrows_clockwise.png
diff --git a/plugins/emoji/public/images/unicode/1f504.png b/plugins/emoji/public/images/emoji_one/arrows_counterclockwise.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f504.png
rename to plugins/emoji/public/images/emoji_one/arrows_counterclockwise.png
diff --git a/plugins/emoji/public/images/unicode/1f3a8.png b/plugins/emoji/public/images/emoji_one/art.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a8.png
rename to plugins/emoji/public/images/emoji_one/art.png
diff --git a/plugins/emoji/public/images/unicode/1f69b.png b/plugins/emoji/public/images/emoji_one/articulated_lorry.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f69b.png
rename to plugins/emoji/public/images/emoji_one/articulated_lorry.png
diff --git a/plugins/emoji/public/images/unicode/1f632.png b/plugins/emoji/public/images/emoji_one/astonished.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f632.png
rename to plugins/emoji/public/images/emoji_one/astonished.png
diff --git a/plugins/emoji/public/images/unicode/1f45f.png b/plugins/emoji/public/images/emoji_one/athletic_shoe.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f45f.png
rename to plugins/emoji/public/images/emoji_one/athletic_shoe.png
diff --git a/plugins/emoji/public/images/unicode/1f3e7.png b/plugins/emoji/public/images/emoji_one/atm.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e7.png
rename to plugins/emoji/public/images/emoji_one/atm.png
diff --git a/plugins/emoji/public/images/unicode/1f171.png b/plugins/emoji/public/images/emoji_one/b.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f171.png
rename to plugins/emoji/public/images/emoji_one/b.png
diff --git a/plugins/emoji/public/images/unicode/1f476.png b/plugins/emoji/public/images/emoji_one/baby.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f476.png
rename to plugins/emoji/public/images/emoji_one/baby.png
diff --git a/plugins/emoji/public/images/unicode/1f37c.png b/plugins/emoji/public/images/emoji_one/baby_bottle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f37c.png
rename to plugins/emoji/public/images/emoji_one/baby_bottle.png
diff --git a/plugins/emoji/public/images/unicode/1f424.png b/plugins/emoji/public/images/emoji_one/baby_chick.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f424.png
rename to plugins/emoji/public/images/emoji_one/baby_chick.png
diff --git a/plugins/emoji/public/images/unicode/1f6bc.png b/plugins/emoji/public/images/emoji_one/baby_symbol.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6bc.png
rename to plugins/emoji/public/images/emoji_one/baby_symbol.png
diff --git a/plugins/emoji/public/images/unicode/1f519.png b/plugins/emoji/public/images/emoji_one/back.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f519.png
rename to plugins/emoji/public/images/emoji_one/back.png
diff --git a/plugins/emoji/public/images/unicode/1f6c4.png b/plugins/emoji/public/images/emoji_one/baggage_claim.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6c4.png
rename to plugins/emoji/public/images/emoji_one/baggage_claim.png
diff --git a/plugins/emoji/public/images/unicode/1f388.png b/plugins/emoji/public/images/emoji_one/balloon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f388.png
rename to plugins/emoji/public/images/emoji_one/balloon.png
diff --git a/plugins/emoji/public/images/unicode/2611.png b/plugins/emoji/public/images/emoji_one/ballot_box_with_check.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2611.png
rename to plugins/emoji/public/images/emoji_one/ballot_box_with_check.png
diff --git a/plugins/emoji/public/images/unicode/1f38d.png b/plugins/emoji/public/images/emoji_one/bamboo.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f38d.png
rename to plugins/emoji/public/images/emoji_one/bamboo.png
diff --git a/plugins/emoji/public/images/unicode/1f34c.png b/plugins/emoji/public/images/emoji_one/banana.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f34c.png
rename to plugins/emoji/public/images/emoji_one/banana.png
diff --git a/plugins/emoji/public/images/unicode/203c.png b/plugins/emoji/public/images/emoji_one/bangbang.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/203c.png
rename to plugins/emoji/public/images/emoji_one/bangbang.png
diff --git a/plugins/emoji/public/images/unicode/1f3e6.png b/plugins/emoji/public/images/emoji_one/bank.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e6.png
rename to plugins/emoji/public/images/emoji_one/bank.png
diff --git a/plugins/emoji/public/images/unicode/1f4ca.png b/plugins/emoji/public/images/emoji_one/bar_chart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ca.png
rename to plugins/emoji/public/images/emoji_one/bar_chart.png
diff --git a/plugins/emoji/public/images/unicode/1f488.png b/plugins/emoji/public/images/emoji_one/barber.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f488.png
rename to plugins/emoji/public/images/emoji_one/barber.png
diff --git a/plugins/emoji/public/images/unicode/26be.png b/plugins/emoji/public/images/emoji_one/baseball.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26be.png
rename to plugins/emoji/public/images/emoji_one/baseball.png
diff --git a/plugins/emoji/public/images/unicode/1f3c0.png b/plugins/emoji/public/images/emoji_one/basketball.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3c0.png
rename to plugins/emoji/public/images/emoji_one/basketball.png
diff --git a/plugins/emoji/public/images/unicode/1f6c0.png b/plugins/emoji/public/images/emoji_one/bath.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6c0.png
rename to plugins/emoji/public/images/emoji_one/bath.png
diff --git a/plugins/emoji/public/images/unicode/1f6c1.png b/plugins/emoji/public/images/emoji_one/bathtub.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6c1.png
rename to plugins/emoji/public/images/emoji_one/bathtub.png
diff --git a/plugins/emoji/public/images/unicode/1f50b.png b/plugins/emoji/public/images/emoji_one/battery.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f50b.png
rename to plugins/emoji/public/images/emoji_one/battery.png
diff --git a/plugins/emoji/public/images/unicode/1f43b.png b/plugins/emoji/public/images/emoji_one/bear.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f43b.png
rename to plugins/emoji/public/images/emoji_one/bear.png
diff --git a/plugins/emoji/public/images/unicode/1f41d.png b/plugins/emoji/public/images/emoji_one/bee.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f41d.png
rename to plugins/emoji/public/images/emoji_one/bee.png
diff --git a/plugins/emoji/public/images/unicode/1f37a.png b/plugins/emoji/public/images/emoji_one/beer.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f37a.png
rename to plugins/emoji/public/images/emoji_one/beer.png
diff --git a/plugins/emoji/public/images/unicode/1f37b.png b/plugins/emoji/public/images/emoji_one/beers.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f37b.png
rename to plugins/emoji/public/images/emoji_one/beers.png
diff --git a/plugins/emoji/public/images/unicode/1f41e.png b/plugins/emoji/public/images/emoji_one/beetle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f41e.png
rename to plugins/emoji/public/images/emoji_one/beetle.png
diff --git a/plugins/emoji/public/images/unicode/1f530.png b/plugins/emoji/public/images/emoji_one/beginner.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f530.png
rename to plugins/emoji/public/images/emoji_one/beginner.png
diff --git a/plugins/emoji/public/images/unicode/1f514.png b/plugins/emoji/public/images/emoji_one/bell.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f514.png
rename to plugins/emoji/public/images/emoji_one/bell.png
diff --git a/plugins/emoji/public/images/unicode/1f371.png b/plugins/emoji/public/images/emoji_one/bento.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f371.png
rename to plugins/emoji/public/images/emoji_one/bento.png
diff --git a/plugins/emoji/public/images/unicode/1f6b4.png b/plugins/emoji/public/images/emoji_one/bicyclist.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b4.png
rename to plugins/emoji/public/images/emoji_one/bicyclist.png
diff --git a/plugins/emoji/public/images/unicode/1f6b2.png b/plugins/emoji/public/images/emoji_one/bike.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b2.png
rename to plugins/emoji/public/images/emoji_one/bike.png
diff --git a/plugins/emoji/public/images/unicode/1f459.png b/plugins/emoji/public/images/emoji_one/bikini.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f459.png
rename to plugins/emoji/public/images/emoji_one/bikini.png
diff --git a/plugins/emoji/public/images/unicode/1f426.png b/plugins/emoji/public/images/emoji_one/bird.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f426.png
rename to plugins/emoji/public/images/emoji_one/bird.png
diff --git a/plugins/emoji/public/images/unicode/1f382.png b/plugins/emoji/public/images/emoji_one/birthday.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f382.png
rename to plugins/emoji/public/images/emoji_one/birthday.png
diff --git a/plugins/emoji/public/images/unicode/26ab.png b/plugins/emoji/public/images/emoji_one/black_circle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26ab.png
rename to plugins/emoji/public/images/emoji_one/black_circle.png
diff --git a/plugins/emoji/public/images/emoji_one/black_joker.png b/plugins/emoji/public/images/emoji_one/black_joker.png
new file mode 100644
index 0000000000..5c770fb278
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/black_joker.png differ
diff --git a/plugins/emoji/public/images/unicode/2b1b.png b/plugins/emoji/public/images/emoji_one/black_large_square.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2b1b.png
rename to plugins/emoji/public/images/emoji_one/black_large_square.png
diff --git a/plugins/emoji/public/images/unicode/25fe.png b/plugins/emoji/public/images/emoji_one/black_medium_small_square.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/25fe.png
rename to plugins/emoji/public/images/emoji_one/black_medium_small_square.png
diff --git a/plugins/emoji/public/images/unicode/25fc.png b/plugins/emoji/public/images/emoji_one/black_medium_square.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/25fc.png
rename to plugins/emoji/public/images/emoji_one/black_medium_square.png
diff --git a/plugins/emoji/public/images/unicode/2712.png b/plugins/emoji/public/images/emoji_one/black_nib.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2712.png
rename to plugins/emoji/public/images/emoji_one/black_nib.png
diff --git a/plugins/emoji/public/images/unicode/25aa.png b/plugins/emoji/public/images/emoji_one/black_small_square.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/25aa.png
rename to plugins/emoji/public/images/emoji_one/black_small_square.png
diff --git a/plugins/emoji/public/images/unicode/1f532.png b/plugins/emoji/public/images/emoji_one/black_square_button.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f532.png
rename to plugins/emoji/public/images/emoji_one/black_square_button.png
diff --git a/plugins/emoji/public/images/unicode/1f33c.png b/plugins/emoji/public/images/emoji_one/blossom.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f33c.png
rename to plugins/emoji/public/images/emoji_one/blossom.png
diff --git a/plugins/emoji/public/images/unicode/1f421.png b/plugins/emoji/public/images/emoji_one/blowfish.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f421.png
rename to plugins/emoji/public/images/emoji_one/blowfish.png
diff --git a/plugins/emoji/public/images/unicode/1f4d8.png b/plugins/emoji/public/images/emoji_one/blue_book.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d8.png
rename to plugins/emoji/public/images/emoji_one/blue_book.png
diff --git a/plugins/emoji/public/images/unicode/1f699.png b/plugins/emoji/public/images/emoji_one/blue_car.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f699.png
rename to plugins/emoji/public/images/emoji_one/blue_car.png
diff --git a/plugins/emoji/public/images/unicode/1f499.png b/plugins/emoji/public/images/emoji_one/blue_heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f499.png
rename to plugins/emoji/public/images/emoji_one/blue_heart.png
diff --git a/plugins/emoji/public/images/unicode/1f60a.png b/plugins/emoji/public/images/emoji_one/blush.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f60a.png
rename to plugins/emoji/public/images/emoji_one/blush.png
diff --git a/plugins/emoji/public/images/unicode/1f417.png b/plugins/emoji/public/images/emoji_one/boar.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f417.png
rename to plugins/emoji/public/images/emoji_one/boar.png
diff --git a/plugins/emoji/public/images/unicode/26f5.png b/plugins/emoji/public/images/emoji_one/boat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26f5.png
rename to plugins/emoji/public/images/emoji_one/boat.png
diff --git a/plugins/emoji/public/images/unicode/1f4a3.png b/plugins/emoji/public/images/emoji_one/bomb.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a3.png
rename to plugins/emoji/public/images/emoji_one/bomb.png
diff --git a/plugins/emoji/public/images/unicode/1f4d6.png b/plugins/emoji/public/images/emoji_one/book.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d6.png
rename to plugins/emoji/public/images/emoji_one/book.png
diff --git a/plugins/emoji/public/images/unicode/1f516.png b/plugins/emoji/public/images/emoji_one/bookmark.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f516.png
rename to plugins/emoji/public/images/emoji_one/bookmark.png
diff --git a/plugins/emoji/public/images/unicode/1f4d1.png b/plugins/emoji/public/images/emoji_one/bookmark_tabs.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d1.png
rename to plugins/emoji/public/images/emoji_one/bookmark_tabs.png
diff --git a/plugins/emoji/public/images/unicode/1f4da.png b/plugins/emoji/public/images/emoji_one/books.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4da.png
rename to plugins/emoji/public/images/emoji_one/books.png
diff --git a/plugins/emoji/public/images/unicode/1f4a5.png b/plugins/emoji/public/images/emoji_one/boom.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a5.png
rename to plugins/emoji/public/images/emoji_one/boom.png
diff --git a/plugins/emoji/public/images/unicode/1f462.png b/plugins/emoji/public/images/emoji_one/boot.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f462.png
rename to plugins/emoji/public/images/emoji_one/boot.png
diff --git a/plugins/emoji/public/images/unicode/1f490.png b/plugins/emoji/public/images/emoji_one/bouquet.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f490.png
rename to plugins/emoji/public/images/emoji_one/bouquet.png
diff --git a/plugins/emoji/public/images/unicode/1f647.png b/plugins/emoji/public/images/emoji_one/bow.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f647.png
rename to plugins/emoji/public/images/emoji_one/bow.png
diff --git a/plugins/emoji/public/images/unicode/1f3b3.png b/plugins/emoji/public/images/emoji_one/bowling.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b3.png
rename to plugins/emoji/public/images/emoji_one/bowling.png
diff --git a/plugins/emoji/public/images/unicode/1f466.png b/plugins/emoji/public/images/emoji_one/boy.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f466.png
rename to plugins/emoji/public/images/emoji_one/boy.png
diff --git a/plugins/emoji/public/images/unicode/1f35e.png b/plugins/emoji/public/images/emoji_one/bread.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f35e.png
rename to plugins/emoji/public/images/emoji_one/bread.png
diff --git a/plugins/emoji/public/images/unicode/1f470.png b/plugins/emoji/public/images/emoji_one/bride_with_veil.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f470.png
rename to plugins/emoji/public/images/emoji_one/bride_with_veil.png
diff --git a/plugins/emoji/public/images/unicode/1f309.png b/plugins/emoji/public/images/emoji_one/bridge_at_night.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f309.png
rename to plugins/emoji/public/images/emoji_one/bridge_at_night.png
diff --git a/plugins/emoji/public/images/unicode/1f4bc.png b/plugins/emoji/public/images/emoji_one/briefcase.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4bc.png
rename to plugins/emoji/public/images/emoji_one/briefcase.png
diff --git a/plugins/emoji/public/images/unicode/1f494.png b/plugins/emoji/public/images/emoji_one/broken_heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f494.png
rename to plugins/emoji/public/images/emoji_one/broken_heart.png
diff --git a/plugins/emoji/public/images/unicode/1f41b.png b/plugins/emoji/public/images/emoji_one/bug.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f41b.png
rename to plugins/emoji/public/images/emoji_one/bug.png
diff --git a/plugins/emoji/public/images/unicode/1f4a1.png b/plugins/emoji/public/images/emoji_one/bulb.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a1.png
rename to plugins/emoji/public/images/emoji_one/bulb.png
diff --git a/plugins/emoji/public/images/unicode/1f685.png b/plugins/emoji/public/images/emoji_one/bullettrain_front.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f685.png
rename to plugins/emoji/public/images/emoji_one/bullettrain_front.png
diff --git a/plugins/emoji/public/images/unicode/1f684.png b/plugins/emoji/public/images/emoji_one/bullettrain_side.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f684.png
rename to plugins/emoji/public/images/emoji_one/bullettrain_side.png
diff --git a/plugins/emoji/public/images/unicode/1f68c.png b/plugins/emoji/public/images/emoji_one/bus.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f68c.png
rename to plugins/emoji/public/images/emoji_one/bus.png
diff --git a/plugins/emoji/public/images/unicode/1f68f.png b/plugins/emoji/public/images/emoji_one/busstop.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f68f.png
rename to plugins/emoji/public/images/emoji_one/busstop.png
diff --git a/plugins/emoji/public/images/unicode/1f464.png b/plugins/emoji/public/images/emoji_one/bust_in_silhouette.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f464.png
rename to plugins/emoji/public/images/emoji_one/bust_in_silhouette.png
diff --git a/plugins/emoji/public/images/unicode/1f465.png b/plugins/emoji/public/images/emoji_one/busts_in_silhouette.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f465.png
rename to plugins/emoji/public/images/emoji_one/busts_in_silhouette.png
diff --git a/plugins/emoji/public/images/unicode/1f335.png b/plugins/emoji/public/images/emoji_one/cactus.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f335.png
rename to plugins/emoji/public/images/emoji_one/cactus.png
diff --git a/plugins/emoji/public/images/unicode/1f370.png b/plugins/emoji/public/images/emoji_one/cake.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f370.png
rename to plugins/emoji/public/images/emoji_one/cake.png
diff --git a/plugins/emoji/public/images/unicode/1f4c6.png b/plugins/emoji/public/images/emoji_one/calendar.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c6.png
rename to plugins/emoji/public/images/emoji_one/calendar.png
diff --git a/plugins/emoji/public/images/unicode/1f4f2.png b/plugins/emoji/public/images/emoji_one/calling.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4f2.png
rename to plugins/emoji/public/images/emoji_one/calling.png
diff --git a/plugins/emoji/public/images/unicode/1f42b.png b/plugins/emoji/public/images/emoji_one/camel.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f42b.png
rename to plugins/emoji/public/images/emoji_one/camel.png
diff --git a/plugins/emoji/public/images/unicode/1f4f7.png b/plugins/emoji/public/images/emoji_one/camera.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4f7.png
rename to plugins/emoji/public/images/emoji_one/camera.png
diff --git a/plugins/emoji/public/images/unicode/264b.png b/plugins/emoji/public/images/emoji_one/cancer.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/264b.png
rename to plugins/emoji/public/images/emoji_one/cancer.png
diff --git a/plugins/emoji/public/images/unicode/1f36c.png b/plugins/emoji/public/images/emoji_one/candy.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f36c.png
rename to plugins/emoji/public/images/emoji_one/candy.png
diff --git a/plugins/emoji/public/images/unicode/1f520.png b/plugins/emoji/public/images/emoji_one/capital_abcd.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f520.png
rename to plugins/emoji/public/images/emoji_one/capital_abcd.png
diff --git a/plugins/emoji/public/images/unicode/2651.png b/plugins/emoji/public/images/emoji_one/capricorn.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2651.png
rename to plugins/emoji/public/images/emoji_one/capricorn.png
diff --git a/plugins/emoji/public/images/unicode/1f697.png b/plugins/emoji/public/images/emoji_one/car.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f697.png
rename to plugins/emoji/public/images/emoji_one/car.png
diff --git a/plugins/emoji/public/images/unicode/1f4c7.png b/plugins/emoji/public/images/emoji_one/card_index.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c7.png
rename to plugins/emoji/public/images/emoji_one/card_index.png
diff --git a/plugins/emoji/public/images/unicode/1f3a0.png b/plugins/emoji/public/images/emoji_one/carousel_horse.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a0.png
rename to plugins/emoji/public/images/emoji_one/carousel_horse.png
diff --git a/plugins/emoji/public/images/unicode/1f431.png b/plugins/emoji/public/images/emoji_one/cat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f431.png
rename to plugins/emoji/public/images/emoji_one/cat.png
diff --git a/plugins/emoji/public/images/unicode/1f408.png b/plugins/emoji/public/images/emoji_one/cat2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f408.png
rename to plugins/emoji/public/images/emoji_one/cat2.png
diff --git a/plugins/emoji/public/images/unicode/1f4bf.png b/plugins/emoji/public/images/emoji_one/cd.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4bf.png
rename to plugins/emoji/public/images/emoji_one/cd.png
diff --git a/plugins/emoji/public/images/unicode/1f4b9.png b/plugins/emoji/public/images/emoji_one/chart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b9.png
rename to plugins/emoji/public/images/emoji_one/chart.png
diff --git a/plugins/emoji/public/images/unicode/1f4c9.png b/plugins/emoji/public/images/emoji_one/chart_with_downwards_trend.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c9.png
rename to plugins/emoji/public/images/emoji_one/chart_with_downwards_trend.png
diff --git a/plugins/emoji/public/images/unicode/1f4c8.png b/plugins/emoji/public/images/emoji_one/chart_with_upwards_trend.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c8.png
rename to plugins/emoji/public/images/emoji_one/chart_with_upwards_trend.png
diff --git a/plugins/emoji/public/images/unicode/1f3c1.png b/plugins/emoji/public/images/emoji_one/checkered_flag.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3c1.png
rename to plugins/emoji/public/images/emoji_one/checkered_flag.png
diff --git a/plugins/emoji/public/images/unicode/1f352.png b/plugins/emoji/public/images/emoji_one/cherries.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f352.png
rename to plugins/emoji/public/images/emoji_one/cherries.png
diff --git a/plugins/emoji/public/images/unicode/1f338.png b/plugins/emoji/public/images/emoji_one/cherry_blossom.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f338.png
rename to plugins/emoji/public/images/emoji_one/cherry_blossom.png
diff --git a/plugins/emoji/public/images/unicode/1f330.png b/plugins/emoji/public/images/emoji_one/chestnut.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f330.png
rename to plugins/emoji/public/images/emoji_one/chestnut.png
diff --git a/plugins/emoji/public/images/unicode/1f414.png b/plugins/emoji/public/images/emoji_one/chicken.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f414.png
rename to plugins/emoji/public/images/emoji_one/chicken.png
diff --git a/plugins/emoji/public/images/unicode/1f6b8.png b/plugins/emoji/public/images/emoji_one/children_crossing.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b8.png
rename to plugins/emoji/public/images/emoji_one/children_crossing.png
diff --git a/plugins/emoji/public/images/unicode/1f36b.png b/plugins/emoji/public/images/emoji_one/chocolate_bar.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f36b.png
rename to plugins/emoji/public/images/emoji_one/chocolate_bar.png
diff --git a/plugins/emoji/public/images/unicode/1f384.png b/plugins/emoji/public/images/emoji_one/christmas_tree.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f384.png
rename to plugins/emoji/public/images/emoji_one/christmas_tree.png
diff --git a/plugins/emoji/public/images/unicode/26ea.png b/plugins/emoji/public/images/emoji_one/church.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26ea.png
rename to plugins/emoji/public/images/emoji_one/church.png
diff --git a/plugins/emoji/public/images/unicode/1f3a6.png b/plugins/emoji/public/images/emoji_one/cinema.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a6.png
rename to plugins/emoji/public/images/emoji_one/cinema.png
diff --git a/plugins/emoji/public/images/unicode/1f3aa.png b/plugins/emoji/public/images/emoji_one/circus_tent.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3aa.png
rename to plugins/emoji/public/images/emoji_one/circus_tent.png
diff --git a/plugins/emoji/public/images/unicode/1f307.png b/plugins/emoji/public/images/emoji_one/city_sunrise.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f307.png
rename to plugins/emoji/public/images/emoji_one/city_sunrise.png
diff --git a/plugins/emoji/public/images/unicode/1f306.png b/plugins/emoji/public/images/emoji_one/city_sunset.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f306.png
rename to plugins/emoji/public/images/emoji_one/city_sunset.png
diff --git a/plugins/emoji/public/images/unicode/1f191.png b/plugins/emoji/public/images/emoji_one/cl.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f191.png
rename to plugins/emoji/public/images/emoji_one/cl.png
diff --git a/plugins/emoji/public/images/unicode/1f44f.png b/plugins/emoji/public/images/emoji_one/clap.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f44f.png
rename to plugins/emoji/public/images/emoji_one/clap.png
diff --git a/plugins/emoji/public/images/unicode/1f3ac.png b/plugins/emoji/public/images/emoji_one/clapper.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ac.png
rename to plugins/emoji/public/images/emoji_one/clapper.png
diff --git a/plugins/emoji/public/images/unicode/1f4cb.png b/plugins/emoji/public/images/emoji_one/clipboard.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4cb.png
rename to plugins/emoji/public/images/emoji_one/clipboard.png
diff --git a/plugins/emoji/public/images/unicode/1f550.png b/plugins/emoji/public/images/emoji_one/clock1.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f550.png
rename to plugins/emoji/public/images/emoji_one/clock1.png
diff --git a/plugins/emoji/public/images/unicode/1f559.png b/plugins/emoji/public/images/emoji_one/clock10.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f559.png
rename to plugins/emoji/public/images/emoji_one/clock10.png
diff --git a/plugins/emoji/public/images/unicode/1f565.png b/plugins/emoji/public/images/emoji_one/clock1030.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f565.png
rename to plugins/emoji/public/images/emoji_one/clock1030.png
diff --git a/plugins/emoji/public/images/unicode/1f55a.png b/plugins/emoji/public/images/emoji_one/clock11.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f55a.png
rename to plugins/emoji/public/images/emoji_one/clock11.png
diff --git a/plugins/emoji/public/images/unicode/1f566.png b/plugins/emoji/public/images/emoji_one/clock1130.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f566.png
rename to plugins/emoji/public/images/emoji_one/clock1130.png
diff --git a/plugins/emoji/public/images/unicode/1f55b.png b/plugins/emoji/public/images/emoji_one/clock12.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f55b.png
rename to plugins/emoji/public/images/emoji_one/clock12.png
diff --git a/plugins/emoji/public/images/unicode/1f567.png b/plugins/emoji/public/images/emoji_one/clock1230.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f567.png
rename to plugins/emoji/public/images/emoji_one/clock1230.png
diff --git a/plugins/emoji/public/images/unicode/1f55c.png b/plugins/emoji/public/images/emoji_one/clock130.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f55c.png
rename to plugins/emoji/public/images/emoji_one/clock130.png
diff --git a/plugins/emoji/public/images/unicode/1f551.png b/plugins/emoji/public/images/emoji_one/clock2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f551.png
rename to plugins/emoji/public/images/emoji_one/clock2.png
diff --git a/plugins/emoji/public/images/unicode/1f55d.png b/plugins/emoji/public/images/emoji_one/clock230.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f55d.png
rename to plugins/emoji/public/images/emoji_one/clock230.png
diff --git a/plugins/emoji/public/images/unicode/1f552.png b/plugins/emoji/public/images/emoji_one/clock3.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f552.png
rename to plugins/emoji/public/images/emoji_one/clock3.png
diff --git a/plugins/emoji/public/images/unicode/1f55e.png b/plugins/emoji/public/images/emoji_one/clock330.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f55e.png
rename to plugins/emoji/public/images/emoji_one/clock330.png
diff --git a/plugins/emoji/public/images/unicode/1f553.png b/plugins/emoji/public/images/emoji_one/clock4.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f553.png
rename to plugins/emoji/public/images/emoji_one/clock4.png
diff --git a/plugins/emoji/public/images/unicode/1f55f.png b/plugins/emoji/public/images/emoji_one/clock430.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f55f.png
rename to plugins/emoji/public/images/emoji_one/clock430.png
diff --git a/plugins/emoji/public/images/unicode/1f554.png b/plugins/emoji/public/images/emoji_one/clock5.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f554.png
rename to plugins/emoji/public/images/emoji_one/clock5.png
diff --git a/plugins/emoji/public/images/unicode/1f560.png b/plugins/emoji/public/images/emoji_one/clock530.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f560.png
rename to plugins/emoji/public/images/emoji_one/clock530.png
diff --git a/plugins/emoji/public/images/emoji_one/clock6.png b/plugins/emoji/public/images/emoji_one/clock6.png
new file mode 100644
index 0000000000..52cb970683
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/clock6.png differ
diff --git a/plugins/emoji/public/images/unicode/1f561.png b/plugins/emoji/public/images/emoji_one/clock630.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f561.png
rename to plugins/emoji/public/images/emoji_one/clock630.png
diff --git a/plugins/emoji/public/images/unicode/1f556.png b/plugins/emoji/public/images/emoji_one/clock7.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f556.png
rename to plugins/emoji/public/images/emoji_one/clock7.png
diff --git a/plugins/emoji/public/images/unicode/1f562.png b/plugins/emoji/public/images/emoji_one/clock730.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f562.png
rename to plugins/emoji/public/images/emoji_one/clock730.png
diff --git a/plugins/emoji/public/images/unicode/1f557.png b/plugins/emoji/public/images/emoji_one/clock8.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f557.png
rename to plugins/emoji/public/images/emoji_one/clock8.png
diff --git a/plugins/emoji/public/images/unicode/1f563.png b/plugins/emoji/public/images/emoji_one/clock830.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f563.png
rename to plugins/emoji/public/images/emoji_one/clock830.png
diff --git a/plugins/emoji/public/images/unicode/1f558.png b/plugins/emoji/public/images/emoji_one/clock9.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f558.png
rename to plugins/emoji/public/images/emoji_one/clock9.png
diff --git a/plugins/emoji/public/images/unicode/1f564.png b/plugins/emoji/public/images/emoji_one/clock930.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f564.png
rename to plugins/emoji/public/images/emoji_one/clock930.png
diff --git a/plugins/emoji/public/images/unicode/1f4d5.png b/plugins/emoji/public/images/emoji_one/closed_book.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d5.png
rename to plugins/emoji/public/images/emoji_one/closed_book.png
diff --git a/plugins/emoji/public/images/unicode/1f510.png b/plugins/emoji/public/images/emoji_one/closed_lock_with_key.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f510.png
rename to plugins/emoji/public/images/emoji_one/closed_lock_with_key.png
diff --git a/plugins/emoji/public/images/unicode/1f302.png b/plugins/emoji/public/images/emoji_one/closed_umbrella.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f302.png
rename to plugins/emoji/public/images/emoji_one/closed_umbrella.png
diff --git a/plugins/emoji/public/images/unicode/2601.png b/plugins/emoji/public/images/emoji_one/cloud.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2601.png
rename to plugins/emoji/public/images/emoji_one/cloud.png
diff --git a/plugins/emoji/public/images/unicode/2663.png b/plugins/emoji/public/images/emoji_one/clubs.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2663.png
rename to plugins/emoji/public/images/emoji_one/clubs.png
diff --git a/plugins/emoji/public/images/emoji_one/cn.png b/plugins/emoji/public/images/emoji_one/cn.png
new file mode 100644
index 0000000000..0151923f35
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/cn.png differ
diff --git a/plugins/emoji/public/images/unicode/1f378.png b/plugins/emoji/public/images/emoji_one/cocktail.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f378.png
rename to plugins/emoji/public/images/emoji_one/cocktail.png
diff --git a/plugins/emoji/public/images/unicode/2615.png b/plugins/emoji/public/images/emoji_one/coffee.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2615.png
rename to plugins/emoji/public/images/emoji_one/coffee.png
diff --git a/plugins/emoji/public/images/unicode/1f630.png b/plugins/emoji/public/images/emoji_one/cold_sweat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f630.png
rename to plugins/emoji/public/images/emoji_one/cold_sweat.png
diff --git a/plugins/emoji/public/images/emoji_one/collision.png b/plugins/emoji/public/images/emoji_one/collision.png
new file mode 100644
index 0000000000..036a9485a9
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/collision.png differ
diff --git a/plugins/emoji/public/images/unicode/1f4bb.png b/plugins/emoji/public/images/emoji_one/computer.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4bb.png
rename to plugins/emoji/public/images/emoji_one/computer.png
diff --git a/plugins/emoji/public/images/unicode/1f38a.png b/plugins/emoji/public/images/emoji_one/confetti_ball.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f38a.png
rename to plugins/emoji/public/images/emoji_one/confetti_ball.png
diff --git a/plugins/emoji/public/images/unicode/1f616.png b/plugins/emoji/public/images/emoji_one/confounded.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f616.png
rename to plugins/emoji/public/images/emoji_one/confounded.png
diff --git a/plugins/emoji/public/images/unicode/1f615.png b/plugins/emoji/public/images/emoji_one/confused.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f615.png
rename to plugins/emoji/public/images/emoji_one/confused.png
diff --git a/plugins/emoji/public/images/unicode/3297.png b/plugins/emoji/public/images/emoji_one/congratulations.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/3297.png
rename to plugins/emoji/public/images/emoji_one/congratulations.png
diff --git a/plugins/emoji/public/images/unicode/1f6a7.png b/plugins/emoji/public/images/emoji_one/construction.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a7.png
rename to plugins/emoji/public/images/emoji_one/construction.png
diff --git a/plugins/emoji/public/images/unicode/1f477.png b/plugins/emoji/public/images/emoji_one/construction_worker.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f477.png
rename to plugins/emoji/public/images/emoji_one/construction_worker.png
diff --git a/plugins/emoji/public/images/unicode/1f3ea.png b/plugins/emoji/public/images/emoji_one/convenience_store.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ea.png
rename to plugins/emoji/public/images/emoji_one/convenience_store.png
diff --git a/plugins/emoji/public/images/unicode/1f36a.png b/plugins/emoji/public/images/emoji_one/cookie.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f36a.png
rename to plugins/emoji/public/images/emoji_one/cookie.png
diff --git a/plugins/emoji/public/images/unicode/1f192.png b/plugins/emoji/public/images/emoji_one/cool.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f192.png
rename to plugins/emoji/public/images/emoji_one/cool.png
diff --git a/plugins/emoji/public/images/unicode/1f46e.png b/plugins/emoji/public/images/emoji_one/cop.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f46e.png
rename to plugins/emoji/public/images/emoji_one/cop.png
diff --git a/plugins/emoji/public/images/unicode/00a9.png b/plugins/emoji/public/images/emoji_one/copyright.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/00a9.png
rename to plugins/emoji/public/images/emoji_one/copyright.png
diff --git a/plugins/emoji/public/images/unicode/1f33d.png b/plugins/emoji/public/images/emoji_one/corn.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f33d.png
rename to plugins/emoji/public/images/emoji_one/corn.png
diff --git a/plugins/emoji/public/images/unicode/1f46b.png b/plugins/emoji/public/images/emoji_one/couple.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f46b.png
rename to plugins/emoji/public/images/emoji_one/couple.png
diff --git a/plugins/emoji/public/images/unicode/1f491.png b/plugins/emoji/public/images/emoji_one/couple_with_heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f491.png
rename to plugins/emoji/public/images/emoji_one/couple_with_heart.png
diff --git a/plugins/emoji/public/images/unicode/1f48f.png b/plugins/emoji/public/images/emoji_one/couplekiss.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f48f.png
rename to plugins/emoji/public/images/emoji_one/couplekiss.png
diff --git a/plugins/emoji/public/images/unicode/1f42e.png b/plugins/emoji/public/images/emoji_one/cow.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f42e.png
rename to plugins/emoji/public/images/emoji_one/cow.png
diff --git a/plugins/emoji/public/images/unicode/1f404.png b/plugins/emoji/public/images/emoji_one/cow2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f404.png
rename to plugins/emoji/public/images/emoji_one/cow2.png
diff --git a/plugins/emoji/public/images/unicode/1f4b3.png b/plugins/emoji/public/images/emoji_one/credit_card.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b3.png
rename to plugins/emoji/public/images/emoji_one/credit_card.png
diff --git a/plugins/emoji/public/images/unicode/1f319.png b/plugins/emoji/public/images/emoji_one/crescent_moon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f319.png
rename to plugins/emoji/public/images/emoji_one/crescent_moon.png
diff --git a/plugins/emoji/public/images/unicode/1f40a.png b/plugins/emoji/public/images/emoji_one/crocodile.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f40a.png
rename to plugins/emoji/public/images/emoji_one/crocodile.png
diff --git a/plugins/emoji/public/images/unicode/1f38c.png b/plugins/emoji/public/images/emoji_one/crossed_flags.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f38c.png
rename to plugins/emoji/public/images/emoji_one/crossed_flags.png
diff --git a/plugins/emoji/public/images/unicode/1f451.png b/plugins/emoji/public/images/emoji_one/crown.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f451.png
rename to plugins/emoji/public/images/emoji_one/crown.png
diff --git a/plugins/emoji/public/images/unicode/1f622.png b/plugins/emoji/public/images/emoji_one/cry.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f622.png
rename to plugins/emoji/public/images/emoji_one/cry.png
diff --git a/plugins/emoji/public/images/unicode/1f63f.png b/plugins/emoji/public/images/emoji_one/crying_cat_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f63f.png
rename to plugins/emoji/public/images/emoji_one/crying_cat_face.png
diff --git a/plugins/emoji/public/images/unicode/1f52e.png b/plugins/emoji/public/images/emoji_one/crystal_ball.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f52e.png
rename to plugins/emoji/public/images/emoji_one/crystal_ball.png
diff --git a/plugins/emoji/public/images/unicode/1f498.png b/plugins/emoji/public/images/emoji_one/cupid.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f498.png
rename to plugins/emoji/public/images/emoji_one/cupid.png
diff --git a/plugins/emoji/public/images/unicode/27b0.png b/plugins/emoji/public/images/emoji_one/curly_loop.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/27b0.png
rename to plugins/emoji/public/images/emoji_one/curly_loop.png
diff --git a/plugins/emoji/public/images/unicode/1f4b1.png b/plugins/emoji/public/images/emoji_one/currency_exchange.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b1.png
rename to plugins/emoji/public/images/emoji_one/currency_exchange.png
diff --git a/plugins/emoji/public/images/unicode/1f35b.png b/plugins/emoji/public/images/emoji_one/curry.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f35b.png
rename to plugins/emoji/public/images/emoji_one/curry.png
diff --git a/plugins/emoji/public/images/unicode/1f36e.png b/plugins/emoji/public/images/emoji_one/custard.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f36e.png
rename to plugins/emoji/public/images/emoji_one/custard.png
diff --git a/plugins/emoji/public/images/unicode/1f6c3.png b/plugins/emoji/public/images/emoji_one/customs.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6c3.png
rename to plugins/emoji/public/images/emoji_one/customs.png
diff --git a/plugins/emoji/public/images/unicode/1f300.png b/plugins/emoji/public/images/emoji_one/cyclone.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f300.png
rename to plugins/emoji/public/images/emoji_one/cyclone.png
diff --git a/plugins/emoji/public/images/unicode/1f483.png b/plugins/emoji/public/images/emoji_one/dancer.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f483.png
rename to plugins/emoji/public/images/emoji_one/dancer.png
diff --git a/plugins/emoji/public/images/unicode/1f46f.png b/plugins/emoji/public/images/emoji_one/dancers.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f46f.png
rename to plugins/emoji/public/images/emoji_one/dancers.png
diff --git a/plugins/emoji/public/images/unicode/1f361.png b/plugins/emoji/public/images/emoji_one/dango.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f361.png
rename to plugins/emoji/public/images/emoji_one/dango.png
diff --git a/plugins/emoji/public/images/unicode/1f3af.png b/plugins/emoji/public/images/emoji_one/dart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3af.png
rename to plugins/emoji/public/images/emoji_one/dart.png
diff --git a/plugins/emoji/public/images/unicode/1f4a8.png b/plugins/emoji/public/images/emoji_one/dash.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a8.png
rename to plugins/emoji/public/images/emoji_one/dash.png
diff --git a/plugins/emoji/public/images/unicode/1f4c5.png b/plugins/emoji/public/images/emoji_one/date.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c5.png
rename to plugins/emoji/public/images/emoji_one/date.png
diff --git a/plugins/emoji/public/images/emoji_one/de.png b/plugins/emoji/public/images/emoji_one/de.png
new file mode 100644
index 0000000000..36b3290dc0
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/de.png differ
diff --git a/plugins/emoji/public/images/unicode/1f333.png b/plugins/emoji/public/images/emoji_one/deciduous_tree.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f333.png
rename to plugins/emoji/public/images/emoji_one/deciduous_tree.png
diff --git a/plugins/emoji/public/images/unicode/1f3ec.png b/plugins/emoji/public/images/emoji_one/department_store.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ec.png
rename to plugins/emoji/public/images/emoji_one/department_store.png
diff --git a/plugins/emoji/public/images/unicode/1f4a0.png b/plugins/emoji/public/images/emoji_one/diamond_shape_with_a_dot_inside.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a0.png
rename to plugins/emoji/public/images/emoji_one/diamond_shape_with_a_dot_inside.png
diff --git a/plugins/emoji/public/images/unicode/2666.png b/plugins/emoji/public/images/emoji_one/diamonds.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2666.png
rename to plugins/emoji/public/images/emoji_one/diamonds.png
diff --git a/plugins/emoji/public/images/unicode/1f61e.png b/plugins/emoji/public/images/emoji_one/disappointed.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f61e.png
rename to plugins/emoji/public/images/emoji_one/disappointed.png
diff --git a/plugins/emoji/public/images/unicode/1f625.png b/plugins/emoji/public/images/emoji_one/disappointed_relieved.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f625.png
rename to plugins/emoji/public/images/emoji_one/disappointed_relieved.png
diff --git a/plugins/emoji/public/images/unicode/1f4ab.png b/plugins/emoji/public/images/emoji_one/dizzy.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ab.png
rename to plugins/emoji/public/images/emoji_one/dizzy.png
diff --git a/plugins/emoji/public/images/unicode/1f635.png b/plugins/emoji/public/images/emoji_one/dizzy_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f635.png
rename to plugins/emoji/public/images/emoji_one/dizzy_face.png
diff --git a/plugins/emoji/public/images/unicode/1f6af.png b/plugins/emoji/public/images/emoji_one/do_not_litter.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6af.png
rename to plugins/emoji/public/images/emoji_one/do_not_litter.png
diff --git a/plugins/emoji/public/images/unicode/1f436.png b/plugins/emoji/public/images/emoji_one/dog.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f436.png
rename to plugins/emoji/public/images/emoji_one/dog.png
diff --git a/plugins/emoji/public/images/unicode/1f415.png b/plugins/emoji/public/images/emoji_one/dog2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f415.png
rename to plugins/emoji/public/images/emoji_one/dog2.png
diff --git a/plugins/emoji/public/images/unicode/1f4b5.png b/plugins/emoji/public/images/emoji_one/dollar.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b5.png
rename to plugins/emoji/public/images/emoji_one/dollar.png
diff --git a/plugins/emoji/public/images/unicode/1f38e.png b/plugins/emoji/public/images/emoji_one/dolls.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f38e.png
rename to plugins/emoji/public/images/emoji_one/dolls.png
diff --git a/plugins/emoji/public/images/unicode/1f42c.png b/plugins/emoji/public/images/emoji_one/dolphin.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f42c.png
rename to plugins/emoji/public/images/emoji_one/dolphin.png
diff --git a/plugins/emoji/public/images/unicode/1f6aa.png b/plugins/emoji/public/images/emoji_one/door.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6aa.png
rename to plugins/emoji/public/images/emoji_one/door.png
diff --git a/plugins/emoji/public/images/unicode/1f369.png b/plugins/emoji/public/images/emoji_one/doughnut.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f369.png
rename to plugins/emoji/public/images/emoji_one/doughnut.png
diff --git a/plugins/emoji/public/images/unicode/1f409.png b/plugins/emoji/public/images/emoji_one/dragon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f409.png
rename to plugins/emoji/public/images/emoji_one/dragon.png
diff --git a/plugins/emoji/public/images/unicode/1f432.png b/plugins/emoji/public/images/emoji_one/dragon_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f432.png
rename to plugins/emoji/public/images/emoji_one/dragon_face.png
diff --git a/plugins/emoji/public/images/unicode/1f457.png b/plugins/emoji/public/images/emoji_one/dress.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f457.png
rename to plugins/emoji/public/images/emoji_one/dress.png
diff --git a/plugins/emoji/public/images/unicode/1f42a.png b/plugins/emoji/public/images/emoji_one/dromedary_camel.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f42a.png
rename to plugins/emoji/public/images/emoji_one/dromedary_camel.png
diff --git a/plugins/emoji/public/images/unicode/1f4a7.png b/plugins/emoji/public/images/emoji_one/droplet.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a7.png
rename to plugins/emoji/public/images/emoji_one/droplet.png
diff --git a/plugins/emoji/public/images/unicode/1f4c0.png b/plugins/emoji/public/images/emoji_one/dvd.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c0.png
rename to plugins/emoji/public/images/emoji_one/dvd.png
diff --git a/plugins/emoji/public/images/unicode/1f4e7.png b/plugins/emoji/public/images/emoji_one/e-mail.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e7.png
rename to plugins/emoji/public/images/emoji_one/e-mail.png
diff --git a/plugins/emoji/public/images/unicode/1f442.png b/plugins/emoji/public/images/emoji_one/ear.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f442.png
rename to plugins/emoji/public/images/emoji_one/ear.png
diff --git a/plugins/emoji/public/images/unicode/1f33e.png b/plugins/emoji/public/images/emoji_one/ear_of_rice.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f33e.png
rename to plugins/emoji/public/images/emoji_one/ear_of_rice.png
diff --git a/plugins/emoji/public/images/unicode/1f30d.png b/plugins/emoji/public/images/emoji_one/earth_africa.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f30d.png
rename to plugins/emoji/public/images/emoji_one/earth_africa.png
diff --git a/plugins/emoji/public/images/unicode/1f30e.png b/plugins/emoji/public/images/emoji_one/earth_americas.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f30e.png
rename to plugins/emoji/public/images/emoji_one/earth_americas.png
diff --git a/plugins/emoji/public/images/unicode/1f30f.png b/plugins/emoji/public/images/emoji_one/earth_asia.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f30f.png
rename to plugins/emoji/public/images/emoji_one/earth_asia.png
diff --git a/plugins/emoji/public/images/unicode/1f373.png b/plugins/emoji/public/images/emoji_one/egg.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f373.png
rename to plugins/emoji/public/images/emoji_one/egg.png
diff --git a/plugins/emoji/public/images/unicode/1f346.png b/plugins/emoji/public/images/emoji_one/eggplant.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f346.png
rename to plugins/emoji/public/images/emoji_one/eggplant.png
diff --git a/plugins/emoji/public/images/unicode/0038-20E3.png b/plugins/emoji/public/images/emoji_one/eight.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0038-20E3.png
rename to plugins/emoji/public/images/emoji_one/eight.png
diff --git a/plugins/emoji/public/images/unicode/2734.png b/plugins/emoji/public/images/emoji_one/eight_pointed_black_star.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2734.png
rename to plugins/emoji/public/images/emoji_one/eight_pointed_black_star.png
diff --git a/plugins/emoji/public/images/unicode/2733.png b/plugins/emoji/public/images/emoji_one/eight_spoked_asterisk.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2733.png
rename to plugins/emoji/public/images/emoji_one/eight_spoked_asterisk.png
diff --git a/plugins/emoji/public/images/unicode/1f50c.png b/plugins/emoji/public/images/emoji_one/electric_plug.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f50c.png
rename to plugins/emoji/public/images/emoji_one/electric_plug.png
diff --git a/plugins/emoji/public/images/unicode/1f418.png b/plugins/emoji/public/images/emoji_one/elephant.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f418.png
rename to plugins/emoji/public/images/emoji_one/elephant.png
diff --git a/plugins/emoji/public/images/unicode/2709.png b/plugins/emoji/public/images/emoji_one/email.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2709.png
rename to plugins/emoji/public/images/emoji_one/email.png
diff --git a/plugins/emoji/public/images/unicode/1f51a.png b/plugins/emoji/public/images/emoji_one/end.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f51a.png
rename to plugins/emoji/public/images/emoji_one/end.png
diff --git a/plugins/emoji/public/images/emoji_one/envelope.png b/plugins/emoji/public/images/emoji_one/envelope.png
new file mode 100644
index 0000000000..41260282c5
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/envelope.png differ
diff --git a/plugins/emoji/public/images/unicode/1f4e9.png b/plugins/emoji/public/images/emoji_one/envelope_with_arrow.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e9.png
rename to plugins/emoji/public/images/emoji_one/envelope_with_arrow.png
diff --git a/plugins/emoji/public/images/emoji_one/es.png b/plugins/emoji/public/images/emoji_one/es.png
new file mode 100644
index 0000000000..fd3822c9ff
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/es.png differ
diff --git a/plugins/emoji/public/images/unicode/1f4b6.png b/plugins/emoji/public/images/emoji_one/euro.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b6.png
rename to plugins/emoji/public/images/emoji_one/euro.png
diff --git a/plugins/emoji/public/images/unicode/1f3f0.png b/plugins/emoji/public/images/emoji_one/european_castle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3f0.png
rename to plugins/emoji/public/images/emoji_one/european_castle.png
diff --git a/plugins/emoji/public/images/unicode/1f3e4.png b/plugins/emoji/public/images/emoji_one/european_post_office.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e4.png
rename to plugins/emoji/public/images/emoji_one/european_post_office.png
diff --git a/plugins/emoji/public/images/unicode/1f332.png b/plugins/emoji/public/images/emoji_one/evergreen_tree.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f332.png
rename to plugins/emoji/public/images/emoji_one/evergreen_tree.png
diff --git a/plugins/emoji/public/images/unicode/2757.png b/plugins/emoji/public/images/emoji_one/exclamation.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2757.png
rename to plugins/emoji/public/images/emoji_one/exclamation.png
diff --git a/plugins/emoji/public/images/unicode/1f611.png b/plugins/emoji/public/images/emoji_one/expressionless.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f611.png
rename to plugins/emoji/public/images/emoji_one/expressionless.png
diff --git a/plugins/emoji/public/images/unicode/1f453.png b/plugins/emoji/public/images/emoji_one/eyeglasses.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f453.png
rename to plugins/emoji/public/images/emoji_one/eyeglasses.png
diff --git a/plugins/emoji/public/images/unicode/1f440.png b/plugins/emoji/public/images/emoji_one/eyes.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f440.png
rename to plugins/emoji/public/images/emoji_one/eyes.png
diff --git a/plugins/emoji/public/images/unicode/1f44a.png b/plugins/emoji/public/images/emoji_one/facepunch.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f44a.png
rename to plugins/emoji/public/images/emoji_one/facepunch.png
diff --git a/plugins/emoji/public/images/unicode/1f3ed.png b/plugins/emoji/public/images/emoji_one/factory.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ed.png
rename to plugins/emoji/public/images/emoji_one/factory.png
diff --git a/plugins/emoji/public/images/unicode/1f342.png b/plugins/emoji/public/images/emoji_one/fallen_leaf.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f342.png
rename to plugins/emoji/public/images/emoji_one/fallen_leaf.png
diff --git a/plugins/emoji/public/images/unicode/1f46a.png b/plugins/emoji/public/images/emoji_one/family.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f46a.png
rename to plugins/emoji/public/images/emoji_one/family.png
diff --git a/plugins/emoji/public/images/unicode/23e9.png b/plugins/emoji/public/images/emoji_one/fast_forward.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/23e9.png
rename to plugins/emoji/public/images/emoji_one/fast_forward.png
diff --git a/plugins/emoji/public/images/unicode/1f4e0.png b/plugins/emoji/public/images/emoji_one/fax.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e0.png
rename to plugins/emoji/public/images/emoji_one/fax.png
diff --git a/plugins/emoji/public/images/unicode/1f628.png b/plugins/emoji/public/images/emoji_one/fearful.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f628.png
rename to plugins/emoji/public/images/emoji_one/fearful.png
diff --git a/plugins/emoji/public/images/unicode/1f43e.png b/plugins/emoji/public/images/emoji_one/feet.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f43e.png
rename to plugins/emoji/public/images/emoji_one/feet.png
diff --git a/plugins/emoji/public/images/unicode/1f3a1.png b/plugins/emoji/public/images/emoji_one/ferris_wheel.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a1.png
rename to plugins/emoji/public/images/emoji_one/ferris_wheel.png
diff --git a/plugins/emoji/public/images/unicode/1f4c1.png b/plugins/emoji/public/images/emoji_one/file_folder.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c1.png
rename to plugins/emoji/public/images/emoji_one/file_folder.png
diff --git a/plugins/emoji/public/images/unicode/1f525.png b/plugins/emoji/public/images/emoji_one/fire.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f525.png
rename to plugins/emoji/public/images/emoji_one/fire.png
diff --git a/plugins/emoji/public/images/unicode/1f692.png b/plugins/emoji/public/images/emoji_one/fire_engine.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f692.png
rename to plugins/emoji/public/images/emoji_one/fire_engine.png
diff --git a/plugins/emoji/public/images/unicode/1f386.png b/plugins/emoji/public/images/emoji_one/fireworks.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f386.png
rename to plugins/emoji/public/images/emoji_one/fireworks.png
diff --git a/plugins/emoji/public/images/unicode/1f313.png b/plugins/emoji/public/images/emoji_one/first_quarter_moon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f313.png
rename to plugins/emoji/public/images/emoji_one/first_quarter_moon.png
diff --git a/plugins/emoji/public/images/unicode/1f31b.png b/plugins/emoji/public/images/emoji_one/first_quarter_moon_with_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f31b.png
rename to plugins/emoji/public/images/emoji_one/first_quarter_moon_with_face.png
diff --git a/plugins/emoji/public/images/unicode/1f41f.png b/plugins/emoji/public/images/emoji_one/fish.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f41f.png
rename to plugins/emoji/public/images/emoji_one/fish.png
diff --git a/plugins/emoji/public/images/unicode/1f365.png b/plugins/emoji/public/images/emoji_one/fish_cake.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f365.png
rename to plugins/emoji/public/images/emoji_one/fish_cake.png
diff --git a/plugins/emoji/public/images/unicode/1f3a3.png b/plugins/emoji/public/images/emoji_one/fishing_pole_and_fish.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a3.png
rename to plugins/emoji/public/images/emoji_one/fishing_pole_and_fish.png
diff --git a/plugins/emoji/public/images/unicode/270a.png b/plugins/emoji/public/images/emoji_one/fist.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/270a.png
rename to plugins/emoji/public/images/emoji_one/fist.png
diff --git a/plugins/emoji/public/images/unicode/0035-20E3.png b/plugins/emoji/public/images/emoji_one/five.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0035-20E3.png
rename to plugins/emoji/public/images/emoji_one/five.png
diff --git a/plugins/emoji/public/images/unicode/1f38f.png b/plugins/emoji/public/images/emoji_one/flags.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f38f.png
rename to plugins/emoji/public/images/emoji_one/flags.png
diff --git a/plugins/emoji/public/images/unicode/1f526.png b/plugins/emoji/public/images/emoji_one/flashlight.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f526.png
rename to plugins/emoji/public/images/emoji_one/flashlight.png
diff --git a/plugins/emoji/public/images/emoji_one/flipper.png b/plugins/emoji/public/images/emoji_one/flipper.png
new file mode 100644
index 0000000000..9fd3771017
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/flipper.png differ
diff --git a/plugins/emoji/public/images/unicode/1f4be.png b/plugins/emoji/public/images/emoji_one/floppy_disk.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4be.png
rename to plugins/emoji/public/images/emoji_one/floppy_disk.png
diff --git a/plugins/emoji/public/images/unicode/1f3b4.png b/plugins/emoji/public/images/emoji_one/flower_playing_cards.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b4.png
rename to plugins/emoji/public/images/emoji_one/flower_playing_cards.png
diff --git a/plugins/emoji/public/images/unicode/1f633.png b/plugins/emoji/public/images/emoji_one/flushed.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f633.png
rename to plugins/emoji/public/images/emoji_one/flushed.png
diff --git a/plugins/emoji/public/images/unicode/1f301.png b/plugins/emoji/public/images/emoji_one/foggy.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f301.png
rename to plugins/emoji/public/images/emoji_one/foggy.png
diff --git a/plugins/emoji/public/images/unicode/1f3c8.png b/plugins/emoji/public/images/emoji_one/football.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3c8.png
rename to plugins/emoji/public/images/emoji_one/football.png
diff --git a/plugins/emoji/public/images/unicode/1f463.png b/plugins/emoji/public/images/emoji_one/footprints.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f463.png
rename to plugins/emoji/public/images/emoji_one/footprints.png
diff --git a/plugins/emoji/public/images/unicode/1f374.png b/plugins/emoji/public/images/emoji_one/fork_and_knife.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f374.png
rename to plugins/emoji/public/images/emoji_one/fork_and_knife.png
diff --git a/plugins/emoji/public/images/unicode/26f2.png b/plugins/emoji/public/images/emoji_one/fountain.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26f2.png
rename to plugins/emoji/public/images/emoji_one/fountain.png
diff --git a/plugins/emoji/public/images/unicode/0034-20E3.png b/plugins/emoji/public/images/emoji_one/four.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0034-20E3.png
rename to plugins/emoji/public/images/emoji_one/four.png
diff --git a/plugins/emoji/public/images/unicode/1f340.png b/plugins/emoji/public/images/emoji_one/four_leaf_clover.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f340.png
rename to plugins/emoji/public/images/emoji_one/four_leaf_clover.png
diff --git a/plugins/emoji/public/images/emoji_one/fr.png b/plugins/emoji/public/images/emoji_one/fr.png
new file mode 100644
index 0000000000..14271f059d
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/fr.png differ
diff --git a/plugins/emoji/public/images/unicode/1f193.png b/plugins/emoji/public/images/emoji_one/free.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f193.png
rename to plugins/emoji/public/images/emoji_one/free.png
diff --git a/plugins/emoji/public/images/unicode/1f364.png b/plugins/emoji/public/images/emoji_one/fried_shrimp.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f364.png
rename to plugins/emoji/public/images/emoji_one/fried_shrimp.png
diff --git a/plugins/emoji/public/images/unicode/1f35f.png b/plugins/emoji/public/images/emoji_one/fries.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f35f.png
rename to plugins/emoji/public/images/emoji_one/fries.png
diff --git a/plugins/emoji/public/images/unicode/1f438.png b/plugins/emoji/public/images/emoji_one/frog.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f438.png
rename to plugins/emoji/public/images/emoji_one/frog.png
diff --git a/plugins/emoji/public/images/unicode/1f626.png b/plugins/emoji/public/images/emoji_one/frowning.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f626.png
rename to plugins/emoji/public/images/emoji_one/frowning.png
diff --git a/plugins/emoji/public/images/unicode/26fd.png b/plugins/emoji/public/images/emoji_one/fuelpump.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26fd.png
rename to plugins/emoji/public/images/emoji_one/fuelpump.png
diff --git a/plugins/emoji/public/images/unicode/1f315.png b/plugins/emoji/public/images/emoji_one/full_moon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f315.png
rename to plugins/emoji/public/images/emoji_one/full_moon.png
diff --git a/plugins/emoji/public/images/unicode/1f31d.png b/plugins/emoji/public/images/emoji_one/full_moon_with_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f31d.png
rename to plugins/emoji/public/images/emoji_one/full_moon_with_face.png
diff --git a/plugins/emoji/public/images/unicode/1f3b2.png b/plugins/emoji/public/images/emoji_one/game_die.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b2.png
rename to plugins/emoji/public/images/emoji_one/game_die.png
diff --git a/plugins/emoji/public/images/emoji_one/gb.png b/plugins/emoji/public/images/emoji_one/gb.png
new file mode 100644
index 0000000000..61c03f759f
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/gb.png differ
diff --git a/plugins/emoji/public/images/unicode/1f48e.png b/plugins/emoji/public/images/emoji_one/gem.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f48e.png
rename to plugins/emoji/public/images/emoji_one/gem.png
diff --git a/plugins/emoji/public/images/unicode/264a.png b/plugins/emoji/public/images/emoji_one/gemini.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/264a.png
rename to plugins/emoji/public/images/emoji_one/gemini.png
diff --git a/plugins/emoji/public/images/unicode/1f47b.png b/plugins/emoji/public/images/emoji_one/ghost.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f47b.png
rename to plugins/emoji/public/images/emoji_one/ghost.png
diff --git a/plugins/emoji/public/images/unicode/1f381.png b/plugins/emoji/public/images/emoji_one/gift.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f381.png
rename to plugins/emoji/public/images/emoji_one/gift.png
diff --git a/plugins/emoji/public/images/unicode/1f49d.png b/plugins/emoji/public/images/emoji_one/gift_heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f49d.png
rename to plugins/emoji/public/images/emoji_one/gift_heart.png
diff --git a/plugins/emoji/public/images/unicode/1f467.png b/plugins/emoji/public/images/emoji_one/girl.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f467.png
rename to plugins/emoji/public/images/emoji_one/girl.png
diff --git a/plugins/emoji/public/images/unicode/1f310.png b/plugins/emoji/public/images/emoji_one/globe_with_meridians.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f310.png
rename to plugins/emoji/public/images/emoji_one/globe_with_meridians.png
diff --git a/plugins/emoji/public/images/unicode/1f410.png b/plugins/emoji/public/images/emoji_one/goat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f410.png
rename to plugins/emoji/public/images/emoji_one/goat.png
diff --git a/plugins/emoji/public/images/unicode/26f3.png b/plugins/emoji/public/images/emoji_one/golf.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26f3.png
rename to plugins/emoji/public/images/emoji_one/golf.png
diff --git a/plugins/emoji/public/images/unicode/1f347.png b/plugins/emoji/public/images/emoji_one/grapes.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f347.png
rename to plugins/emoji/public/images/emoji_one/grapes.png
diff --git a/plugins/emoji/public/images/unicode/1f34f.png b/plugins/emoji/public/images/emoji_one/green_apple.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f34f.png
rename to plugins/emoji/public/images/emoji_one/green_apple.png
diff --git a/plugins/emoji/public/images/unicode/1f4d7.png b/plugins/emoji/public/images/emoji_one/green_book.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d7.png
rename to plugins/emoji/public/images/emoji_one/green_book.png
diff --git a/plugins/emoji/public/images/unicode/1f49a.png b/plugins/emoji/public/images/emoji_one/green_heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f49a.png
rename to plugins/emoji/public/images/emoji_one/green_heart.png
diff --git a/plugins/emoji/public/images/unicode/2755.png b/plugins/emoji/public/images/emoji_one/grey_exclamation.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2755.png
rename to plugins/emoji/public/images/emoji_one/grey_exclamation.png
diff --git a/plugins/emoji/public/images/unicode/2754.png b/plugins/emoji/public/images/emoji_one/grey_question.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2754.png
rename to plugins/emoji/public/images/emoji_one/grey_question.png
diff --git a/plugins/emoji/public/images/unicode/1f62c.png b/plugins/emoji/public/images/emoji_one/grimacing.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f62c.png
rename to plugins/emoji/public/images/emoji_one/grimacing.png
diff --git a/plugins/emoji/public/images/unicode/1f601.png b/plugins/emoji/public/images/emoji_one/grin.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f601.png
rename to plugins/emoji/public/images/emoji_one/grin.png
diff --git a/plugins/emoji/public/images/unicode/1f600.png b/plugins/emoji/public/images/emoji_one/grinning.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f600.png
rename to plugins/emoji/public/images/emoji_one/grinning.png
diff --git a/plugins/emoji/public/images/unicode/1f482.png b/plugins/emoji/public/images/emoji_one/guardsman.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f482.png
rename to plugins/emoji/public/images/emoji_one/guardsman.png
diff --git a/plugins/emoji/public/images/unicode/1f3b8.png b/plugins/emoji/public/images/emoji_one/guitar.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b8.png
rename to plugins/emoji/public/images/emoji_one/guitar.png
diff --git a/plugins/emoji/public/images/unicode/1f52b.png b/plugins/emoji/public/images/emoji_one/gun.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f52b.png
rename to plugins/emoji/public/images/emoji_one/gun.png
diff --git a/plugins/emoji/public/images/unicode/1f487.png b/plugins/emoji/public/images/emoji_one/haircut.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f487.png
rename to plugins/emoji/public/images/emoji_one/haircut.png
diff --git a/plugins/emoji/public/images/unicode/1f354.png b/plugins/emoji/public/images/emoji_one/hamburger.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f354.png
rename to plugins/emoji/public/images/emoji_one/hamburger.png
diff --git a/plugins/emoji/public/images/unicode/1f528.png b/plugins/emoji/public/images/emoji_one/hammer.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f528.png
rename to plugins/emoji/public/images/emoji_one/hammer.png
diff --git a/plugins/emoji/public/images/unicode/1f439.png b/plugins/emoji/public/images/emoji_one/hamster.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f439.png
rename to plugins/emoji/public/images/emoji_one/hamster.png
diff --git a/plugins/emoji/public/images/unicode/270b.png b/plugins/emoji/public/images/emoji_one/hand.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/270b.png
rename to plugins/emoji/public/images/emoji_one/hand.png
diff --git a/plugins/emoji/public/images/unicode/1f45c.png b/plugins/emoji/public/images/emoji_one/handbag.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f45c.png
rename to plugins/emoji/public/images/emoji_one/handbag.png
diff --git a/plugins/emoji/public/images/unicode/1f4a9.png b/plugins/emoji/public/images/emoji_one/hankey.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a9.png
rename to plugins/emoji/public/images/emoji_one/hankey.png
diff --git a/plugins/emoji/public/images/unicode/0023-20E3.png b/plugins/emoji/public/images/emoji_one/hash.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0023-20E3.png
rename to plugins/emoji/public/images/emoji_one/hash.png
diff --git a/plugins/emoji/public/images/unicode/1f425.png b/plugins/emoji/public/images/emoji_one/hatched_chick.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f425.png
rename to plugins/emoji/public/images/emoji_one/hatched_chick.png
diff --git a/plugins/emoji/public/images/unicode/1f423.png b/plugins/emoji/public/images/emoji_one/hatching_chick.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f423.png
rename to plugins/emoji/public/images/emoji_one/hatching_chick.png
diff --git a/plugins/emoji/public/images/unicode/1f3a7.png b/plugins/emoji/public/images/emoji_one/headphones.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a7.png
rename to plugins/emoji/public/images/emoji_one/headphones.png
diff --git a/plugins/emoji/public/images/unicode/1f649.png b/plugins/emoji/public/images/emoji_one/hear_no_evil.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f649.png
rename to plugins/emoji/public/images/emoji_one/hear_no_evil.png
diff --git a/plugins/emoji/public/images/unicode/2764.png b/plugins/emoji/public/images/emoji_one/heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2764.png
rename to plugins/emoji/public/images/emoji_one/heart.png
diff --git a/plugins/emoji/public/images/unicode/1f49f.png b/plugins/emoji/public/images/emoji_one/heart_decoration.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f49f.png
rename to plugins/emoji/public/images/emoji_one/heart_decoration.png
diff --git a/plugins/emoji/public/images/unicode/1f60d.png b/plugins/emoji/public/images/emoji_one/heart_eyes.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f60d.png
rename to plugins/emoji/public/images/emoji_one/heart_eyes.png
diff --git a/plugins/emoji/public/images/unicode/1f63b.png b/plugins/emoji/public/images/emoji_one/heart_eyes_cat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f63b.png
rename to plugins/emoji/public/images/emoji_one/heart_eyes_cat.png
diff --git a/plugins/emoji/public/images/unicode/1f493.png b/plugins/emoji/public/images/emoji_one/heartbeat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f493.png
rename to plugins/emoji/public/images/emoji_one/heartbeat.png
diff --git a/plugins/emoji/public/images/unicode/1f497.png b/plugins/emoji/public/images/emoji_one/heartpulse.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f497.png
rename to plugins/emoji/public/images/emoji_one/heartpulse.png
diff --git a/plugins/emoji/public/images/unicode/2665.png b/plugins/emoji/public/images/emoji_one/hearts.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2665.png
rename to plugins/emoji/public/images/emoji_one/hearts.png
diff --git a/plugins/emoji/public/images/unicode/2714.png b/plugins/emoji/public/images/emoji_one/heavy_check_mark.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2714.png
rename to plugins/emoji/public/images/emoji_one/heavy_check_mark.png
diff --git a/plugins/emoji/public/images/unicode/2797.png b/plugins/emoji/public/images/emoji_one/heavy_division_sign.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2797.png
rename to plugins/emoji/public/images/emoji_one/heavy_division_sign.png
diff --git a/plugins/emoji/public/images/unicode/1f4b2.png b/plugins/emoji/public/images/emoji_one/heavy_dollar_sign.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b2.png
rename to plugins/emoji/public/images/emoji_one/heavy_dollar_sign.png
diff --git a/plugins/emoji/public/images/emoji_one/heavy_exclamation_mark.png b/plugins/emoji/public/images/emoji_one/heavy_exclamation_mark.png
new file mode 100644
index 0000000000..9391f2bea9
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/heavy_exclamation_mark.png differ
diff --git a/plugins/emoji/public/images/unicode/2796.png b/plugins/emoji/public/images/emoji_one/heavy_minus_sign.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2796.png
rename to plugins/emoji/public/images/emoji_one/heavy_minus_sign.png
diff --git a/plugins/emoji/public/images/unicode/2716.png b/plugins/emoji/public/images/emoji_one/heavy_multiplication_x.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2716.png
rename to plugins/emoji/public/images/emoji_one/heavy_multiplication_x.png
diff --git a/plugins/emoji/public/images/unicode/2795.png b/plugins/emoji/public/images/emoji_one/heavy_plus_sign.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2795.png
rename to plugins/emoji/public/images/emoji_one/heavy_plus_sign.png
diff --git a/plugins/emoji/public/images/unicode/1f681.png b/plugins/emoji/public/images/emoji_one/helicopter.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f681.png
rename to plugins/emoji/public/images/emoji_one/helicopter.png
diff --git a/plugins/emoji/public/images/unicode/1f33f.png b/plugins/emoji/public/images/emoji_one/herb.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f33f.png
rename to plugins/emoji/public/images/emoji_one/herb.png
diff --git a/plugins/emoji/public/images/unicode/1f33a.png b/plugins/emoji/public/images/emoji_one/hibiscus.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f33a.png
rename to plugins/emoji/public/images/emoji_one/hibiscus.png
diff --git a/plugins/emoji/public/images/unicode/1f506.png b/plugins/emoji/public/images/emoji_one/high_brightness.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f506.png
rename to plugins/emoji/public/images/emoji_one/high_brightness.png
diff --git a/plugins/emoji/public/images/unicode/1f460.png b/plugins/emoji/public/images/emoji_one/high_heel.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f460.png
rename to plugins/emoji/public/images/emoji_one/high_heel.png
diff --git a/plugins/emoji/public/images/unicode/1f52a.png b/plugins/emoji/public/images/emoji_one/hocho.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f52a.png
rename to plugins/emoji/public/images/emoji_one/hocho.png
diff --git a/plugins/emoji/public/images/unicode/1f36f.png b/plugins/emoji/public/images/emoji_one/honey_pot.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f36f.png
rename to plugins/emoji/public/images/emoji_one/honey_pot.png
diff --git a/plugins/emoji/public/images/emoji_one/honeybee.png b/plugins/emoji/public/images/emoji_one/honeybee.png
new file mode 100644
index 0000000000..c80d7c8680
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/honeybee.png differ
diff --git a/plugins/emoji/public/images/unicode/1f434.png b/plugins/emoji/public/images/emoji_one/horse.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f434.png
rename to plugins/emoji/public/images/emoji_one/horse.png
diff --git a/plugins/emoji/public/images/unicode/1f3c7.png b/plugins/emoji/public/images/emoji_one/horse_racing.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3c7.png
rename to plugins/emoji/public/images/emoji_one/horse_racing.png
diff --git a/plugins/emoji/public/images/unicode/1f3e5.png b/plugins/emoji/public/images/emoji_one/hospital.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e5.png
rename to plugins/emoji/public/images/emoji_one/hospital.png
diff --git a/plugins/emoji/public/images/unicode/1f3e8.png b/plugins/emoji/public/images/emoji_one/hotel.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e8.png
rename to plugins/emoji/public/images/emoji_one/hotel.png
diff --git a/plugins/emoji/public/images/unicode/2668.png b/plugins/emoji/public/images/emoji_one/hotsprings.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2668.png
rename to plugins/emoji/public/images/emoji_one/hotsprings.png
diff --git a/plugins/emoji/public/images/unicode/231b.png b/plugins/emoji/public/images/emoji_one/hourglass.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/231b.png
rename to plugins/emoji/public/images/emoji_one/hourglass.png
diff --git a/plugins/emoji/public/images/unicode/23f3.png b/plugins/emoji/public/images/emoji_one/hourglass_flowing_sand.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/23f3.png
rename to plugins/emoji/public/images/emoji_one/hourglass_flowing_sand.png
diff --git a/plugins/emoji/public/images/unicode/1f3e0.png b/plugins/emoji/public/images/emoji_one/house.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e0.png
rename to plugins/emoji/public/images/emoji_one/house.png
diff --git a/plugins/emoji/public/images/unicode/1f3e1.png b/plugins/emoji/public/images/emoji_one/house_with_garden.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e1.png
rename to plugins/emoji/public/images/emoji_one/house_with_garden.png
diff --git a/plugins/emoji/public/images/unicode/1f62f.png b/plugins/emoji/public/images/emoji_one/hushed.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f62f.png
rename to plugins/emoji/public/images/emoji_one/hushed.png
diff --git a/plugins/emoji/public/images/unicode/1f368.png b/plugins/emoji/public/images/emoji_one/ice_cream.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f368.png
rename to plugins/emoji/public/images/emoji_one/ice_cream.png
diff --git a/plugins/emoji/public/images/unicode/1f366.png b/plugins/emoji/public/images/emoji_one/icecream.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f366.png
rename to plugins/emoji/public/images/emoji_one/icecream.png
diff --git a/plugins/emoji/public/images/unicode/1f194.png b/plugins/emoji/public/images/emoji_one/id.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f194.png
rename to plugins/emoji/public/images/emoji_one/id.png
diff --git a/plugins/emoji/public/images/unicode/1f250.png b/plugins/emoji/public/images/emoji_one/ideograph_advantage.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f250.png
rename to plugins/emoji/public/images/emoji_one/ideograph_advantage.png
diff --git a/plugins/emoji/public/images/unicode/1f47f.png b/plugins/emoji/public/images/emoji_one/imp.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f47f.png
rename to plugins/emoji/public/images/emoji_one/imp.png
diff --git a/plugins/emoji/public/images/unicode/1f4e5.png b/plugins/emoji/public/images/emoji_one/inbox_tray.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e5.png
rename to plugins/emoji/public/images/emoji_one/inbox_tray.png
diff --git a/plugins/emoji/public/images/unicode/1f4e8.png b/plugins/emoji/public/images/emoji_one/incoming_envelope.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e8.png
rename to plugins/emoji/public/images/emoji_one/incoming_envelope.png
diff --git a/plugins/emoji/public/images/unicode/1f481.png b/plugins/emoji/public/images/emoji_one/information_desk_person.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f481.png
rename to plugins/emoji/public/images/emoji_one/information_desk_person.png
diff --git a/plugins/emoji/public/images/unicode/2139.png b/plugins/emoji/public/images/emoji_one/information_source.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2139.png
rename to plugins/emoji/public/images/emoji_one/information_source.png
diff --git a/plugins/emoji/public/images/unicode/1f607.png b/plugins/emoji/public/images/emoji_one/innocent.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f607.png
rename to plugins/emoji/public/images/emoji_one/innocent.png
diff --git a/plugins/emoji/public/images/unicode/2049.png b/plugins/emoji/public/images/emoji_one/interrobang.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2049.png
rename to plugins/emoji/public/images/emoji_one/interrobang.png
diff --git a/plugins/emoji/public/images/unicode/1f4f1.png b/plugins/emoji/public/images/emoji_one/iphone.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4f1.png
rename to plugins/emoji/public/images/emoji_one/iphone.png
diff --git a/plugins/emoji/public/images/emoji_one/it.png b/plugins/emoji/public/images/emoji_one/it.png
new file mode 100644
index 0000000000..bce0623505
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/it.png differ
diff --git a/plugins/emoji/public/images/unicode/1f3ee.png b/plugins/emoji/public/images/emoji_one/izakaya_lantern.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ee.png
rename to plugins/emoji/public/images/emoji_one/izakaya_lantern.png
diff --git a/plugins/emoji/public/images/unicode/1f383.png b/plugins/emoji/public/images/emoji_one/jack_o_lantern.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f383.png
rename to plugins/emoji/public/images/emoji_one/jack_o_lantern.png
diff --git a/plugins/emoji/public/images/unicode/1f5fe.png b/plugins/emoji/public/images/emoji_one/japan.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f5fe.png
rename to plugins/emoji/public/images/emoji_one/japan.png
diff --git a/plugins/emoji/public/images/unicode/1f3ef.png b/plugins/emoji/public/images/emoji_one/japanese_castle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ef.png
rename to plugins/emoji/public/images/emoji_one/japanese_castle.png
diff --git a/plugins/emoji/public/images/unicode/1f47a.png b/plugins/emoji/public/images/emoji_one/japanese_goblin.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f47a.png
rename to plugins/emoji/public/images/emoji_one/japanese_goblin.png
diff --git a/plugins/emoji/public/images/unicode/1f479.png b/plugins/emoji/public/images/emoji_one/japanese_ogre.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f479.png
rename to plugins/emoji/public/images/emoji_one/japanese_ogre.png
diff --git a/plugins/emoji/public/images/unicode/1f456.png b/plugins/emoji/public/images/emoji_one/jeans.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f456.png
rename to plugins/emoji/public/images/emoji_one/jeans.png
diff --git a/plugins/emoji/public/images/unicode/1f602.png b/plugins/emoji/public/images/emoji_one/joy.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f602.png
rename to plugins/emoji/public/images/emoji_one/joy.png
diff --git a/plugins/emoji/public/images/unicode/1f639.png b/plugins/emoji/public/images/emoji_one/joy_cat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f639.png
rename to plugins/emoji/public/images/emoji_one/joy_cat.png
diff --git a/plugins/emoji/public/images/emoji_one/jp.png b/plugins/emoji/public/images/emoji_one/jp.png
new file mode 100644
index 0000000000..5f779898b2
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/jp.png differ
diff --git a/plugins/emoji/public/images/unicode/1f511.png b/plugins/emoji/public/images/emoji_one/key.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f511.png
rename to plugins/emoji/public/images/emoji_one/key.png
diff --git a/plugins/emoji/public/images/unicode/1f51f.png b/plugins/emoji/public/images/emoji_one/keycap_ten.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f51f.png
rename to plugins/emoji/public/images/emoji_one/keycap_ten.png
diff --git a/plugins/emoji/public/images/unicode/1f458.png b/plugins/emoji/public/images/emoji_one/kimono.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f458.png
rename to plugins/emoji/public/images/emoji_one/kimono.png
diff --git a/plugins/emoji/public/images/unicode/1f48b.png b/plugins/emoji/public/images/emoji_one/kiss.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f48b.png
rename to plugins/emoji/public/images/emoji_one/kiss.png
diff --git a/plugins/emoji/public/images/unicode/1f617.png b/plugins/emoji/public/images/emoji_one/kissing.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f617.png
rename to plugins/emoji/public/images/emoji_one/kissing.png
diff --git a/plugins/emoji/public/images/unicode/1f63d.png b/plugins/emoji/public/images/emoji_one/kissing_cat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f63d.png
rename to plugins/emoji/public/images/emoji_one/kissing_cat.png
diff --git a/plugins/emoji/public/images/unicode/1f61a.png b/plugins/emoji/public/images/emoji_one/kissing_closed_eyes.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f61a.png
rename to plugins/emoji/public/images/emoji_one/kissing_closed_eyes.png
diff --git a/plugins/emoji/public/images/unicode/1f618.png b/plugins/emoji/public/images/emoji_one/kissing_heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f618.png
rename to plugins/emoji/public/images/emoji_one/kissing_heart.png
diff --git a/plugins/emoji/public/images/unicode/1f619.png b/plugins/emoji/public/images/emoji_one/kissing_smiling_eyes.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f619.png
rename to plugins/emoji/public/images/emoji_one/kissing_smiling_eyes.png
diff --git a/plugins/emoji/public/images/emoji_one/knife.png b/plugins/emoji/public/images/emoji_one/knife.png
new file mode 100644
index 0000000000..9646552838
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/knife.png differ
diff --git a/plugins/emoji/public/images/unicode/1f428.png b/plugins/emoji/public/images/emoji_one/koala.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f428.png
rename to plugins/emoji/public/images/emoji_one/koala.png
diff --git a/plugins/emoji/public/images/emoji_one/koko.png b/plugins/emoji/public/images/emoji_one/koko.png
new file mode 100644
index 0000000000..19de1ec7df
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/koko.png differ
diff --git a/plugins/emoji/public/images/emoji_one/kr.png b/plugins/emoji/public/images/emoji_one/kr.png
new file mode 100644
index 0000000000..f4f14acc0f
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/kr.png differ
diff --git a/plugins/emoji/public/images/emoji_one/lantern.png b/plugins/emoji/public/images/emoji_one/lantern.png
new file mode 100644
index 0000000000..3ec1679f3b
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/lantern.png differ
diff --git a/plugins/emoji/public/images/unicode/1f535.png b/plugins/emoji/public/images/emoji_one/large_blue_circle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f535.png
rename to plugins/emoji/public/images/emoji_one/large_blue_circle.png
diff --git a/plugins/emoji/public/images/unicode/1f537.png b/plugins/emoji/public/images/emoji_one/large_blue_diamond.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f537.png
rename to plugins/emoji/public/images/emoji_one/large_blue_diamond.png
diff --git a/plugins/emoji/public/images/unicode/1f536.png b/plugins/emoji/public/images/emoji_one/large_orange_diamond.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f536.png
rename to plugins/emoji/public/images/emoji_one/large_orange_diamond.png
diff --git a/plugins/emoji/public/images/unicode/1f317.png b/plugins/emoji/public/images/emoji_one/last_quarter_moon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f317.png
rename to plugins/emoji/public/images/emoji_one/last_quarter_moon.png
diff --git a/plugins/emoji/public/images/unicode/1f31c.png b/plugins/emoji/public/images/emoji_one/last_quarter_moon_with_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f31c.png
rename to plugins/emoji/public/images/emoji_one/last_quarter_moon_with_face.png
diff --git a/plugins/emoji/public/images/unicode/1f606.png b/plugins/emoji/public/images/emoji_one/laughing.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f606.png
rename to plugins/emoji/public/images/emoji_one/laughing.png
diff --git a/plugins/emoji/public/images/unicode/1f343.png b/plugins/emoji/public/images/emoji_one/leaves.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f343.png
rename to plugins/emoji/public/images/emoji_one/leaves.png
diff --git a/plugins/emoji/public/images/unicode/1f4d2.png b/plugins/emoji/public/images/emoji_one/ledger.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d2.png
rename to plugins/emoji/public/images/emoji_one/ledger.png
diff --git a/plugins/emoji/public/images/unicode/1f6c5.png b/plugins/emoji/public/images/emoji_one/left_luggage.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6c5.png
rename to plugins/emoji/public/images/emoji_one/left_luggage.png
diff --git a/plugins/emoji/public/images/unicode/2194.png b/plugins/emoji/public/images/emoji_one/left_right_arrow.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2194.png
rename to plugins/emoji/public/images/emoji_one/left_right_arrow.png
diff --git a/plugins/emoji/public/images/unicode/21a9.png b/plugins/emoji/public/images/emoji_one/leftwards_arrow_with_hook.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/21a9.png
rename to plugins/emoji/public/images/emoji_one/leftwards_arrow_with_hook.png
diff --git a/plugins/emoji/public/images/unicode/1f34b.png b/plugins/emoji/public/images/emoji_one/lemon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f34b.png
rename to plugins/emoji/public/images/emoji_one/lemon.png
diff --git a/plugins/emoji/public/images/unicode/264c.png b/plugins/emoji/public/images/emoji_one/leo.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/264c.png
rename to plugins/emoji/public/images/emoji_one/leo.png
diff --git a/plugins/emoji/public/images/unicode/1f406.png b/plugins/emoji/public/images/emoji_one/leopard.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f406.png
rename to plugins/emoji/public/images/emoji_one/leopard.png
diff --git a/plugins/emoji/public/images/unicode/264e.png b/plugins/emoji/public/images/emoji_one/libra.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/264e.png
rename to plugins/emoji/public/images/emoji_one/libra.png
diff --git a/plugins/emoji/public/images/unicode/1f688.png b/plugins/emoji/public/images/emoji_one/light_rail.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f688.png
rename to plugins/emoji/public/images/emoji_one/light_rail.png
diff --git a/plugins/emoji/public/images/unicode/1f517.png b/plugins/emoji/public/images/emoji_one/link.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f517.png
rename to plugins/emoji/public/images/emoji_one/link.png
diff --git a/plugins/emoji/public/images/unicode/1f444.png b/plugins/emoji/public/images/emoji_one/lips.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f444.png
rename to plugins/emoji/public/images/emoji_one/lips.png
diff --git a/plugins/emoji/public/images/unicode/1f484.png b/plugins/emoji/public/images/emoji_one/lipstick.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f484.png
rename to plugins/emoji/public/images/emoji_one/lipstick.png
diff --git a/plugins/emoji/public/images/unicode/1f512.png b/plugins/emoji/public/images/emoji_one/lock.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f512.png
rename to plugins/emoji/public/images/emoji_one/lock.png
diff --git a/plugins/emoji/public/images/unicode/1f50f.png b/plugins/emoji/public/images/emoji_one/lock_with_ink_pen.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f50f.png
rename to plugins/emoji/public/images/emoji_one/lock_with_ink_pen.png
diff --git a/plugins/emoji/public/images/unicode/1f36d.png b/plugins/emoji/public/images/emoji_one/lollipop.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f36d.png
rename to plugins/emoji/public/images/emoji_one/lollipop.png
diff --git a/plugins/emoji/public/images/unicode/27bf.png b/plugins/emoji/public/images/emoji_one/loop.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/27bf.png
rename to plugins/emoji/public/images/emoji_one/loop.png
diff --git a/plugins/emoji/public/images/unicode/1f50a.png b/plugins/emoji/public/images/emoji_one/loud_sound.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f50a.png
rename to plugins/emoji/public/images/emoji_one/loud_sound.png
diff --git a/plugins/emoji/public/images/unicode/1f4e2.png b/plugins/emoji/public/images/emoji_one/loudspeaker.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e2.png
rename to plugins/emoji/public/images/emoji_one/loudspeaker.png
diff --git a/plugins/emoji/public/images/unicode/1f3e9.png b/plugins/emoji/public/images/emoji_one/love_hotel.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e9.png
rename to plugins/emoji/public/images/emoji_one/love_hotel.png
diff --git a/plugins/emoji/public/images/unicode/1f48c.png b/plugins/emoji/public/images/emoji_one/love_letter.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f48c.png
rename to plugins/emoji/public/images/emoji_one/love_letter.png
diff --git a/plugins/emoji/public/images/unicode/1f505.png b/plugins/emoji/public/images/emoji_one/low_brightness.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f505.png
rename to plugins/emoji/public/images/emoji_one/low_brightness.png
diff --git a/plugins/emoji/public/images/unicode/24c2.png b/plugins/emoji/public/images/emoji_one/m.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/24c2.png
rename to plugins/emoji/public/images/emoji_one/m.png
diff --git a/plugins/emoji/public/images/unicode/1f50d.png b/plugins/emoji/public/images/emoji_one/mag.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f50d.png
rename to plugins/emoji/public/images/emoji_one/mag.png
diff --git a/plugins/emoji/public/images/unicode/1f50e.png b/plugins/emoji/public/images/emoji_one/mag_right.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f50e.png
rename to plugins/emoji/public/images/emoji_one/mag_right.png
diff --git a/plugins/emoji/public/images/unicode/1f004.png b/plugins/emoji/public/images/emoji_one/mahjong.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f004.png
rename to plugins/emoji/public/images/emoji_one/mahjong.png
diff --git a/plugins/emoji/public/images/unicode/1f4eb.png b/plugins/emoji/public/images/emoji_one/mailbox.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4eb.png
rename to plugins/emoji/public/images/emoji_one/mailbox.png
diff --git a/plugins/emoji/public/images/unicode/1f4ea.png b/plugins/emoji/public/images/emoji_one/mailbox_closed.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ea.png
rename to plugins/emoji/public/images/emoji_one/mailbox_closed.png
diff --git a/plugins/emoji/public/images/unicode/1f4ec.png b/plugins/emoji/public/images/emoji_one/mailbox_with_mail.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ec.png
rename to plugins/emoji/public/images/emoji_one/mailbox_with_mail.png
diff --git a/plugins/emoji/public/images/unicode/1f4ed.png b/plugins/emoji/public/images/emoji_one/mailbox_with_no_mail.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ed.png
rename to plugins/emoji/public/images/emoji_one/mailbox_with_no_mail.png
diff --git a/plugins/emoji/public/images/unicode/1f468.png b/plugins/emoji/public/images/emoji_one/man.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f468.png
rename to plugins/emoji/public/images/emoji_one/man.png
diff --git a/plugins/emoji/public/images/unicode/1f472.png b/plugins/emoji/public/images/emoji_one/man_with_gua_pi_mao.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f472.png
rename to plugins/emoji/public/images/emoji_one/man_with_gua_pi_mao.png
diff --git a/plugins/emoji/public/images/unicode/1f473.png b/plugins/emoji/public/images/emoji_one/man_with_turban.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f473.png
rename to plugins/emoji/public/images/emoji_one/man_with_turban.png
diff --git a/plugins/emoji/public/images/unicode/1f45e.png b/plugins/emoji/public/images/emoji_one/mans_shoe.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f45e.png
rename to plugins/emoji/public/images/emoji_one/mans_shoe.png
diff --git a/plugins/emoji/public/images/unicode/1f341.png b/plugins/emoji/public/images/emoji_one/maple_leaf.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f341.png
rename to plugins/emoji/public/images/emoji_one/maple_leaf.png
diff --git a/plugins/emoji/public/images/unicode/1f637.png b/plugins/emoji/public/images/emoji_one/mask.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f637.png
rename to plugins/emoji/public/images/emoji_one/mask.png
diff --git a/plugins/emoji/public/images/unicode/1f486.png b/plugins/emoji/public/images/emoji_one/massage.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f486.png
rename to plugins/emoji/public/images/emoji_one/massage.png
diff --git a/plugins/emoji/public/images/unicode/1f356.png b/plugins/emoji/public/images/emoji_one/meat_on_bone.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f356.png
rename to plugins/emoji/public/images/emoji_one/meat_on_bone.png
diff --git a/plugins/emoji/public/images/unicode/1f4e3.png b/plugins/emoji/public/images/emoji_one/mega.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e3.png
rename to plugins/emoji/public/images/emoji_one/mega.png
diff --git a/plugins/emoji/public/images/unicode/1f348.png b/plugins/emoji/public/images/emoji_one/melon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f348.png
rename to plugins/emoji/public/images/emoji_one/melon.png
diff --git a/plugins/emoji/public/images/unicode/1f4dd.png b/plugins/emoji/public/images/emoji_one/memo.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4dd.png
rename to plugins/emoji/public/images/emoji_one/memo.png
diff --git a/plugins/emoji/public/images/unicode/1f6b9.png b/plugins/emoji/public/images/emoji_one/mens.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b9.png
rename to plugins/emoji/public/images/emoji_one/mens.png
diff --git a/plugins/emoji/public/images/unicode/1f687.png b/plugins/emoji/public/images/emoji_one/metro.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f687.png
rename to plugins/emoji/public/images/emoji_one/metro.png
diff --git a/plugins/emoji/public/images/unicode/1f3a4.png b/plugins/emoji/public/images/emoji_one/microphone.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a4.png
rename to plugins/emoji/public/images/emoji_one/microphone.png
diff --git a/plugins/emoji/public/images/unicode/1f52c.png b/plugins/emoji/public/images/emoji_one/microscope.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f52c.png
rename to plugins/emoji/public/images/emoji_one/microscope.png
diff --git a/plugins/emoji/public/images/unicode/1f30c.png b/plugins/emoji/public/images/emoji_one/milky_way.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f30c.png
rename to plugins/emoji/public/images/emoji_one/milky_way.png
diff --git a/plugins/emoji/public/images/unicode/1f690.png b/plugins/emoji/public/images/emoji_one/minibus.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f690.png
rename to plugins/emoji/public/images/emoji_one/minibus.png
diff --git a/plugins/emoji/public/images/unicode/1f4bd.png b/plugins/emoji/public/images/emoji_one/minidisc.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4bd.png
rename to plugins/emoji/public/images/emoji_one/minidisc.png
diff --git a/plugins/emoji/public/images/unicode/1f4f4.png b/plugins/emoji/public/images/emoji_one/mobile_phone_off.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4f4.png
rename to plugins/emoji/public/images/emoji_one/mobile_phone_off.png
diff --git a/plugins/emoji/public/images/unicode/1f4b8.png b/plugins/emoji/public/images/emoji_one/money_with_wings.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b8.png
rename to plugins/emoji/public/images/emoji_one/money_with_wings.png
diff --git a/plugins/emoji/public/images/unicode/1f4b0.png b/plugins/emoji/public/images/emoji_one/moneybag.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b0.png
rename to plugins/emoji/public/images/emoji_one/moneybag.png
diff --git a/plugins/emoji/public/images/unicode/1f412.png b/plugins/emoji/public/images/emoji_one/monkey.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f412.png
rename to plugins/emoji/public/images/emoji_one/monkey.png
diff --git a/plugins/emoji/public/images/unicode/1f435.png b/plugins/emoji/public/images/emoji_one/monkey_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f435.png
rename to plugins/emoji/public/images/emoji_one/monkey_face.png
diff --git a/plugins/emoji/public/images/unicode/1f69d.png b/plugins/emoji/public/images/emoji_one/monorail.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f69d.png
rename to plugins/emoji/public/images/emoji_one/monorail.png
diff --git a/plugins/emoji/public/images/unicode/1f314.png b/plugins/emoji/public/images/emoji_one/moon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f314.png
rename to plugins/emoji/public/images/emoji_one/moon.png
diff --git a/plugins/emoji/public/images/unicode/1f393.png b/plugins/emoji/public/images/emoji_one/mortar_board.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f393.png
rename to plugins/emoji/public/images/emoji_one/mortar_board.png
diff --git a/plugins/emoji/public/images/unicode/1f5fb.png b/plugins/emoji/public/images/emoji_one/mount_fuji.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f5fb.png
rename to plugins/emoji/public/images/emoji_one/mount_fuji.png
diff --git a/plugins/emoji/public/images/unicode/1f6b5.png b/plugins/emoji/public/images/emoji_one/mountain_bicyclist.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b5.png
rename to plugins/emoji/public/images/emoji_one/mountain_bicyclist.png
diff --git a/plugins/emoji/public/images/unicode/1f6a0.png b/plugins/emoji/public/images/emoji_one/mountain_cableway.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a0.png
rename to plugins/emoji/public/images/emoji_one/mountain_cableway.png
diff --git a/plugins/emoji/public/images/unicode/1f69e.png b/plugins/emoji/public/images/emoji_one/mountain_railway.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f69e.png
rename to plugins/emoji/public/images/emoji_one/mountain_railway.png
diff --git a/plugins/emoji/public/images/unicode/1f42d.png b/plugins/emoji/public/images/emoji_one/mouse.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f42d.png
rename to plugins/emoji/public/images/emoji_one/mouse.png
diff --git a/plugins/emoji/public/images/unicode/1f401.png b/plugins/emoji/public/images/emoji_one/mouse2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f401.png
rename to plugins/emoji/public/images/emoji_one/mouse2.png
diff --git a/plugins/emoji/public/images/unicode/1f3a5.png b/plugins/emoji/public/images/emoji_one/movie_camera.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a5.png
rename to plugins/emoji/public/images/emoji_one/movie_camera.png
diff --git a/plugins/emoji/public/images/unicode/1f5ff.png b/plugins/emoji/public/images/emoji_one/moyai.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f5ff.png
rename to plugins/emoji/public/images/emoji_one/moyai.png
diff --git a/plugins/emoji/public/images/unicode/1f4aa.png b/plugins/emoji/public/images/emoji_one/muscle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4aa.png
rename to plugins/emoji/public/images/emoji_one/muscle.png
diff --git a/plugins/emoji/public/images/unicode/1f344.png b/plugins/emoji/public/images/emoji_one/mushroom.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f344.png
rename to plugins/emoji/public/images/emoji_one/mushroom.png
diff --git a/plugins/emoji/public/images/unicode/1f3b9.png b/plugins/emoji/public/images/emoji_one/musical_keyboard.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b9.png
rename to plugins/emoji/public/images/emoji_one/musical_keyboard.png
diff --git a/plugins/emoji/public/images/unicode/1f3b5.png b/plugins/emoji/public/images/emoji_one/musical_note.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b5.png
rename to plugins/emoji/public/images/emoji_one/musical_note.png
diff --git a/plugins/emoji/public/images/unicode/1f3bc.png b/plugins/emoji/public/images/emoji_one/musical_score.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3bc.png
rename to plugins/emoji/public/images/emoji_one/musical_score.png
diff --git a/plugins/emoji/public/images/unicode/1f507.png b/plugins/emoji/public/images/emoji_one/mute.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f507.png
rename to plugins/emoji/public/images/emoji_one/mute.png
diff --git a/plugins/emoji/public/images/unicode/1f485.png b/plugins/emoji/public/images/emoji_one/nail_care.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f485.png
rename to plugins/emoji/public/images/emoji_one/nail_care.png
diff --git a/plugins/emoji/public/images/unicode/1f4db.png b/plugins/emoji/public/images/emoji_one/name_badge.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4db.png
rename to plugins/emoji/public/images/emoji_one/name_badge.png
diff --git a/plugins/emoji/public/images/unicode/1f454.png b/plugins/emoji/public/images/emoji_one/necktie.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f454.png
rename to plugins/emoji/public/images/emoji_one/necktie.png
diff --git a/plugins/emoji/public/images/unicode/274e.png b/plugins/emoji/public/images/emoji_one/negative_squared_cross_mark.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/274e.png
rename to plugins/emoji/public/images/emoji_one/negative_squared_cross_mark.png
diff --git a/plugins/emoji/public/images/unicode/1f610.png b/plugins/emoji/public/images/emoji_one/neutral_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f610.png
rename to plugins/emoji/public/images/emoji_one/neutral_face.png
diff --git a/plugins/emoji/public/images/unicode/1f195.png b/plugins/emoji/public/images/emoji_one/new.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f195.png
rename to plugins/emoji/public/images/emoji_one/new.png
diff --git a/plugins/emoji/public/images/unicode/1f311.png b/plugins/emoji/public/images/emoji_one/new_moon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f311.png
rename to plugins/emoji/public/images/emoji_one/new_moon.png
diff --git a/plugins/emoji/public/images/unicode/1f31a.png b/plugins/emoji/public/images/emoji_one/new_moon_with_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f31a.png
rename to plugins/emoji/public/images/emoji_one/new_moon_with_face.png
diff --git a/plugins/emoji/public/images/unicode/1f4f0.png b/plugins/emoji/public/images/emoji_one/newspaper.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4f0.png
rename to plugins/emoji/public/images/emoji_one/newspaper.png
diff --git a/plugins/emoji/public/images/unicode/1f196.png b/plugins/emoji/public/images/emoji_one/ng.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f196.png
rename to plugins/emoji/public/images/emoji_one/ng.png
diff --git a/plugins/emoji/public/images/unicode/1f303.png b/plugins/emoji/public/images/emoji_one/night_with_stars.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f303.png
rename to plugins/emoji/public/images/emoji_one/night_with_stars.png
diff --git a/plugins/emoji/public/images/unicode/0039-20E3.png b/plugins/emoji/public/images/emoji_one/nine.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0039-20E3.png
rename to plugins/emoji/public/images/emoji_one/nine.png
diff --git a/plugins/emoji/public/images/unicode/1f515.png b/plugins/emoji/public/images/emoji_one/no_bell.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f515.png
rename to plugins/emoji/public/images/emoji_one/no_bell.png
diff --git a/plugins/emoji/public/images/unicode/1f6b3.png b/plugins/emoji/public/images/emoji_one/no_bicycles.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b3.png
rename to plugins/emoji/public/images/emoji_one/no_bicycles.png
diff --git a/plugins/emoji/public/images/unicode/26d4.png b/plugins/emoji/public/images/emoji_one/no_entry.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26d4.png
rename to plugins/emoji/public/images/emoji_one/no_entry.png
diff --git a/plugins/emoji/public/images/unicode/1f6ab.png b/plugins/emoji/public/images/emoji_one/no_entry_sign.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6ab.png
rename to plugins/emoji/public/images/emoji_one/no_entry_sign.png
diff --git a/plugins/emoji/public/images/unicode/1f645.png b/plugins/emoji/public/images/emoji_one/no_good.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f645.png
rename to plugins/emoji/public/images/emoji_one/no_good.png
diff --git a/plugins/emoji/public/images/unicode/1f4f5.png b/plugins/emoji/public/images/emoji_one/no_mobile_phones.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4f5.png
rename to plugins/emoji/public/images/emoji_one/no_mobile_phones.png
diff --git a/plugins/emoji/public/images/unicode/1f636.png b/plugins/emoji/public/images/emoji_one/no_mouth.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f636.png
rename to plugins/emoji/public/images/emoji_one/no_mouth.png
diff --git a/plugins/emoji/public/images/unicode/1f6b7.png b/plugins/emoji/public/images/emoji_one/no_pedestrians.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b7.png
rename to plugins/emoji/public/images/emoji_one/no_pedestrians.png
diff --git a/plugins/emoji/public/images/unicode/1f6ad.png b/plugins/emoji/public/images/emoji_one/no_smoking.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6ad.png
rename to plugins/emoji/public/images/emoji_one/no_smoking.png
diff --git a/plugins/emoji/public/images/unicode/1f6b1.png b/plugins/emoji/public/images/emoji_one/non-potable_water.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b1.png
rename to plugins/emoji/public/images/emoji_one/non-potable_water.png
diff --git a/plugins/emoji/public/images/unicode/1f443.png b/plugins/emoji/public/images/emoji_one/nose.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f443.png
rename to plugins/emoji/public/images/emoji_one/nose.png
diff --git a/plugins/emoji/public/images/unicode/1f4d3.png b/plugins/emoji/public/images/emoji_one/notebook.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d3.png
rename to plugins/emoji/public/images/emoji_one/notebook.png
diff --git a/plugins/emoji/public/images/unicode/1f4d4.png b/plugins/emoji/public/images/emoji_one/notebook_with_decorative_cover.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d4.png
rename to plugins/emoji/public/images/emoji_one/notebook_with_decorative_cover.png
diff --git a/plugins/emoji/public/images/unicode/1f3b6.png b/plugins/emoji/public/images/emoji_one/notes.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b6.png
rename to plugins/emoji/public/images/emoji_one/notes.png
diff --git a/plugins/emoji/public/images/unicode/1f529.png b/plugins/emoji/public/images/emoji_one/nut_and_bolt.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f529.png
rename to plugins/emoji/public/images/emoji_one/nut_and_bolt.png
diff --git a/plugins/emoji/public/images/unicode/2b55.png b/plugins/emoji/public/images/emoji_one/o.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2b55.png
rename to plugins/emoji/public/images/emoji_one/o.png
diff --git a/plugins/emoji/public/images/unicode/1f17e.png b/plugins/emoji/public/images/emoji_one/o2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f17e.png
rename to plugins/emoji/public/images/emoji_one/o2.png
diff --git a/plugins/emoji/public/images/unicode/1f30a.png b/plugins/emoji/public/images/emoji_one/ocean.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f30a.png
rename to plugins/emoji/public/images/emoji_one/ocean.png
diff --git a/plugins/emoji/public/images/unicode/1f419.png b/plugins/emoji/public/images/emoji_one/octopus.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f419.png
rename to plugins/emoji/public/images/emoji_one/octopus.png
diff --git a/plugins/emoji/public/images/unicode/1f362.png b/plugins/emoji/public/images/emoji_one/oden.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f362.png
rename to plugins/emoji/public/images/emoji_one/oden.png
diff --git a/plugins/emoji/public/images/unicode/1f3e2.png b/plugins/emoji/public/images/emoji_one/office.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e2.png
rename to plugins/emoji/public/images/emoji_one/office.png
diff --git a/plugins/emoji/public/images/unicode/1f197.png b/plugins/emoji/public/images/emoji_one/ok.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f197.png
rename to plugins/emoji/public/images/emoji_one/ok.png
diff --git a/plugins/emoji/public/images/unicode/1f44c.png b/plugins/emoji/public/images/emoji_one/ok_hand.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f44c.png
rename to plugins/emoji/public/images/emoji_one/ok_hand.png
diff --git a/plugins/emoji/public/images/unicode/1f646.png b/plugins/emoji/public/images/emoji_one/ok_woman.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f646.png
rename to plugins/emoji/public/images/emoji_one/ok_woman.png
diff --git a/plugins/emoji/public/images/unicode/1f474.png b/plugins/emoji/public/images/emoji_one/older_man.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f474.png
rename to plugins/emoji/public/images/emoji_one/older_man.png
diff --git a/plugins/emoji/public/images/unicode/1f475.png b/plugins/emoji/public/images/emoji_one/older_woman.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f475.png
rename to plugins/emoji/public/images/emoji_one/older_woman.png
diff --git a/plugins/emoji/public/images/unicode/1f51b.png b/plugins/emoji/public/images/emoji_one/on.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f51b.png
rename to plugins/emoji/public/images/emoji_one/on.png
diff --git a/plugins/emoji/public/images/unicode/1f698.png b/plugins/emoji/public/images/emoji_one/oncoming_automobile.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f698.png
rename to plugins/emoji/public/images/emoji_one/oncoming_automobile.png
diff --git a/plugins/emoji/public/images/unicode/1f68d.png b/plugins/emoji/public/images/emoji_one/oncoming_bus.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f68d.png
rename to plugins/emoji/public/images/emoji_one/oncoming_bus.png
diff --git a/plugins/emoji/public/images/unicode/1f694.png b/plugins/emoji/public/images/emoji_one/oncoming_police_car.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f694.png
rename to plugins/emoji/public/images/emoji_one/oncoming_police_car.png
diff --git a/plugins/emoji/public/images/unicode/1f696.png b/plugins/emoji/public/images/emoji_one/oncoming_taxi.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f696.png
rename to plugins/emoji/public/images/emoji_one/oncoming_taxi.png
diff --git a/plugins/emoji/public/images/unicode/0031-20E3.png b/plugins/emoji/public/images/emoji_one/one.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0031-20E3.png
rename to plugins/emoji/public/images/emoji_one/one.png
diff --git a/plugins/emoji/public/images/emoji_one/open_book.png b/plugins/emoji/public/images/emoji_one/open_book.png
new file mode 100644
index 0000000000..2b4700f0aa
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/open_book.png differ
diff --git a/plugins/emoji/public/images/unicode/1f4c2.png b/plugins/emoji/public/images/emoji_one/open_file_folder.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c2.png
rename to plugins/emoji/public/images/emoji_one/open_file_folder.png
diff --git a/plugins/emoji/public/images/unicode/1f450.png b/plugins/emoji/public/images/emoji_one/open_hands.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f450.png
rename to plugins/emoji/public/images/emoji_one/open_hands.png
diff --git a/plugins/emoji/public/images/unicode/1f62e.png b/plugins/emoji/public/images/emoji_one/open_mouth.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f62e.png
rename to plugins/emoji/public/images/emoji_one/open_mouth.png
diff --git a/plugins/emoji/public/images/unicode/26ce.png b/plugins/emoji/public/images/emoji_one/ophiuchus.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26ce.png
rename to plugins/emoji/public/images/emoji_one/ophiuchus.png
diff --git a/plugins/emoji/public/images/unicode/1f4d9.png b/plugins/emoji/public/images/emoji_one/orange_book.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d9.png
rename to plugins/emoji/public/images/emoji_one/orange_book.png
diff --git a/plugins/emoji/public/images/unicode/1f4e4.png b/plugins/emoji/public/images/emoji_one/outbox_tray.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e4.png
rename to plugins/emoji/public/images/emoji_one/outbox_tray.png
diff --git a/plugins/emoji/public/images/unicode/1f402.png b/plugins/emoji/public/images/emoji_one/ox.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f402.png
rename to plugins/emoji/public/images/emoji_one/ox.png
diff --git a/plugins/emoji/public/images/unicode/1f4e6.png b/plugins/emoji/public/images/emoji_one/package.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e6.png
rename to plugins/emoji/public/images/emoji_one/package.png
diff --git a/plugins/emoji/public/images/unicode/1f4c4.png b/plugins/emoji/public/images/emoji_one/page_facing_up.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c4.png
rename to plugins/emoji/public/images/emoji_one/page_facing_up.png
diff --git a/plugins/emoji/public/images/unicode/1f4c3.png b/plugins/emoji/public/images/emoji_one/page_with_curl.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4c3.png
rename to plugins/emoji/public/images/emoji_one/page_with_curl.png
diff --git a/plugins/emoji/public/images/unicode/1f4df.png b/plugins/emoji/public/images/emoji_one/pager.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4df.png
rename to plugins/emoji/public/images/emoji_one/pager.png
diff --git a/plugins/emoji/public/images/unicode/1f334.png b/plugins/emoji/public/images/emoji_one/palm_tree.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f334.png
rename to plugins/emoji/public/images/emoji_one/palm_tree.png
diff --git a/plugins/emoji/public/images/unicode/1f43c.png b/plugins/emoji/public/images/emoji_one/panda_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f43c.png
rename to plugins/emoji/public/images/emoji_one/panda_face.png
diff --git a/plugins/emoji/public/images/unicode/1f4ce.png b/plugins/emoji/public/images/emoji_one/paperclip.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ce.png
rename to plugins/emoji/public/images/emoji_one/paperclip.png
diff --git a/plugins/emoji/public/images/unicode/1f17f.png b/plugins/emoji/public/images/emoji_one/parking.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f17f.png
rename to plugins/emoji/public/images/emoji_one/parking.png
diff --git a/plugins/emoji/public/images/unicode/303d.png b/plugins/emoji/public/images/emoji_one/part_alternation_mark.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/303d.png
rename to plugins/emoji/public/images/emoji_one/part_alternation_mark.png
diff --git a/plugins/emoji/public/images/unicode/26c5.png b/plugins/emoji/public/images/emoji_one/partly_sunny.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26c5.png
rename to plugins/emoji/public/images/emoji_one/partly_sunny.png
diff --git a/plugins/emoji/public/images/unicode/1f6c2.png b/plugins/emoji/public/images/emoji_one/passport_control.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6c2.png
rename to plugins/emoji/public/images/emoji_one/passport_control.png
diff --git a/plugins/emoji/public/images/emoji_one/paw_prints.png b/plugins/emoji/public/images/emoji_one/paw_prints.png
new file mode 100644
index 0000000000..18183aff7b
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/paw_prints.png differ
diff --git a/plugins/emoji/public/images/unicode/1f351.png b/plugins/emoji/public/images/emoji_one/peach.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f351.png
rename to plugins/emoji/public/images/emoji_one/peach.png
diff --git a/plugins/emoji/public/images/unicode/1f350.png b/plugins/emoji/public/images/emoji_one/pear.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f350.png
rename to plugins/emoji/public/images/emoji_one/pear.png
diff --git a/plugins/emoji/public/images/emoji_one/pencil.png b/plugins/emoji/public/images/emoji_one/pencil.png
new file mode 100644
index 0000000000..44baeeb987
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/pencil.png differ
diff --git a/plugins/emoji/public/images/unicode/270f.png b/plugins/emoji/public/images/emoji_one/pencil2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/270f.png
rename to plugins/emoji/public/images/emoji_one/pencil2.png
diff --git a/plugins/emoji/public/images/unicode/1f427.png b/plugins/emoji/public/images/emoji_one/penguin.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f427.png
rename to plugins/emoji/public/images/emoji_one/penguin.png
diff --git a/plugins/emoji/public/images/unicode/1f614.png b/plugins/emoji/public/images/emoji_one/pensive.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f614.png
rename to plugins/emoji/public/images/emoji_one/pensive.png
diff --git a/plugins/emoji/public/images/unicode/1f3ad.png b/plugins/emoji/public/images/emoji_one/performing_arts.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ad.png
rename to plugins/emoji/public/images/emoji_one/performing_arts.png
diff --git a/plugins/emoji/public/images/unicode/1f623.png b/plugins/emoji/public/images/emoji_one/persevere.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f623.png
rename to plugins/emoji/public/images/emoji_one/persevere.png
diff --git a/plugins/emoji/public/images/unicode/1f64d.png b/plugins/emoji/public/images/emoji_one/person_frowning.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f64d.png
rename to plugins/emoji/public/images/emoji_one/person_frowning.png
diff --git a/plugins/emoji/public/images/unicode/1f471.png b/plugins/emoji/public/images/emoji_one/person_with_blond_hair.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f471.png
rename to plugins/emoji/public/images/emoji_one/person_with_blond_hair.png
diff --git a/plugins/emoji/public/images/unicode/1f64e.png b/plugins/emoji/public/images/emoji_one/person_with_pouting_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f64e.png
rename to plugins/emoji/public/images/emoji_one/person_with_pouting_face.png
diff --git a/plugins/emoji/public/images/unicode/260e.png b/plugins/emoji/public/images/emoji_one/phone.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/260e.png
rename to plugins/emoji/public/images/emoji_one/phone.png
diff --git a/plugins/emoji/public/images/unicode/1f437.png b/plugins/emoji/public/images/emoji_one/pig.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f437.png
rename to plugins/emoji/public/images/emoji_one/pig.png
diff --git a/plugins/emoji/public/images/unicode/1f416.png b/plugins/emoji/public/images/emoji_one/pig2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f416.png
rename to plugins/emoji/public/images/emoji_one/pig2.png
diff --git a/plugins/emoji/public/images/unicode/1f43d.png b/plugins/emoji/public/images/emoji_one/pig_nose.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f43d.png
rename to plugins/emoji/public/images/emoji_one/pig_nose.png
diff --git a/plugins/emoji/public/images/unicode/1f48a.png b/plugins/emoji/public/images/emoji_one/pill.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f48a.png
rename to plugins/emoji/public/images/emoji_one/pill.png
diff --git a/plugins/emoji/public/images/unicode/1f34d.png b/plugins/emoji/public/images/emoji_one/pineapple.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f34d.png
rename to plugins/emoji/public/images/emoji_one/pineapple.png
diff --git a/plugins/emoji/public/images/unicode/2653.png b/plugins/emoji/public/images/emoji_one/pisces.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2653.png
rename to plugins/emoji/public/images/emoji_one/pisces.png
diff --git a/plugins/emoji/public/images/unicode/1f355.png b/plugins/emoji/public/images/emoji_one/pizza.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f355.png
rename to plugins/emoji/public/images/emoji_one/pizza.png
diff --git a/plugins/emoji/public/images/unicode/1f447.png b/plugins/emoji/public/images/emoji_one/point_down.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f447.png
rename to plugins/emoji/public/images/emoji_one/point_down.png
diff --git a/plugins/emoji/public/images/unicode/1f448.png b/plugins/emoji/public/images/emoji_one/point_left.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f448.png
rename to plugins/emoji/public/images/emoji_one/point_left.png
diff --git a/plugins/emoji/public/images/unicode/1f449.png b/plugins/emoji/public/images/emoji_one/point_right.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f449.png
rename to plugins/emoji/public/images/emoji_one/point_right.png
diff --git a/plugins/emoji/public/images/unicode/261d.png b/plugins/emoji/public/images/emoji_one/point_up.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/261d.png
rename to plugins/emoji/public/images/emoji_one/point_up.png
diff --git a/plugins/emoji/public/images/unicode/1f446.png b/plugins/emoji/public/images/emoji_one/point_up_2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f446.png
rename to plugins/emoji/public/images/emoji_one/point_up_2.png
diff --git a/plugins/emoji/public/images/unicode/1f693.png b/plugins/emoji/public/images/emoji_one/police_car.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f693.png
rename to plugins/emoji/public/images/emoji_one/police_car.png
diff --git a/plugins/emoji/public/images/unicode/1f429.png b/plugins/emoji/public/images/emoji_one/poodle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f429.png
rename to plugins/emoji/public/images/emoji_one/poodle.png
diff --git a/plugins/emoji/public/images/emoji_one/poop.png b/plugins/emoji/public/images/emoji_one/poop.png
new file mode 100644
index 0000000000..92c9f16d58
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/poop.png differ
diff --git a/plugins/emoji/public/images/unicode/1f3e3.png b/plugins/emoji/public/images/emoji_one/post_office.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3e3.png
rename to plugins/emoji/public/images/emoji_one/post_office.png
diff --git a/plugins/emoji/public/images/unicode/1f4ef.png b/plugins/emoji/public/images/emoji_one/postal_horn.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ef.png
rename to plugins/emoji/public/images/emoji_one/postal_horn.png
diff --git a/plugins/emoji/public/images/unicode/1f4ee.png b/plugins/emoji/public/images/emoji_one/postbox.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ee.png
rename to plugins/emoji/public/images/emoji_one/postbox.png
diff --git a/plugins/emoji/public/images/unicode/1f6b0.png b/plugins/emoji/public/images/emoji_one/potable_water.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b0.png
rename to plugins/emoji/public/images/emoji_one/potable_water.png
diff --git a/plugins/emoji/public/images/unicode/1f45d.png b/plugins/emoji/public/images/emoji_one/pouch.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f45d.png
rename to plugins/emoji/public/images/emoji_one/pouch.png
diff --git a/plugins/emoji/public/images/unicode/1f357.png b/plugins/emoji/public/images/emoji_one/poultry_leg.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f357.png
rename to plugins/emoji/public/images/emoji_one/poultry_leg.png
diff --git a/plugins/emoji/public/images/unicode/1f4b7.png b/plugins/emoji/public/images/emoji_one/pound.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b7.png
rename to plugins/emoji/public/images/emoji_one/pound.png
diff --git a/plugins/emoji/public/images/unicode/1f63e.png b/plugins/emoji/public/images/emoji_one/pouting_cat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f63e.png
rename to plugins/emoji/public/images/emoji_one/pouting_cat.png
diff --git a/plugins/emoji/public/images/unicode/1f64f.png b/plugins/emoji/public/images/emoji_one/pray.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f64f.png
rename to plugins/emoji/public/images/emoji_one/pray.png
diff --git a/plugins/emoji/public/images/unicode/1f478.png b/plugins/emoji/public/images/emoji_one/princess.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f478.png
rename to plugins/emoji/public/images/emoji_one/princess.png
diff --git a/plugins/emoji/public/images/emoji_one/punch.png b/plugins/emoji/public/images/emoji_one/punch.png
new file mode 100644
index 0000000000..a616ffee19
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/punch.png differ
diff --git a/plugins/emoji/public/images/unicode/1f49c.png b/plugins/emoji/public/images/emoji_one/purple_heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f49c.png
rename to plugins/emoji/public/images/emoji_one/purple_heart.png
diff --git a/plugins/emoji/public/images/unicode/1f45b.png b/plugins/emoji/public/images/emoji_one/purse.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f45b.png
rename to plugins/emoji/public/images/emoji_one/purse.png
diff --git a/plugins/emoji/public/images/unicode/1f4cc.png b/plugins/emoji/public/images/emoji_one/pushpin.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4cc.png
rename to plugins/emoji/public/images/emoji_one/pushpin.png
diff --git a/plugins/emoji/public/images/unicode/1f6ae.png b/plugins/emoji/public/images/emoji_one/put_litter_in_its_place.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6ae.png
rename to plugins/emoji/public/images/emoji_one/put_litter_in_its_place.png
diff --git a/plugins/emoji/public/images/unicode/2753.png b/plugins/emoji/public/images/emoji_one/question.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2753.png
rename to plugins/emoji/public/images/emoji_one/question.png
diff --git a/plugins/emoji/public/images/unicode/1f430.png b/plugins/emoji/public/images/emoji_one/rabbit.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f430.png
rename to plugins/emoji/public/images/emoji_one/rabbit.png
diff --git a/plugins/emoji/public/images/unicode/1f407.png b/plugins/emoji/public/images/emoji_one/rabbit2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f407.png
rename to plugins/emoji/public/images/emoji_one/rabbit2.png
diff --git a/plugins/emoji/public/images/unicode/1f40e.png b/plugins/emoji/public/images/emoji_one/racehorse.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f40e.png
rename to plugins/emoji/public/images/emoji_one/racehorse.png
diff --git a/plugins/emoji/public/images/unicode/1f4fb.png b/plugins/emoji/public/images/emoji_one/radio.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4fb.png
rename to plugins/emoji/public/images/emoji_one/radio.png
diff --git a/plugins/emoji/public/images/unicode/1f518.png b/plugins/emoji/public/images/emoji_one/radio_button.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f518.png
rename to plugins/emoji/public/images/emoji_one/radio_button.png
diff --git a/plugins/emoji/public/images/unicode/1f621.png b/plugins/emoji/public/images/emoji_one/rage.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f621.png
rename to plugins/emoji/public/images/emoji_one/rage.png
diff --git a/plugins/emoji/public/images/unicode/1f683.png b/plugins/emoji/public/images/emoji_one/railway_car.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f683.png
rename to plugins/emoji/public/images/emoji_one/railway_car.png
diff --git a/plugins/emoji/public/images/unicode/1f308.png b/plugins/emoji/public/images/emoji_one/rainbow.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f308.png
rename to plugins/emoji/public/images/emoji_one/rainbow.png
diff --git a/plugins/emoji/public/images/emoji_one/raised_hand.png b/plugins/emoji/public/images/emoji_one/raised_hand.png
new file mode 100644
index 0000000000..4788cea61e
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/raised_hand.png differ
diff --git a/plugins/emoji/public/images/unicode/1f64c.png b/plugins/emoji/public/images/emoji_one/raised_hands.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f64c.png
rename to plugins/emoji/public/images/emoji_one/raised_hands.png
diff --git a/plugins/emoji/public/images/unicode/1f64b.png b/plugins/emoji/public/images/emoji_one/raising_hand.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f64b.png
rename to plugins/emoji/public/images/emoji_one/raising_hand.png
diff --git a/plugins/emoji/public/images/unicode/1f40f.png b/plugins/emoji/public/images/emoji_one/ram.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f40f.png
rename to plugins/emoji/public/images/emoji_one/ram.png
diff --git a/plugins/emoji/public/images/unicode/1f35c.png b/plugins/emoji/public/images/emoji_one/ramen.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f35c.png
rename to plugins/emoji/public/images/emoji_one/ramen.png
diff --git a/plugins/emoji/public/images/unicode/1f400.png b/plugins/emoji/public/images/emoji_one/rat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f400.png
rename to plugins/emoji/public/images/emoji_one/rat.png
diff --git a/plugins/emoji/public/images/unicode/267b.png b/plugins/emoji/public/images/emoji_one/recycle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/267b.png
rename to plugins/emoji/public/images/emoji_one/recycle.png
diff --git a/plugins/emoji/public/images/emoji_one/red_car.png b/plugins/emoji/public/images/emoji_one/red_car.png
new file mode 100644
index 0000000000..93f6fc4f32
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/red_car.png differ
diff --git a/plugins/emoji/public/images/unicode/1f534.png b/plugins/emoji/public/images/emoji_one/red_circle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f534.png
rename to plugins/emoji/public/images/emoji_one/red_circle.png
diff --git a/plugins/emoji/public/images/emoji_one/registered.png b/plugins/emoji/public/images/emoji_one/registered.png
new file mode 100644
index 0000000000..9776d66f85
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/registered.png differ
diff --git a/plugins/emoji/public/images/unicode/263a.png b/plugins/emoji/public/images/emoji_one/relaxed.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/263a.png
rename to plugins/emoji/public/images/emoji_one/relaxed.png
diff --git a/plugins/emoji/public/images/unicode/1f60c.png b/plugins/emoji/public/images/emoji_one/relieved.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f60c.png
rename to plugins/emoji/public/images/emoji_one/relieved.png
diff --git a/plugins/emoji/public/images/unicode/1f501.png b/plugins/emoji/public/images/emoji_one/repeat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f501.png
rename to plugins/emoji/public/images/emoji_one/repeat.png
diff --git a/plugins/emoji/public/images/unicode/1f502.png b/plugins/emoji/public/images/emoji_one/repeat_one.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f502.png
rename to plugins/emoji/public/images/emoji_one/repeat_one.png
diff --git a/plugins/emoji/public/images/unicode/1f6bb.png b/plugins/emoji/public/images/emoji_one/restroom.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6bb.png
rename to plugins/emoji/public/images/emoji_one/restroom.png
diff --git a/plugins/emoji/public/images/unicode/1f49e.png b/plugins/emoji/public/images/emoji_one/revolving_hearts.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f49e.png
rename to plugins/emoji/public/images/emoji_one/revolving_hearts.png
diff --git a/plugins/emoji/public/images/unicode/23ea.png b/plugins/emoji/public/images/emoji_one/rewind.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/23ea.png
rename to plugins/emoji/public/images/emoji_one/rewind.png
diff --git a/plugins/emoji/public/images/unicode/1f380.png b/plugins/emoji/public/images/emoji_one/ribbon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f380.png
rename to plugins/emoji/public/images/emoji_one/ribbon.png
diff --git a/plugins/emoji/public/images/unicode/1f35a.png b/plugins/emoji/public/images/emoji_one/rice.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f35a.png
rename to plugins/emoji/public/images/emoji_one/rice.png
diff --git a/plugins/emoji/public/images/unicode/1f359.png b/plugins/emoji/public/images/emoji_one/rice_ball.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f359.png
rename to plugins/emoji/public/images/emoji_one/rice_ball.png
diff --git a/plugins/emoji/public/images/unicode/1f358.png b/plugins/emoji/public/images/emoji_one/rice_cracker.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f358.png
rename to plugins/emoji/public/images/emoji_one/rice_cracker.png
diff --git a/plugins/emoji/public/images/unicode/1f391.png b/plugins/emoji/public/images/emoji_one/rice_scene.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f391.png
rename to plugins/emoji/public/images/emoji_one/rice_scene.png
diff --git a/plugins/emoji/public/images/unicode/1f48d.png b/plugins/emoji/public/images/emoji_one/ring.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f48d.png
rename to plugins/emoji/public/images/emoji_one/ring.png
diff --git a/plugins/emoji/public/images/unicode/1f680.png b/plugins/emoji/public/images/emoji_one/rocket.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f680.png
rename to plugins/emoji/public/images/emoji_one/rocket.png
diff --git a/plugins/emoji/public/images/unicode/1f3a2.png b/plugins/emoji/public/images/emoji_one/roller_coaster.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a2.png
rename to plugins/emoji/public/images/emoji_one/roller_coaster.png
diff --git a/plugins/emoji/public/images/unicode/1f413.png b/plugins/emoji/public/images/emoji_one/rooster.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f413.png
rename to plugins/emoji/public/images/emoji_one/rooster.png
diff --git a/plugins/emoji/public/images/unicode/1f339.png b/plugins/emoji/public/images/emoji_one/rose.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f339.png
rename to plugins/emoji/public/images/emoji_one/rose.png
diff --git a/plugins/emoji/public/images/unicode/1f6a8.png b/plugins/emoji/public/images/emoji_one/rotating_light.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a8.png
rename to plugins/emoji/public/images/emoji_one/rotating_light.png
diff --git a/plugins/emoji/public/images/unicode/1f4cd.png b/plugins/emoji/public/images/emoji_one/round_pushpin.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4cd.png
rename to plugins/emoji/public/images/emoji_one/round_pushpin.png
diff --git a/plugins/emoji/public/images/unicode/1f6a3.png b/plugins/emoji/public/images/emoji_one/rowboat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a3.png
rename to plugins/emoji/public/images/emoji_one/rowboat.png
diff --git a/plugins/emoji/public/images/emoji_one/ru.png b/plugins/emoji/public/images/emoji_one/ru.png
new file mode 100644
index 0000000000..2b3c9d915f
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/ru.png differ
diff --git a/plugins/emoji/public/images/unicode/1f3c9.png b/plugins/emoji/public/images/emoji_one/rugby_football.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3c9.png
rename to plugins/emoji/public/images/emoji_one/rugby_football.png
diff --git a/plugins/emoji/public/images/unicode/1f3c3.png b/plugins/emoji/public/images/emoji_one/runner.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3c3.png
rename to plugins/emoji/public/images/emoji_one/runner.png
diff --git a/plugins/emoji/public/images/emoji_one/running.png b/plugins/emoji/public/images/emoji_one/running.png
new file mode 100644
index 0000000000..aaeb46612a
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/running.png differ
diff --git a/plugins/emoji/public/images/unicode/1f3bd.png b/plugins/emoji/public/images/emoji_one/running_shirt_with_sash.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3bd.png
rename to plugins/emoji/public/images/emoji_one/running_shirt_with_sash.png
diff --git a/plugins/emoji/public/images/emoji_one/sa.png b/plugins/emoji/public/images/emoji_one/sa.png
new file mode 100644
index 0000000000..26b2108087
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/sa.png differ
diff --git a/plugins/emoji/public/images/unicode/2650.png b/plugins/emoji/public/images/emoji_one/sagittarius.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2650.png
rename to plugins/emoji/public/images/emoji_one/sagittarius.png
diff --git a/plugins/emoji/public/images/emoji_one/sailboat.png b/plugins/emoji/public/images/emoji_one/sailboat.png
new file mode 100644
index 0000000000..04fffbe414
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/sailboat.png differ
diff --git a/plugins/emoji/public/images/unicode/1f376.png b/plugins/emoji/public/images/emoji_one/sake.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f376.png
rename to plugins/emoji/public/images/emoji_one/sake.png
diff --git a/plugins/emoji/public/images/unicode/1f461.png b/plugins/emoji/public/images/emoji_one/sandal.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f461.png
rename to plugins/emoji/public/images/emoji_one/sandal.png
diff --git a/plugins/emoji/public/images/unicode/1f385.png b/plugins/emoji/public/images/emoji_one/santa.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f385.png
rename to plugins/emoji/public/images/emoji_one/santa.png
diff --git a/plugins/emoji/public/images/unicode/1f4e1.png b/plugins/emoji/public/images/emoji_one/satellite.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4e1.png
rename to plugins/emoji/public/images/emoji_one/satellite.png
diff --git a/plugins/emoji/public/images/emoji_one/satisfied.png b/plugins/emoji/public/images/emoji_one/satisfied.png
new file mode 100644
index 0000000000..22f4d66ba4
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/satisfied.png differ
diff --git a/plugins/emoji/public/images/unicode/1f3b7.png b/plugins/emoji/public/images/emoji_one/saxophone.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b7.png
rename to plugins/emoji/public/images/emoji_one/saxophone.png
diff --git a/plugins/emoji/public/images/unicode/1f3eb.png b/plugins/emoji/public/images/emoji_one/school.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3eb.png
rename to plugins/emoji/public/images/emoji_one/school.png
diff --git a/plugins/emoji/public/images/unicode/1f392.png b/plugins/emoji/public/images/emoji_one/school_satchel.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f392.png
rename to plugins/emoji/public/images/emoji_one/school_satchel.png
diff --git a/plugins/emoji/public/images/unicode/2702.png b/plugins/emoji/public/images/emoji_one/scissors.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2702.png
rename to plugins/emoji/public/images/emoji_one/scissors.png
diff --git a/plugins/emoji/public/images/unicode/264f.png b/plugins/emoji/public/images/emoji_one/scorpius.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/264f.png
rename to plugins/emoji/public/images/emoji_one/scorpius.png
diff --git a/plugins/emoji/public/images/unicode/1f631.png b/plugins/emoji/public/images/emoji_one/scream.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f631.png
rename to plugins/emoji/public/images/emoji_one/scream.png
diff --git a/plugins/emoji/public/images/unicode/1f640.png b/plugins/emoji/public/images/emoji_one/scream_cat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f640.png
rename to plugins/emoji/public/images/emoji_one/scream_cat.png
diff --git a/plugins/emoji/public/images/unicode/1f4dc.png b/plugins/emoji/public/images/emoji_one/scroll.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4dc.png
rename to plugins/emoji/public/images/emoji_one/scroll.png
diff --git a/plugins/emoji/public/images/unicode/1f4ba.png b/plugins/emoji/public/images/emoji_one/seat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ba.png
rename to plugins/emoji/public/images/emoji_one/seat.png
diff --git a/plugins/emoji/public/images/unicode/3299.png b/plugins/emoji/public/images/emoji_one/secret.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/3299.png
rename to plugins/emoji/public/images/emoji_one/secret.png
diff --git a/plugins/emoji/public/images/unicode/1f648.png b/plugins/emoji/public/images/emoji_one/see_no_evil.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f648.png
rename to plugins/emoji/public/images/emoji_one/see_no_evil.png
diff --git a/plugins/emoji/public/images/unicode/1f331.png b/plugins/emoji/public/images/emoji_one/seedling.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f331.png
rename to plugins/emoji/public/images/emoji_one/seedling.png
diff --git a/plugins/emoji/public/images/unicode/0037-20E3.png b/plugins/emoji/public/images/emoji_one/seven.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0037-20E3.png
rename to plugins/emoji/public/images/emoji_one/seven.png
diff --git a/plugins/emoji/public/images/unicode/1f367.png b/plugins/emoji/public/images/emoji_one/shaved_ice.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f367.png
rename to plugins/emoji/public/images/emoji_one/shaved_ice.png
diff --git a/plugins/emoji/public/images/unicode/1f411.png b/plugins/emoji/public/images/emoji_one/sheep.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f411.png
rename to plugins/emoji/public/images/emoji_one/sheep.png
diff --git a/plugins/emoji/public/images/unicode/1f41a.png b/plugins/emoji/public/images/emoji_one/shell.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f41a.png
rename to plugins/emoji/public/images/emoji_one/shell.png
diff --git a/plugins/emoji/public/images/unicode/1f6a2.png b/plugins/emoji/public/images/emoji_one/ship.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a2.png
rename to plugins/emoji/public/images/emoji_one/ship.png
diff --git a/plugins/emoji/public/images/unicode/1f455.png b/plugins/emoji/public/images/emoji_one/shirt.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f455.png
rename to plugins/emoji/public/images/emoji_one/shirt.png
diff --git a/plugins/emoji/public/images/emoji_one/shit.png b/plugins/emoji/public/images/emoji_one/shit.png
new file mode 100644
index 0000000000..92c9f16d58
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/shit.png differ
diff --git a/plugins/emoji/public/images/emoji_one/shoe.png b/plugins/emoji/public/images/emoji_one/shoe.png
new file mode 100644
index 0000000000..b30dfafec3
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/shoe.png differ
diff --git a/plugins/emoji/public/images/unicode/1f6bf.png b/plugins/emoji/public/images/emoji_one/shower.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6bf.png
rename to plugins/emoji/public/images/emoji_one/shower.png
diff --git a/plugins/emoji/public/images/unicode/1f4f6.png b/plugins/emoji/public/images/emoji_one/signal_strength.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4f6.png
rename to plugins/emoji/public/images/emoji_one/signal_strength.png
diff --git a/plugins/emoji/public/images/unicode/0036-20E3.png b/plugins/emoji/public/images/emoji_one/six.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0036-20E3.png
rename to plugins/emoji/public/images/emoji_one/six.png
diff --git a/plugins/emoji/public/images/unicode/1f52f.png b/plugins/emoji/public/images/emoji_one/six_pointed_star.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f52f.png
rename to plugins/emoji/public/images/emoji_one/six_pointed_star.png
diff --git a/plugins/emoji/public/images/unicode/1f3bf.png b/plugins/emoji/public/images/emoji_one/ski.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3bf.png
rename to plugins/emoji/public/images/emoji_one/ski.png
diff --git a/plugins/emoji/public/images/unicode/1f480.png b/plugins/emoji/public/images/emoji_one/skull.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f480.png
rename to plugins/emoji/public/images/emoji_one/skull.png
diff --git a/plugins/emoji/public/images/unicode/1f634.png b/plugins/emoji/public/images/emoji_one/sleeping.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f634.png
rename to plugins/emoji/public/images/emoji_one/sleeping.png
diff --git a/plugins/emoji/public/images/unicode/1f62a.png b/plugins/emoji/public/images/emoji_one/sleepy.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f62a.png
rename to plugins/emoji/public/images/emoji_one/sleepy.png
diff --git a/plugins/emoji/public/images/unicode/1f3b0.png b/plugins/emoji/public/images/emoji_one/slot_machine.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3b0.png
rename to plugins/emoji/public/images/emoji_one/slot_machine.png
diff --git a/plugins/emoji/public/images/unicode/1f539.png b/plugins/emoji/public/images/emoji_one/small_blue_diamond.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f539.png
rename to plugins/emoji/public/images/emoji_one/small_blue_diamond.png
diff --git a/plugins/emoji/public/images/unicode/1f538.png b/plugins/emoji/public/images/emoji_one/small_orange_diamond.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f538.png
rename to plugins/emoji/public/images/emoji_one/small_orange_diamond.png
diff --git a/plugins/emoji/public/images/unicode/1f53a.png b/plugins/emoji/public/images/emoji_one/small_red_triangle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f53a.png
rename to plugins/emoji/public/images/emoji_one/small_red_triangle.png
diff --git a/plugins/emoji/public/images/unicode/1f53b.png b/plugins/emoji/public/images/emoji_one/small_red_triangle_down.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f53b.png
rename to plugins/emoji/public/images/emoji_one/small_red_triangle_down.png
diff --git a/plugins/emoji/public/images/unicode/1f604.png b/plugins/emoji/public/images/emoji_one/smile.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f604.png
rename to plugins/emoji/public/images/emoji_one/smile.png
diff --git a/plugins/emoji/public/images/unicode/1f638.png b/plugins/emoji/public/images/emoji_one/smile_cat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f638.png
rename to plugins/emoji/public/images/emoji_one/smile_cat.png
diff --git a/plugins/emoji/public/images/unicode/1f603.png b/plugins/emoji/public/images/emoji_one/smiley.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f603.png
rename to plugins/emoji/public/images/emoji_one/smiley.png
diff --git a/plugins/emoji/public/images/unicode/1f63a.png b/plugins/emoji/public/images/emoji_one/smiley_cat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f63a.png
rename to plugins/emoji/public/images/emoji_one/smiley_cat.png
diff --git a/plugins/emoji/public/images/unicode/1f608.png b/plugins/emoji/public/images/emoji_one/smiling_imp.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f608.png
rename to plugins/emoji/public/images/emoji_one/smiling_imp.png
diff --git a/plugins/emoji/public/images/unicode/1f60f.png b/plugins/emoji/public/images/emoji_one/smirk.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f60f.png
rename to plugins/emoji/public/images/emoji_one/smirk.png
diff --git a/plugins/emoji/public/images/unicode/1f63c.png b/plugins/emoji/public/images/emoji_one/smirk_cat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f63c.png
rename to plugins/emoji/public/images/emoji_one/smirk_cat.png
diff --git a/plugins/emoji/public/images/unicode/1f6ac.png b/plugins/emoji/public/images/emoji_one/smoking.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6ac.png
rename to plugins/emoji/public/images/emoji_one/smoking.png
diff --git a/plugins/emoji/public/images/unicode/1f40c.png b/plugins/emoji/public/images/emoji_one/snail.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f40c.png
rename to plugins/emoji/public/images/emoji_one/snail.png
diff --git a/plugins/emoji/public/images/unicode/1f40d.png b/plugins/emoji/public/images/emoji_one/snake.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f40d.png
rename to plugins/emoji/public/images/emoji_one/snake.png
diff --git a/plugins/emoji/public/images/unicode/1f3c2.png b/plugins/emoji/public/images/emoji_one/snowboarder.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3c2.png
rename to plugins/emoji/public/images/emoji_one/snowboarder.png
diff --git a/plugins/emoji/public/images/unicode/2744.png b/plugins/emoji/public/images/emoji_one/snowflake.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2744.png
rename to plugins/emoji/public/images/emoji_one/snowflake.png
diff --git a/plugins/emoji/public/images/unicode/26c4.png b/plugins/emoji/public/images/emoji_one/snowman.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26c4.png
rename to plugins/emoji/public/images/emoji_one/snowman.png
diff --git a/plugins/emoji/public/images/unicode/1f62d.png b/plugins/emoji/public/images/emoji_one/sob.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f62d.png
rename to plugins/emoji/public/images/emoji_one/sob.png
diff --git a/plugins/emoji/public/images/unicode/26bd.png b/plugins/emoji/public/images/emoji_one/soccer.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26bd.png
rename to plugins/emoji/public/images/emoji_one/soccer.png
diff --git a/plugins/emoji/public/images/unicode/1f51c.png b/plugins/emoji/public/images/emoji_one/soon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f51c.png
rename to plugins/emoji/public/images/emoji_one/soon.png
diff --git a/plugins/emoji/public/images/unicode/1f198.png b/plugins/emoji/public/images/emoji_one/sos.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f198.png
rename to plugins/emoji/public/images/emoji_one/sos.png
diff --git a/plugins/emoji/public/images/unicode/1f509.png b/plugins/emoji/public/images/emoji_one/sound.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f509.png
rename to plugins/emoji/public/images/emoji_one/sound.png
diff --git a/plugins/emoji/public/images/unicode/1f47e.png b/plugins/emoji/public/images/emoji_one/space_invader.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f47e.png
rename to plugins/emoji/public/images/emoji_one/space_invader.png
diff --git a/plugins/emoji/public/images/unicode/2660.png b/plugins/emoji/public/images/emoji_one/spades.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2660.png
rename to plugins/emoji/public/images/emoji_one/spades.png
diff --git a/plugins/emoji/public/images/unicode/1f35d.png b/plugins/emoji/public/images/emoji_one/spaghetti.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f35d.png
rename to plugins/emoji/public/images/emoji_one/spaghetti.png
diff --git a/plugins/emoji/public/images/unicode/2747.png b/plugins/emoji/public/images/emoji_one/sparkle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2747.png
rename to plugins/emoji/public/images/emoji_one/sparkle.png
diff --git a/plugins/emoji/public/images/unicode/1f387.png b/plugins/emoji/public/images/emoji_one/sparkler.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f387.png
rename to plugins/emoji/public/images/emoji_one/sparkler.png
diff --git a/plugins/emoji/public/images/unicode/2728.png b/plugins/emoji/public/images/emoji_one/sparkles.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2728.png
rename to plugins/emoji/public/images/emoji_one/sparkles.png
diff --git a/plugins/emoji/public/images/unicode/1f496.png b/plugins/emoji/public/images/emoji_one/sparkling_heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f496.png
rename to plugins/emoji/public/images/emoji_one/sparkling_heart.png
diff --git a/plugins/emoji/public/images/unicode/1f64a.png b/plugins/emoji/public/images/emoji_one/speak_no_evil.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f64a.png
rename to plugins/emoji/public/images/emoji_one/speak_no_evil.png
diff --git a/plugins/emoji/public/images/unicode/1F508.png b/plugins/emoji/public/images/emoji_one/speaker.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/1F508.png
rename to plugins/emoji/public/images/emoji_one/speaker.png
diff --git a/plugins/emoji/public/images/unicode/1f4ac.png b/plugins/emoji/public/images/emoji_one/speech_balloon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ac.png
rename to plugins/emoji/public/images/emoji_one/speech_balloon.png
diff --git a/plugins/emoji/public/images/unicode/1f6a4.png b/plugins/emoji/public/images/emoji_one/speedboat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a4.png
rename to plugins/emoji/public/images/emoji_one/speedboat.png
diff --git a/plugins/emoji/public/images/unicode/2b50.png b/plugins/emoji/public/images/emoji_one/star.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2b50.png
rename to plugins/emoji/public/images/emoji_one/star.png
diff --git a/plugins/emoji/public/images/unicode/1f31f.png b/plugins/emoji/public/images/emoji_one/star2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f31f.png
rename to plugins/emoji/public/images/emoji_one/star2.png
diff --git a/plugins/emoji/public/images/unicode/1F320.png b/plugins/emoji/public/images/emoji_one/stars.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/1F320.png
rename to plugins/emoji/public/images/emoji_one/stars.png
diff --git a/plugins/emoji/public/images/unicode/1f689.png b/plugins/emoji/public/images/emoji_one/station.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f689.png
rename to plugins/emoji/public/images/emoji_one/station.png
diff --git a/plugins/emoji/public/images/unicode/1f5fd.png b/plugins/emoji/public/images/emoji_one/statue_of_liberty.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f5fd.png
rename to plugins/emoji/public/images/emoji_one/statue_of_liberty.png
diff --git a/plugins/emoji/public/images/unicode/1f682.png b/plugins/emoji/public/images/emoji_one/steam_locomotive.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f682.png
rename to plugins/emoji/public/images/emoji_one/steam_locomotive.png
diff --git a/plugins/emoji/public/images/unicode/1f372.png b/plugins/emoji/public/images/emoji_one/stew.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f372.png
rename to plugins/emoji/public/images/emoji_one/stew.png
diff --git a/plugins/emoji/public/images/unicode/1f4cf.png b/plugins/emoji/public/images/emoji_one/straight_ruler.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4cf.png
rename to plugins/emoji/public/images/emoji_one/straight_ruler.png
diff --git a/plugins/emoji/public/images/unicode/1f353.png b/plugins/emoji/public/images/emoji_one/strawberry.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f353.png
rename to plugins/emoji/public/images/emoji_one/strawberry.png
diff --git a/plugins/emoji/public/images/unicode/1f61b.png b/plugins/emoji/public/images/emoji_one/stuck_out_tongue.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f61b.png
rename to plugins/emoji/public/images/emoji_one/stuck_out_tongue.png
diff --git a/plugins/emoji/public/images/unicode/1f61d.png b/plugins/emoji/public/images/emoji_one/stuck_out_tongue_closed_eyes.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f61d.png
rename to plugins/emoji/public/images/emoji_one/stuck_out_tongue_closed_eyes.png
diff --git a/plugins/emoji/public/images/unicode/1f61c.png b/plugins/emoji/public/images/emoji_one/stuck_out_tongue_winking_eye.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f61c.png
rename to plugins/emoji/public/images/emoji_one/stuck_out_tongue_winking_eye.png
diff --git a/plugins/emoji/public/images/unicode/1f31e.png b/plugins/emoji/public/images/emoji_one/sun_with_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f31e.png
rename to plugins/emoji/public/images/emoji_one/sun_with_face.png
diff --git a/plugins/emoji/public/images/unicode/1f33b.png b/plugins/emoji/public/images/emoji_one/sunflower.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f33b.png
rename to plugins/emoji/public/images/emoji_one/sunflower.png
diff --git a/plugins/emoji/public/images/unicode/1f60e.png b/plugins/emoji/public/images/emoji_one/sunglasses.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f60e.png
rename to plugins/emoji/public/images/emoji_one/sunglasses.png
diff --git a/plugins/emoji/public/images/unicode/2600.png b/plugins/emoji/public/images/emoji_one/sunny.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2600.png
rename to plugins/emoji/public/images/emoji_one/sunny.png
diff --git a/plugins/emoji/public/images/unicode/1f305.png b/plugins/emoji/public/images/emoji_one/sunrise.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f305.png
rename to plugins/emoji/public/images/emoji_one/sunrise.png
diff --git a/plugins/emoji/public/images/unicode/1f304.png b/plugins/emoji/public/images/emoji_one/sunrise_over_mountains.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f304.png
rename to plugins/emoji/public/images/emoji_one/sunrise_over_mountains.png
diff --git a/plugins/emoji/public/images/unicode/1f3c4.png b/plugins/emoji/public/images/emoji_one/surfer.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3c4.png
rename to plugins/emoji/public/images/emoji_one/surfer.png
diff --git a/plugins/emoji/public/images/unicode/1f363.png b/plugins/emoji/public/images/emoji_one/sushi.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f363.png
rename to plugins/emoji/public/images/emoji_one/sushi.png
diff --git a/plugins/emoji/public/images/unicode/1f69f.png b/plugins/emoji/public/images/emoji_one/suspension_railway.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f69f.png
rename to plugins/emoji/public/images/emoji_one/suspension_railway.png
diff --git a/plugins/emoji/public/images/unicode/1f613.png b/plugins/emoji/public/images/emoji_one/sweat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f613.png
rename to plugins/emoji/public/images/emoji_one/sweat.png
diff --git a/plugins/emoji/public/images/unicode/1f4a6.png b/plugins/emoji/public/images/emoji_one/sweat_drops.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a6.png
rename to plugins/emoji/public/images/emoji_one/sweat_drops.png
diff --git a/plugins/emoji/public/images/unicode/1f605.png b/plugins/emoji/public/images/emoji_one/sweat_smile.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f605.png
rename to plugins/emoji/public/images/emoji_one/sweat_smile.png
diff --git a/plugins/emoji/public/images/unicode/1f360.png b/plugins/emoji/public/images/emoji_one/sweet_potato.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f360.png
rename to plugins/emoji/public/images/emoji_one/sweet_potato.png
diff --git a/plugins/emoji/public/images/unicode/1f3ca.png b/plugins/emoji/public/images/emoji_one/swimmer.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ca.png
rename to plugins/emoji/public/images/emoji_one/swimmer.png
diff --git a/plugins/emoji/public/images/unicode/1f523.png b/plugins/emoji/public/images/emoji_one/symbols.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f523.png
rename to plugins/emoji/public/images/emoji_one/symbols.png
diff --git a/plugins/emoji/public/images/unicode/1f489.png b/plugins/emoji/public/images/emoji_one/syringe.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f489.png
rename to plugins/emoji/public/images/emoji_one/syringe.png
diff --git a/plugins/emoji/public/images/unicode/1f389.png b/plugins/emoji/public/images/emoji_one/tada.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f389.png
rename to plugins/emoji/public/images/emoji_one/tada.png
diff --git a/plugins/emoji/public/images/unicode/1f38b.png b/plugins/emoji/public/images/emoji_one/tanabata_tree.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f38b.png
rename to plugins/emoji/public/images/emoji_one/tanabata_tree.png
diff --git a/plugins/emoji/public/images/unicode/1f34a.png b/plugins/emoji/public/images/emoji_one/tangerine.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f34a.png
rename to plugins/emoji/public/images/emoji_one/tangerine.png
diff --git a/plugins/emoji/public/images/unicode/2649.png b/plugins/emoji/public/images/emoji_one/taurus.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2649.png
rename to plugins/emoji/public/images/emoji_one/taurus.png
diff --git a/plugins/emoji/public/images/unicode/1f695.png b/plugins/emoji/public/images/emoji_one/taxi.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f695.png
rename to plugins/emoji/public/images/emoji_one/taxi.png
diff --git a/plugins/emoji/public/images/unicode/1f375.png b/plugins/emoji/public/images/emoji_one/tea.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f375.png
rename to plugins/emoji/public/images/emoji_one/tea.png
diff --git a/plugins/emoji/public/images/emoji_one/telephone.png b/plugins/emoji/public/images/emoji_one/telephone.png
new file mode 100644
index 0000000000..75186c2b9f
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/telephone.png differ
diff --git a/plugins/emoji/public/images/unicode/1f4de.png b/plugins/emoji/public/images/emoji_one/telephone_receiver.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4de.png
rename to plugins/emoji/public/images/emoji_one/telephone_receiver.png
diff --git a/plugins/emoji/public/images/unicode/1f52d.png b/plugins/emoji/public/images/emoji_one/telescope.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f52d.png
rename to plugins/emoji/public/images/emoji_one/telescope.png
diff --git a/plugins/emoji/public/images/unicode/1f3be.png b/plugins/emoji/public/images/emoji_one/tennis.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3be.png
rename to plugins/emoji/public/images/emoji_one/tennis.png
diff --git a/plugins/emoji/public/images/unicode/26fa.png b/plugins/emoji/public/images/emoji_one/tent.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26fa.png
rename to plugins/emoji/public/images/emoji_one/tent.png
diff --git a/plugins/emoji/public/images/unicode/1f4ad.png b/plugins/emoji/public/images/emoji_one/thought_balloon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ad.png
rename to plugins/emoji/public/images/emoji_one/thought_balloon.png
diff --git a/plugins/emoji/public/images/unicode/0033-20E3.png b/plugins/emoji/public/images/emoji_one/three.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0033-20E3.png
rename to plugins/emoji/public/images/emoji_one/three.png
diff --git a/plugins/emoji/public/images/emoji_one/thumbsdown.png b/plugins/emoji/public/images/emoji_one/thumbsdown.png
new file mode 100644
index 0000000000..66357f5b77
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/thumbsdown.png differ
diff --git a/plugins/emoji/public/images/emoji_one/thumbsup.png b/plugins/emoji/public/images/emoji_one/thumbsup.png
new file mode 100644
index 0000000000..0eca450d59
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/thumbsup.png differ
diff --git a/plugins/emoji/public/images/unicode/1f3ab.png b/plugins/emoji/public/images/emoji_one/ticket.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ab.png
rename to plugins/emoji/public/images/emoji_one/ticket.png
diff --git a/plugins/emoji/public/images/unicode/1f42f.png b/plugins/emoji/public/images/emoji_one/tiger.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f42f.png
rename to plugins/emoji/public/images/emoji_one/tiger.png
diff --git a/plugins/emoji/public/images/unicode/1f405.png b/plugins/emoji/public/images/emoji_one/tiger2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f405.png
rename to plugins/emoji/public/images/emoji_one/tiger2.png
diff --git a/plugins/emoji/public/images/unicode/1f62b.png b/plugins/emoji/public/images/emoji_one/tired_face.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f62b.png
rename to plugins/emoji/public/images/emoji_one/tired_face.png
diff --git a/plugins/emoji/public/images/unicode/2122.png b/plugins/emoji/public/images/emoji_one/tm.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2122.png
rename to plugins/emoji/public/images/emoji_one/tm.png
diff --git a/plugins/emoji/public/images/unicode/1f6bd.png b/plugins/emoji/public/images/emoji_one/toilet.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6bd.png
rename to plugins/emoji/public/images/emoji_one/toilet.png
diff --git a/plugins/emoji/public/images/unicode/1f5fc.png b/plugins/emoji/public/images/emoji_one/tokyo_tower.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f5fc.png
rename to plugins/emoji/public/images/emoji_one/tokyo_tower.png
diff --git a/plugins/emoji/public/images/unicode/1f345.png b/plugins/emoji/public/images/emoji_one/tomato.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f345.png
rename to plugins/emoji/public/images/emoji_one/tomato.png
diff --git a/plugins/emoji/public/images/unicode/1f445.png b/plugins/emoji/public/images/emoji_one/tongue.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f445.png
rename to plugins/emoji/public/images/emoji_one/tongue.png
diff --git a/plugins/emoji/public/images/unicode/1f51d.png b/plugins/emoji/public/images/emoji_one/top.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f51d.png
rename to plugins/emoji/public/images/emoji_one/top.png
diff --git a/plugins/emoji/public/images/unicode/1f3a9.png b/plugins/emoji/public/images/emoji_one/tophat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3a9.png
rename to plugins/emoji/public/images/emoji_one/tophat.png
diff --git a/plugins/emoji/public/images/unicode/1f69c.png b/plugins/emoji/public/images/emoji_one/tractor.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f69c.png
rename to plugins/emoji/public/images/emoji_one/tractor.png
diff --git a/plugins/emoji/public/images/unicode/1f6a5.png b/plugins/emoji/public/images/emoji_one/traffic_light.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a5.png
rename to plugins/emoji/public/images/emoji_one/traffic_light.png
diff --git a/plugins/emoji/public/images/unicode/1F68B.png b/plugins/emoji/public/images/emoji_one/train.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/1F68B.png
rename to plugins/emoji/public/images/emoji_one/train.png
diff --git a/plugins/emoji/public/images/unicode/1f686.png b/plugins/emoji/public/images/emoji_one/train2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f686.png
rename to plugins/emoji/public/images/emoji_one/train2.png
diff --git a/plugins/emoji/public/images/unicode/1f68a.png b/plugins/emoji/public/images/emoji_one/tram.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f68a.png
rename to plugins/emoji/public/images/emoji_one/tram.png
diff --git a/plugins/emoji/public/images/unicode/1f6a9.png b/plugins/emoji/public/images/emoji_one/triangular_flag_on_post.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a9.png
rename to plugins/emoji/public/images/emoji_one/triangular_flag_on_post.png
diff --git a/plugins/emoji/public/images/unicode/1f4d0.png b/plugins/emoji/public/images/emoji_one/triangular_ruler.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4d0.png
rename to plugins/emoji/public/images/emoji_one/triangular_ruler.png
diff --git a/plugins/emoji/public/images/unicode/1f531.png b/plugins/emoji/public/images/emoji_one/trident.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f531.png
rename to plugins/emoji/public/images/emoji_one/trident.png
diff --git a/plugins/emoji/public/images/unicode/1f624.png b/plugins/emoji/public/images/emoji_one/triumph.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f624.png
rename to plugins/emoji/public/images/emoji_one/triumph.png
diff --git a/plugins/emoji/public/images/unicode/1f68e.png b/plugins/emoji/public/images/emoji_one/trolleybus.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f68e.png
rename to plugins/emoji/public/images/emoji_one/trolleybus.png
diff --git a/plugins/emoji/public/images/unicode/1f3c6.png b/plugins/emoji/public/images/emoji_one/trophy.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3c6.png
rename to plugins/emoji/public/images/emoji_one/trophy.png
diff --git a/plugins/emoji/public/images/unicode/1f379.png b/plugins/emoji/public/images/emoji_one/tropical_drink.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f379.png
rename to plugins/emoji/public/images/emoji_one/tropical_drink.png
diff --git a/plugins/emoji/public/images/unicode/1f420.png b/plugins/emoji/public/images/emoji_one/tropical_fish.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f420.png
rename to plugins/emoji/public/images/emoji_one/tropical_fish.png
diff --git a/plugins/emoji/public/images/unicode/1f69a.png b/plugins/emoji/public/images/emoji_one/truck.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f69a.png
rename to plugins/emoji/public/images/emoji_one/truck.png
diff --git a/plugins/emoji/public/images/unicode/1f3ba.png b/plugins/emoji/public/images/emoji_one/trumpet.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ba.png
rename to plugins/emoji/public/images/emoji_one/trumpet.png
diff --git a/plugins/emoji/public/images/emoji_one/tshirt.png b/plugins/emoji/public/images/emoji_one/tshirt.png
new file mode 100644
index 0000000000..855ed6c732
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/tshirt.png differ
diff --git a/plugins/emoji/public/images/unicode/1f337.png b/plugins/emoji/public/images/emoji_one/tulip.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f337.png
rename to plugins/emoji/public/images/emoji_one/tulip.png
diff --git a/plugins/emoji/public/images/unicode/1f422.png b/plugins/emoji/public/images/emoji_one/turtle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f422.png
rename to plugins/emoji/public/images/emoji_one/turtle.png
diff --git a/plugins/emoji/public/images/unicode/1f4fa.png b/plugins/emoji/public/images/emoji_one/tv.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4fa.png
rename to plugins/emoji/public/images/emoji_one/tv.png
diff --git a/plugins/emoji/public/images/unicode/1f500.png b/plugins/emoji/public/images/emoji_one/twisted_rightwards_arrows.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f500.png
rename to plugins/emoji/public/images/emoji_one/twisted_rightwards_arrows.png
diff --git a/plugins/emoji/public/images/unicode/0032-20E3.png b/plugins/emoji/public/images/emoji_one/two.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0032-20E3.png
rename to plugins/emoji/public/images/emoji_one/two.png
diff --git a/plugins/emoji/public/images/unicode/1f495.png b/plugins/emoji/public/images/emoji_one/two_hearts.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f495.png
rename to plugins/emoji/public/images/emoji_one/two_hearts.png
diff --git a/plugins/emoji/public/images/unicode/1f46c.png b/plugins/emoji/public/images/emoji_one/two_men_holding_hands.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f46c.png
rename to plugins/emoji/public/images/emoji_one/two_men_holding_hands.png
diff --git a/plugins/emoji/public/images/unicode/1f46d.png b/plugins/emoji/public/images/emoji_one/two_women_holding_hands.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f46d.png
rename to plugins/emoji/public/images/emoji_one/two_women_holding_hands.png
diff --git a/plugins/emoji/public/images/unicode/1f239.png b/plugins/emoji/public/images/emoji_one/u5272.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f239.png
rename to plugins/emoji/public/images/emoji_one/u5272.png
diff --git a/plugins/emoji/public/images/unicode/1f234.png b/plugins/emoji/public/images/emoji_one/u5408.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f234.png
rename to plugins/emoji/public/images/emoji_one/u5408.png
diff --git a/plugins/emoji/public/images/unicode/1f23a.png b/plugins/emoji/public/images/emoji_one/u55b6.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f23a.png
rename to plugins/emoji/public/images/emoji_one/u55b6.png
diff --git a/plugins/emoji/public/images/unicode/1f22f.png b/plugins/emoji/public/images/emoji_one/u6307.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f22f.png
rename to plugins/emoji/public/images/emoji_one/u6307.png
diff --git a/plugins/emoji/public/images/unicode/1f237.png b/plugins/emoji/public/images/emoji_one/u6708.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f237.png
rename to plugins/emoji/public/images/emoji_one/u6708.png
diff --git a/plugins/emoji/public/images/unicode/1f236.png b/plugins/emoji/public/images/emoji_one/u6709.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f236.png
rename to plugins/emoji/public/images/emoji_one/u6709.png
diff --git a/plugins/emoji/public/images/unicode/1f235.png b/plugins/emoji/public/images/emoji_one/u6e80.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f235.png
rename to plugins/emoji/public/images/emoji_one/u6e80.png
diff --git a/plugins/emoji/public/images/unicode/1f21a.png b/plugins/emoji/public/images/emoji_one/u7121.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f21a.png
rename to plugins/emoji/public/images/emoji_one/u7121.png
diff --git a/plugins/emoji/public/images/emoji_one/u7533.png b/plugins/emoji/public/images/emoji_one/u7533.png
new file mode 100644
index 0000000000..978b3ea749
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/u7533.png differ
diff --git a/plugins/emoji/public/images/unicode/1f232.png b/plugins/emoji/public/images/emoji_one/u7981.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f232.png
rename to plugins/emoji/public/images/emoji_one/u7981.png
diff --git a/plugins/emoji/public/images/emoji_one/u7a7a.png b/plugins/emoji/public/images/emoji_one/u7a7a.png
new file mode 100644
index 0000000000..a4ee47a4c0
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/u7a7a.png differ
diff --git a/plugins/emoji/public/images/emoji_one/uk.png b/plugins/emoji/public/images/emoji_one/uk.png
new file mode 100644
index 0000000000..61c03f759f
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/uk.png differ
diff --git a/plugins/emoji/public/images/unicode/2614.png b/plugins/emoji/public/images/emoji_one/umbrella.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2614.png
rename to plugins/emoji/public/images/emoji_one/umbrella.png
diff --git a/plugins/emoji/public/images/unicode/1f612.png b/plugins/emoji/public/images/emoji_one/unamused.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f612.png
rename to plugins/emoji/public/images/emoji_one/unamused.png
diff --git a/plugins/emoji/public/images/unicode/1f51e.png b/plugins/emoji/public/images/emoji_one/underage.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f51e.png
rename to plugins/emoji/public/images/emoji_one/underage.png
diff --git a/plugins/emoji/public/images/unicode/1f513.png b/plugins/emoji/public/images/emoji_one/unlock.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f513.png
rename to plugins/emoji/public/images/emoji_one/unlock.png
diff --git a/plugins/emoji/public/images/unicode/1f199.png b/plugins/emoji/public/images/emoji_one/up.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f199.png
rename to plugins/emoji/public/images/emoji_one/up.png
diff --git a/plugins/emoji/public/images/emoji_one/us.png b/plugins/emoji/public/images/emoji_one/us.png
new file mode 100644
index 0000000000..9365dc14e6
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/us.png differ
diff --git a/plugins/emoji/public/images/unicode/270c.png b/plugins/emoji/public/images/emoji_one/v.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/270c.png
rename to plugins/emoji/public/images/emoji_one/v.png
diff --git a/plugins/emoji/public/images/unicode/1f6a6.png b/plugins/emoji/public/images/emoji_one/vertical_traffic_light.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6a6.png
rename to plugins/emoji/public/images/emoji_one/vertical_traffic_light.png
diff --git a/plugins/emoji/public/images/unicode/1f4fc.png b/plugins/emoji/public/images/emoji_one/vhs.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4fc.png
rename to plugins/emoji/public/images/emoji_one/vhs.png
diff --git a/plugins/emoji/public/images/unicode/1f4f3.png b/plugins/emoji/public/images/emoji_one/vibration_mode.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4f3.png
rename to plugins/emoji/public/images/emoji_one/vibration_mode.png
diff --git a/plugins/emoji/public/images/unicode/1f4f9.png b/plugins/emoji/public/images/emoji_one/video_camera.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4f9.png
rename to plugins/emoji/public/images/emoji_one/video_camera.png
diff --git a/plugins/emoji/public/images/unicode/1f3ae.png b/plugins/emoji/public/images/emoji_one/video_game.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3ae.png
rename to plugins/emoji/public/images/emoji_one/video_game.png
diff --git a/plugins/emoji/public/images/unicode/1f3bb.png b/plugins/emoji/public/images/emoji_one/violin.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f3bb.png
rename to plugins/emoji/public/images/emoji_one/violin.png
diff --git a/plugins/emoji/public/images/unicode/264d.png b/plugins/emoji/public/images/emoji_one/virgo.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/264d.png
rename to plugins/emoji/public/images/emoji_one/virgo.png
diff --git a/plugins/emoji/public/images/unicode/1f30b.png b/plugins/emoji/public/images/emoji_one/volcano.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f30b.png
rename to plugins/emoji/public/images/emoji_one/volcano.png
diff --git a/plugins/emoji/public/images/unicode/1f19a.png b/plugins/emoji/public/images/emoji_one/vs.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f19a.png
rename to plugins/emoji/public/images/emoji_one/vs.png
diff --git a/plugins/emoji/public/images/unicode/1f6b6.png b/plugins/emoji/public/images/emoji_one/walking.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6b6.png
rename to plugins/emoji/public/images/emoji_one/walking.png
diff --git a/plugins/emoji/public/images/unicode/1f318.png b/plugins/emoji/public/images/emoji_one/waning_crescent_moon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f318.png
rename to plugins/emoji/public/images/emoji_one/waning_crescent_moon.png
diff --git a/plugins/emoji/public/images/unicode/1f316.png b/plugins/emoji/public/images/emoji_one/waning_gibbous_moon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f316.png
rename to plugins/emoji/public/images/emoji_one/waning_gibbous_moon.png
diff --git a/plugins/emoji/public/images/unicode/26a0.png b/plugins/emoji/public/images/emoji_one/warning.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26a0.png
rename to plugins/emoji/public/images/emoji_one/warning.png
diff --git a/plugins/emoji/public/images/unicode/231a.png b/plugins/emoji/public/images/emoji_one/watch.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/231a.png
rename to plugins/emoji/public/images/emoji_one/watch.png
diff --git a/plugins/emoji/public/images/unicode/1f403.png b/plugins/emoji/public/images/emoji_one/water_buffalo.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f403.png
rename to plugins/emoji/public/images/emoji_one/water_buffalo.png
diff --git a/plugins/emoji/public/images/unicode/1f349.png b/plugins/emoji/public/images/emoji_one/watermelon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f349.png
rename to plugins/emoji/public/images/emoji_one/watermelon.png
diff --git a/plugins/emoji/public/images/unicode/1f44b.png b/plugins/emoji/public/images/emoji_one/wave.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f44b.png
rename to plugins/emoji/public/images/emoji_one/wave.png
diff --git a/plugins/emoji/public/images/unicode/3030.png b/plugins/emoji/public/images/emoji_one/wavy_dash.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/3030.png
rename to plugins/emoji/public/images/emoji_one/wavy_dash.png
diff --git a/plugins/emoji/public/images/unicode/1f312.png b/plugins/emoji/public/images/emoji_one/waxing_crescent_moon.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f312.png
rename to plugins/emoji/public/images/emoji_one/waxing_crescent_moon.png
diff --git a/plugins/emoji/public/images/emoji_one/waxing_gibbous_moon.png b/plugins/emoji/public/images/emoji_one/waxing_gibbous_moon.png
new file mode 100644
index 0000000000..28c41b9242
Binary files /dev/null and b/plugins/emoji/public/images/emoji_one/waxing_gibbous_moon.png differ
diff --git a/plugins/emoji/public/images/unicode/1f6be.png b/plugins/emoji/public/images/emoji_one/wc.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6be.png
rename to plugins/emoji/public/images/emoji_one/wc.png
diff --git a/plugins/emoji/public/images/unicode/1f629.png b/plugins/emoji/public/images/emoji_one/weary.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f629.png
rename to plugins/emoji/public/images/emoji_one/weary.png
diff --git a/plugins/emoji/public/images/unicode/1f492.png b/plugins/emoji/public/images/emoji_one/wedding.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f492.png
rename to plugins/emoji/public/images/emoji_one/wedding.png
diff --git a/plugins/emoji/public/images/unicode/1f433.png b/plugins/emoji/public/images/emoji_one/whale.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f433.png
rename to plugins/emoji/public/images/emoji_one/whale.png
diff --git a/plugins/emoji/public/images/unicode/1f40b.png b/plugins/emoji/public/images/emoji_one/whale2.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f40b.png
rename to plugins/emoji/public/images/emoji_one/whale2.png
diff --git a/plugins/emoji/public/images/unicode/267f.png b/plugins/emoji/public/images/emoji_one/wheelchair.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/267f.png
rename to plugins/emoji/public/images/emoji_one/wheelchair.png
diff --git a/plugins/emoji/public/images/unicode/2705.png b/plugins/emoji/public/images/emoji_one/white_check_mark.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2705.png
rename to plugins/emoji/public/images/emoji_one/white_check_mark.png
diff --git a/plugins/emoji/public/images/unicode/26aa.png b/plugins/emoji/public/images/emoji_one/white_circle.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26aa.png
rename to plugins/emoji/public/images/emoji_one/white_circle.png
diff --git a/plugins/emoji/public/images/unicode/1f4ae.png b/plugins/emoji/public/images/emoji_one/white_flower.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4ae.png
rename to plugins/emoji/public/images/emoji_one/white_flower.png
diff --git a/plugins/emoji/public/images/unicode/2b1c.png b/plugins/emoji/public/images/emoji_one/white_large_square.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/2b1c.png
rename to plugins/emoji/public/images/emoji_one/white_large_square.png
diff --git a/plugins/emoji/public/images/unicode/25fd.png b/plugins/emoji/public/images/emoji_one/white_medium_small_square.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/25fd.png
rename to plugins/emoji/public/images/emoji_one/white_medium_small_square.png
diff --git a/plugins/emoji/public/images/unicode/25fb.png b/plugins/emoji/public/images/emoji_one/white_medium_square.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/25fb.png
rename to plugins/emoji/public/images/emoji_one/white_medium_square.png
diff --git a/plugins/emoji/public/images/unicode/25ab.png b/plugins/emoji/public/images/emoji_one/white_small_square.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/25ab.png
rename to plugins/emoji/public/images/emoji_one/white_small_square.png
diff --git a/plugins/emoji/public/images/unicode/1f533.png b/plugins/emoji/public/images/emoji_one/white_square_button.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f533.png
rename to plugins/emoji/public/images/emoji_one/white_square_button.png
diff --git a/plugins/emoji/public/images/unicode/1f390.png b/plugins/emoji/public/images/emoji_one/wind_chime.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f390.png
rename to plugins/emoji/public/images/emoji_one/wind_chime.png
diff --git a/plugins/emoji/public/images/unicode/1f377.png b/plugins/emoji/public/images/emoji_one/wine_glass.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f377.png
rename to plugins/emoji/public/images/emoji_one/wine_glass.png
diff --git a/plugins/emoji/public/images/unicode/1f609.png b/plugins/emoji/public/images/emoji_one/wink.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f609.png
rename to plugins/emoji/public/images/emoji_one/wink.png
diff --git a/plugins/emoji/public/images/unicode/1f43a.png b/plugins/emoji/public/images/emoji_one/wolf.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f43a.png
rename to plugins/emoji/public/images/emoji_one/wolf.png
diff --git a/plugins/emoji/public/images/unicode/1f469.png b/plugins/emoji/public/images/emoji_one/woman.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f469.png
rename to plugins/emoji/public/images/emoji_one/woman.png
diff --git a/plugins/emoji/public/images/unicode/1f45a.png b/plugins/emoji/public/images/emoji_one/womans_clothes.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f45a.png
rename to plugins/emoji/public/images/emoji_one/womans_clothes.png
diff --git a/plugins/emoji/public/images/unicode/1f452.png b/plugins/emoji/public/images/emoji_one/womans_hat.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f452.png
rename to plugins/emoji/public/images/emoji_one/womans_hat.png
diff --git a/plugins/emoji/public/images/unicode/1f6ba.png b/plugins/emoji/public/images/emoji_one/womens.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f6ba.png
rename to plugins/emoji/public/images/emoji_one/womens.png
diff --git a/plugins/emoji/public/images/unicode/1f61f.png b/plugins/emoji/public/images/emoji_one/worried.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f61f.png
rename to plugins/emoji/public/images/emoji_one/worried.png
diff --git a/plugins/emoji/public/images/unicode/1f527.png b/plugins/emoji/public/images/emoji_one/wrench.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f527.png
rename to plugins/emoji/public/images/emoji_one/wrench.png
diff --git a/plugins/emoji/public/images/unicode/274c.png b/plugins/emoji/public/images/emoji_one/x.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/274c.png
rename to plugins/emoji/public/images/emoji_one/x.png
diff --git a/plugins/emoji/public/images/unicode/1f49b.png b/plugins/emoji/public/images/emoji_one/yellow_heart.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f49b.png
rename to plugins/emoji/public/images/emoji_one/yellow_heart.png
diff --git a/plugins/emoji/public/images/unicode/1f4b4.png b/plugins/emoji/public/images/emoji_one/yen.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4b4.png
rename to plugins/emoji/public/images/emoji_one/yen.png
diff --git a/plugins/emoji/public/images/unicode/1f60b.png b/plugins/emoji/public/images/emoji_one/yum.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f60b.png
rename to plugins/emoji/public/images/emoji_one/yum.png
diff --git a/plugins/emoji/public/images/unicode/26a1.png b/plugins/emoji/public/images/emoji_one/zap.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/26a1.png
rename to plugins/emoji/public/images/emoji_one/zap.png
diff --git a/plugins/emoji/public/images/unicode/0030-20E3.png b/plugins/emoji/public/images/emoji_one/zero.png
similarity index 100%
rename from plugins/emoji/public/images/unicode/0030-20E3.png
rename to plugins/emoji/public/images/emoji_one/zero.png
diff --git a/plugins/emoji/public/images/unicode/1f4a4.png b/plugins/emoji/public/images/emoji_one/zzz.png
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/emoji/public/images/unicode/1f4a4.png
rename to plugins/emoji/public/images/emoji_one/zzz.png
diff --git a/plugins/emoji/public/images/end.png b/plugins/emoji/public/images/end.png
deleted file mode 120000
index 8350d8c305..0000000000
--- a/plugins/emoji/public/images/end.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f51a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/envelope.png b/plugins/emoji/public/images/envelope.png
deleted file mode 120000
index d4e66d388c..0000000000
--- a/plugins/emoji/public/images/envelope.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2709.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/envelope_with_arrow.png b/plugins/emoji/public/images/envelope_with_arrow.png
deleted file mode 120000
index 71b7adec1e..0000000000
--- a/plugins/emoji/public/images/envelope_with_arrow.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/es.png b/plugins/emoji/public/images/es.png
deleted file mode 120000
index ed803b9a7d..0000000000
--- a/plugins/emoji/public/images/es.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1ea-1f1f8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/euro.png b/plugins/emoji/public/images/euro.png
deleted file mode 120000
index 3645ce124e..0000000000
--- a/plugins/emoji/public/images/euro.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/european_castle.png b/plugins/emoji/public/images/european_castle.png
deleted file mode 120000
index 43eb0dcaee..0000000000
--- a/plugins/emoji/public/images/european_castle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3f0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/european_post_office.png b/plugins/emoji/public/images/european_post_office.png
deleted file mode 120000
index 431839cc9f..0000000000
--- a/plugins/emoji/public/images/european_post_office.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/evergreen_tree.png b/plugins/emoji/public/images/evergreen_tree.png
deleted file mode 120000
index 3484dccf5f..0000000000
--- a/plugins/emoji/public/images/evergreen_tree.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f332.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/exclamation.png b/plugins/emoji/public/images/exclamation.png
deleted file mode 120000
index f085c97778..0000000000
--- a/plugins/emoji/public/images/exclamation.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2757.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/expressionless.png b/plugins/emoji/public/images/expressionless.png
deleted file mode 120000
index c93d7e85e1..0000000000
--- a/plugins/emoji/public/images/expressionless.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f611.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/eyeglasses.png b/plugins/emoji/public/images/eyeglasses.png
deleted file mode 120000
index 8a3815a68b..0000000000
--- a/plugins/emoji/public/images/eyeglasses.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f453.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/eyes.png b/plugins/emoji/public/images/eyes.png
deleted file mode 120000
index 06a90075d6..0000000000
--- a/plugins/emoji/public/images/eyes.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f440.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/facepunch.png b/plugins/emoji/public/images/facepunch.png
deleted file mode 120000
index 2423b707f2..0000000000
--- a/plugins/emoji/public/images/facepunch.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f44a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/factory.png b/plugins/emoji/public/images/factory.png
deleted file mode 120000
index eb70c299a9..0000000000
--- a/plugins/emoji/public/images/factory.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ed.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fallen_leaf.png b/plugins/emoji/public/images/fallen_leaf.png
deleted file mode 120000
index b1b22b4501..0000000000
--- a/plugins/emoji/public/images/fallen_leaf.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f342.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/family.png b/plugins/emoji/public/images/family.png
deleted file mode 120000
index 94c3a5a3c7..0000000000
--- a/plugins/emoji/public/images/family.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f46a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fast_forward.png b/plugins/emoji/public/images/fast_forward.png
deleted file mode 120000
index bc32889d09..0000000000
--- a/plugins/emoji/public/images/fast_forward.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/23e9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fax.png b/plugins/emoji/public/images/fax.png
deleted file mode 120000
index 08e6af641a..0000000000
--- a/plugins/emoji/public/images/fax.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fearful.png b/plugins/emoji/public/images/fearful.png
deleted file mode 120000
index 65d3af1dfa..0000000000
--- a/plugins/emoji/public/images/fearful.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f628.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/feelsgood.png b/plugins/emoji/public/images/feelsgood.png
deleted file mode 100755
index e3e10fd5b2..0000000000
Binary files a/plugins/emoji/public/images/feelsgood.png and /dev/null differ
diff --git a/plugins/emoji/public/images/feet.png b/plugins/emoji/public/images/feet.png
deleted file mode 120000
index bbb76f06be..0000000000
--- a/plugins/emoji/public/images/feet.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f43e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ferris_wheel.png b/plugins/emoji/public/images/ferris_wheel.png
deleted file mode 120000
index 5ed10d3869..0000000000
--- a/plugins/emoji/public/images/ferris_wheel.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/file_folder.png b/plugins/emoji/public/images/file_folder.png
deleted file mode 120000
index 9c3f43fdae..0000000000
--- a/plugins/emoji/public/images/file_folder.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/finnadie.png b/plugins/emoji/public/images/finnadie.png
deleted file mode 100755
index 0ca5cdd95a..0000000000
Binary files a/plugins/emoji/public/images/finnadie.png and /dev/null differ
diff --git a/plugins/emoji/public/images/fire.png b/plugins/emoji/public/images/fire.png
deleted file mode 120000
index a8be27656a..0000000000
--- a/plugins/emoji/public/images/fire.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f525.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fire_engine.png b/plugins/emoji/public/images/fire_engine.png
deleted file mode 120000
index 63bbeafe2f..0000000000
--- a/plugins/emoji/public/images/fire_engine.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f692.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fireworks.png b/plugins/emoji/public/images/fireworks.png
deleted file mode 120000
index faa7194fb2..0000000000
--- a/plugins/emoji/public/images/fireworks.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f386.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/first_quarter_moon.png b/plugins/emoji/public/images/first_quarter_moon.png
deleted file mode 120000
index 07b1c4d700..0000000000
--- a/plugins/emoji/public/images/first_quarter_moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f313.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/first_quarter_moon_with_face.png b/plugins/emoji/public/images/first_quarter_moon_with_face.png
deleted file mode 120000
index fec7b969fe..0000000000
--- a/plugins/emoji/public/images/first_quarter_moon_with_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f31b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fish.png b/plugins/emoji/public/images/fish.png
deleted file mode 120000
index b1ca9cd265..0000000000
--- a/plugins/emoji/public/images/fish.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f41f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fish_cake.png b/plugins/emoji/public/images/fish_cake.png
deleted file mode 120000
index 090d80978a..0000000000
--- a/plugins/emoji/public/images/fish_cake.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f365.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fishing_pole_and_fish.png b/plugins/emoji/public/images/fishing_pole_and_fish.png
deleted file mode 120000
index 89abe1b6a1..0000000000
--- a/plugins/emoji/public/images/fishing_pole_and_fish.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fist.png b/plugins/emoji/public/images/fist.png
deleted file mode 120000
index 0aa21ff40b..0000000000
--- a/plugins/emoji/public/images/fist.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/270a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/five.png b/plugins/emoji/public/images/five.png
deleted file mode 120000
index e32fe5268e..0000000000
--- a/plugins/emoji/public/images/five.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0035.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/flags.png b/plugins/emoji/public/images/flags.png
deleted file mode 120000
index 76811b28d7..0000000000
--- a/plugins/emoji/public/images/flags.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f38f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/flashlight.png b/plugins/emoji/public/images/flashlight.png
deleted file mode 120000
index 662d68ae21..0000000000
--- a/plugins/emoji/public/images/flashlight.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f526.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/flipper.png b/plugins/emoji/public/images/flipper.png
deleted file mode 120000
index 608d04011e..0000000000
--- a/plugins/emoji/public/images/flipper.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f42c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/floppy_disk.png b/plugins/emoji/public/images/floppy_disk.png
deleted file mode 120000
index 09b4bf4a59..0000000000
--- a/plugins/emoji/public/images/floppy_disk.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4be.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/flower_playing_cards.png b/plugins/emoji/public/images/flower_playing_cards.png
deleted file mode 120000
index 78ab229c2f..0000000000
--- a/plugins/emoji/public/images/flower_playing_cards.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/flushed.png b/plugins/emoji/public/images/flushed.png
deleted file mode 120000
index 11e596bf6d..0000000000
--- a/plugins/emoji/public/images/flushed.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f633.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/foggy.png b/plugins/emoji/public/images/foggy.png
deleted file mode 120000
index f0db32efbb..0000000000
--- a/plugins/emoji/public/images/foggy.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f301.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/football.png b/plugins/emoji/public/images/football.png
deleted file mode 120000
index b6600ec6bc..0000000000
--- a/plugins/emoji/public/images/football.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/footprints.png b/plugins/emoji/public/images/footprints.png
deleted file mode 120000
index de5fe4383f..0000000000
--- a/plugins/emoji/public/images/footprints.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f463.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fork_and_knife.png b/plugins/emoji/public/images/fork_and_knife.png
deleted file mode 120000
index 8daf920680..0000000000
--- a/plugins/emoji/public/images/fork_and_knife.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f374.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fountain.png b/plugins/emoji/public/images/fountain.png
deleted file mode 120000
index ddadb5a143..0000000000
--- a/plugins/emoji/public/images/fountain.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26f2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/four.png b/plugins/emoji/public/images/four.png
deleted file mode 120000
index a5f8f2a279..0000000000
--- a/plugins/emoji/public/images/four.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0034.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/four_leaf_clover.png b/plugins/emoji/public/images/four_leaf_clover.png
deleted file mode 120000
index 7b517031a3..0000000000
--- a/plugins/emoji/public/images/four_leaf_clover.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f340.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fr.png b/plugins/emoji/public/images/fr.png
deleted file mode 120000
index c17d1b9df5..0000000000
--- a/plugins/emoji/public/images/fr.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1eb-1f1f7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/free.png b/plugins/emoji/public/images/free.png
deleted file mode 120000
index 6ee820ecbe..0000000000
--- a/plugins/emoji/public/images/free.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f193.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fried_shrimp.png b/plugins/emoji/public/images/fried_shrimp.png
deleted file mode 120000
index 00c55f30db..0000000000
--- a/plugins/emoji/public/images/fried_shrimp.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f364.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fries.png b/plugins/emoji/public/images/fries.png
deleted file mode 120000
index 5a5ee22c42..0000000000
--- a/plugins/emoji/public/images/fries.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f35f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/frog.png b/plugins/emoji/public/images/frog.png
deleted file mode 120000
index 7b551cf72f..0000000000
--- a/plugins/emoji/public/images/frog.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f438.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/frowning.png b/plugins/emoji/public/images/frowning.png
deleted file mode 120000
index 030996a720..0000000000
--- a/plugins/emoji/public/images/frowning.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f626.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/fu.png b/plugins/emoji/public/images/fu.png
deleted file mode 100755
index 195fbc319d..0000000000
Binary files a/plugins/emoji/public/images/fu.png and /dev/null differ
diff --git a/plugins/emoji/public/images/fuelpump.png b/plugins/emoji/public/images/fuelpump.png
deleted file mode 120000
index 811fd8d15d..0000000000
--- a/plugins/emoji/public/images/fuelpump.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26fd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/full_moon.png b/plugins/emoji/public/images/full_moon.png
deleted file mode 120000
index 13b0a191ce..0000000000
--- a/plugins/emoji/public/images/full_moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f315.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/full_moon_with_face.png b/plugins/emoji/public/images/full_moon_with_face.png
deleted file mode 120000
index 37f8fe7f24..0000000000
--- a/plugins/emoji/public/images/full_moon_with_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f31d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/game_die.png b/plugins/emoji/public/images/game_die.png
deleted file mode 120000
index be998c49f2..0000000000
--- a/plugins/emoji/public/images/game_die.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/gb.png b/plugins/emoji/public/images/gb.png
deleted file mode 120000
index 68cbaff002..0000000000
--- a/plugins/emoji/public/images/gb.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1ec-1f1e7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/gem.png b/plugins/emoji/public/images/gem.png
deleted file mode 120000
index d0e148e102..0000000000
--- a/plugins/emoji/public/images/gem.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f48e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/gemini.png b/plugins/emoji/public/images/gemini.png
deleted file mode 120000
index b061a84951..0000000000
--- a/plugins/emoji/public/images/gemini.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/264a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ghost.png b/plugins/emoji/public/images/ghost.png
deleted file mode 120000
index 9eb885c599..0000000000
--- a/plugins/emoji/public/images/ghost.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f47b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/gift.png b/plugins/emoji/public/images/gift.png
deleted file mode 120000
index e96bbeb4e4..0000000000
--- a/plugins/emoji/public/images/gift.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f381.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/gift_heart.png b/plugins/emoji/public/images/gift_heart.png
deleted file mode 120000
index fecb0f328d..0000000000
--- a/plugins/emoji/public/images/gift_heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f49d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/girl.png b/plugins/emoji/public/images/girl.png
deleted file mode 120000
index f364b9bea7..0000000000
--- a/plugins/emoji/public/images/girl.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f467.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/globe_with_meridians.png b/plugins/emoji/public/images/globe_with_meridians.png
deleted file mode 120000
index ce26e094ba..0000000000
--- a/plugins/emoji/public/images/globe_with_meridians.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f310.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/goat.png b/plugins/emoji/public/images/goat.png
deleted file mode 120000
index 684cf9f0b3..0000000000
--- a/plugins/emoji/public/images/goat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f410.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/goberserk.png b/plugins/emoji/public/images/goberserk.png
deleted file mode 100755
index 59a742aaaa..0000000000
Binary files a/plugins/emoji/public/images/goberserk.png and /dev/null differ
diff --git a/plugins/emoji/public/images/godmode.png b/plugins/emoji/public/images/godmode.png
deleted file mode 100755
index 7e3313d9b0..0000000000
Binary files a/plugins/emoji/public/images/godmode.png and /dev/null differ
diff --git a/plugins/emoji/public/images/golf.png b/plugins/emoji/public/images/golf.png
deleted file mode 120000
index cbead94def..0000000000
--- a/plugins/emoji/public/images/golf.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26f3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/google/+1.png b/plugins/emoji/public/images/google/+1.png
new file mode 100644
index 0000000000..2f1ba2803b
Binary files /dev/null and b/plugins/emoji/public/images/google/+1.png differ
diff --git a/plugins/emoji/public/images/google/-1.png b/plugins/emoji/public/images/google/-1.png
new file mode 100644
index 0000000000..96be997bfb
Binary files /dev/null and b/plugins/emoji/public/images/google/-1.png differ
diff --git a/plugins/emoji/public/images/google/100.png b/plugins/emoji/public/images/google/100.png
new file mode 100644
index 0000000000..559de876a1
Binary files /dev/null and b/plugins/emoji/public/images/google/100.png differ
diff --git a/plugins/emoji/public/images/google/1234.png b/plugins/emoji/public/images/google/1234.png
new file mode 100644
index 0000000000..4461d4d544
Binary files /dev/null and b/plugins/emoji/public/images/google/1234.png differ
diff --git a/plugins/emoji/public/images/google/8ball.png b/plugins/emoji/public/images/google/8ball.png
new file mode 100644
index 0000000000..aa8a6217eb
Binary files /dev/null and b/plugins/emoji/public/images/google/8ball.png differ
diff --git a/plugins/emoji/public/images/google/a.png b/plugins/emoji/public/images/google/a.png
new file mode 100644
index 0000000000..92dc7de949
Binary files /dev/null and b/plugins/emoji/public/images/google/a.png differ
diff --git a/plugins/emoji/public/images/google/ab.png b/plugins/emoji/public/images/google/ab.png
new file mode 100644
index 0000000000..a4121448a5
Binary files /dev/null and b/plugins/emoji/public/images/google/ab.png differ
diff --git a/plugins/emoji/public/images/google/abc.png b/plugins/emoji/public/images/google/abc.png
new file mode 100644
index 0000000000..02aeb9310f
Binary files /dev/null and b/plugins/emoji/public/images/google/abc.png differ
diff --git a/plugins/emoji/public/images/google/abcd.png b/plugins/emoji/public/images/google/abcd.png
new file mode 100644
index 0000000000..851dcf7064
Binary files /dev/null and b/plugins/emoji/public/images/google/abcd.png differ
diff --git a/plugins/emoji/public/images/google/accept.png b/plugins/emoji/public/images/google/accept.png
new file mode 100644
index 0000000000..4f38c712dc
Binary files /dev/null and b/plugins/emoji/public/images/google/accept.png differ
diff --git a/plugins/emoji/public/images/google/aerial_tramway.png b/plugins/emoji/public/images/google/aerial_tramway.png
new file mode 100644
index 0000000000..db8a5e7651
Binary files /dev/null and b/plugins/emoji/public/images/google/aerial_tramway.png differ
diff --git a/plugins/emoji/public/images/google/airplane.png b/plugins/emoji/public/images/google/airplane.png
new file mode 100644
index 0000000000..10b2184d81
Binary files /dev/null and b/plugins/emoji/public/images/google/airplane.png differ
diff --git a/plugins/emoji/public/images/google/alarm_clock.png b/plugins/emoji/public/images/google/alarm_clock.png
new file mode 100644
index 0000000000..8c2793ff02
Binary files /dev/null and b/plugins/emoji/public/images/google/alarm_clock.png differ
diff --git a/plugins/emoji/public/images/google/alien.png b/plugins/emoji/public/images/google/alien.png
new file mode 100644
index 0000000000..7c40dc7d3a
Binary files /dev/null and b/plugins/emoji/public/images/google/alien.png differ
diff --git a/plugins/emoji/public/images/google/ambulance.png b/plugins/emoji/public/images/google/ambulance.png
new file mode 100644
index 0000000000..322b28592f
Binary files /dev/null and b/plugins/emoji/public/images/google/ambulance.png differ
diff --git a/plugins/emoji/public/images/google/anchor.png b/plugins/emoji/public/images/google/anchor.png
new file mode 100644
index 0000000000..ec66405c0d
Binary files /dev/null and b/plugins/emoji/public/images/google/anchor.png differ
diff --git a/plugins/emoji/public/images/google/angel.png b/plugins/emoji/public/images/google/angel.png
new file mode 100644
index 0000000000..2d04f6343a
Binary files /dev/null and b/plugins/emoji/public/images/google/angel.png differ
diff --git a/plugins/emoji/public/images/google/anger.png b/plugins/emoji/public/images/google/anger.png
new file mode 100644
index 0000000000..7627ff7a66
Binary files /dev/null and b/plugins/emoji/public/images/google/anger.png differ
diff --git a/plugins/emoji/public/images/google/angry.png b/plugins/emoji/public/images/google/angry.png
new file mode 100644
index 0000000000..f3b88c0c77
Binary files /dev/null and b/plugins/emoji/public/images/google/angry.png differ
diff --git a/plugins/emoji/public/images/google/anguished.png b/plugins/emoji/public/images/google/anguished.png
new file mode 100644
index 0000000000..cefe83c9fd
Binary files /dev/null and b/plugins/emoji/public/images/google/anguished.png differ
diff --git a/plugins/emoji/public/images/google/ant.png b/plugins/emoji/public/images/google/ant.png
new file mode 100644
index 0000000000..7728617675
Binary files /dev/null and b/plugins/emoji/public/images/google/ant.png differ
diff --git a/plugins/emoji/public/images/google/apple.png b/plugins/emoji/public/images/google/apple.png
new file mode 100644
index 0000000000..2f3c07c343
Binary files /dev/null and b/plugins/emoji/public/images/google/apple.png differ
diff --git a/plugins/emoji/public/images/google/aquarius.png b/plugins/emoji/public/images/google/aquarius.png
new file mode 100644
index 0000000000..6a1c5f36a2
Binary files /dev/null and b/plugins/emoji/public/images/google/aquarius.png differ
diff --git a/plugins/emoji/public/images/google/aries.png b/plugins/emoji/public/images/google/aries.png
new file mode 100644
index 0000000000..cbd7856fb9
Binary files /dev/null and b/plugins/emoji/public/images/google/aries.png differ
diff --git a/plugins/emoji/public/images/google/arrow_backward.png b/plugins/emoji/public/images/google/arrow_backward.png
new file mode 100644
index 0000000000..c98f7f9955
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_backward.png differ
diff --git a/plugins/emoji/public/images/google/arrow_double_down.png b/plugins/emoji/public/images/google/arrow_double_down.png
new file mode 100644
index 0000000000..311a3fef80
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_double_down.png differ
diff --git a/plugins/emoji/public/images/google/arrow_double_up.png b/plugins/emoji/public/images/google/arrow_double_up.png
new file mode 100644
index 0000000000..649fde71e8
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_double_up.png differ
diff --git a/plugins/emoji/public/images/google/arrow_down.png b/plugins/emoji/public/images/google/arrow_down.png
new file mode 100644
index 0000000000..653ab99180
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_down.png differ
diff --git a/plugins/emoji/public/images/google/arrow_down_small.png b/plugins/emoji/public/images/google/arrow_down_small.png
new file mode 100644
index 0000000000..b579f28867
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_down_small.png differ
diff --git a/plugins/emoji/public/images/google/arrow_forward.png b/plugins/emoji/public/images/google/arrow_forward.png
new file mode 100644
index 0000000000..ae15fadb16
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_forward.png differ
diff --git a/plugins/emoji/public/images/google/arrow_heading_down.png b/plugins/emoji/public/images/google/arrow_heading_down.png
new file mode 100644
index 0000000000..a856cfc462
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_heading_down.png differ
diff --git a/plugins/emoji/public/images/google/arrow_heading_up.png b/plugins/emoji/public/images/google/arrow_heading_up.png
new file mode 100644
index 0000000000..6594f22b07
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_heading_up.png differ
diff --git a/plugins/emoji/public/images/google/arrow_left.png b/plugins/emoji/public/images/google/arrow_left.png
new file mode 100644
index 0000000000..816ec6585b
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_left.png differ
diff --git a/plugins/emoji/public/images/google/arrow_lower_left.png b/plugins/emoji/public/images/google/arrow_lower_left.png
new file mode 100644
index 0000000000..7471f3381d
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_lower_left.png differ
diff --git a/plugins/emoji/public/images/google/arrow_lower_right.png b/plugins/emoji/public/images/google/arrow_lower_right.png
new file mode 100644
index 0000000000..b5f2766199
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_lower_right.png differ
diff --git a/plugins/emoji/public/images/google/arrow_right.png b/plugins/emoji/public/images/google/arrow_right.png
new file mode 100644
index 0000000000..1cff97d2ec
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_right.png differ
diff --git a/plugins/emoji/public/images/google/arrow_right_hook.png b/plugins/emoji/public/images/google/arrow_right_hook.png
new file mode 100644
index 0000000000..0b28870183
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_right_hook.png differ
diff --git a/plugins/emoji/public/images/google/arrow_up.png b/plugins/emoji/public/images/google/arrow_up.png
new file mode 100644
index 0000000000..a35d061598
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_up.png differ
diff --git a/plugins/emoji/public/images/google/arrow_up_down.png b/plugins/emoji/public/images/google/arrow_up_down.png
new file mode 100644
index 0000000000..ecd7e947df
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_up_down.png differ
diff --git a/plugins/emoji/public/images/google/arrow_up_small.png b/plugins/emoji/public/images/google/arrow_up_small.png
new file mode 100644
index 0000000000..a3e1f5e9fa
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_up_small.png differ
diff --git a/plugins/emoji/public/images/google/arrow_upper_left.png b/plugins/emoji/public/images/google/arrow_upper_left.png
new file mode 100644
index 0000000000..bca2b4096f
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_upper_left.png differ
diff --git a/plugins/emoji/public/images/google/arrow_upper_right.png b/plugins/emoji/public/images/google/arrow_upper_right.png
new file mode 100644
index 0000000000..af40ceeef3
Binary files /dev/null and b/plugins/emoji/public/images/google/arrow_upper_right.png differ
diff --git a/plugins/emoji/public/images/google/arrows_clockwise.png b/plugins/emoji/public/images/google/arrows_clockwise.png
new file mode 100644
index 0000000000..cd4959f6c0
Binary files /dev/null and b/plugins/emoji/public/images/google/arrows_clockwise.png differ
diff --git a/plugins/emoji/public/images/google/arrows_counterclockwise.png b/plugins/emoji/public/images/google/arrows_counterclockwise.png
new file mode 100644
index 0000000000..f4ea338bee
Binary files /dev/null and b/plugins/emoji/public/images/google/arrows_counterclockwise.png differ
diff --git a/plugins/emoji/public/images/google/art.png b/plugins/emoji/public/images/google/art.png
new file mode 100644
index 0000000000..4cf0458844
Binary files /dev/null and b/plugins/emoji/public/images/google/art.png differ
diff --git a/plugins/emoji/public/images/google/articulated_lorry.png b/plugins/emoji/public/images/google/articulated_lorry.png
new file mode 100644
index 0000000000..545b0e2f43
Binary files /dev/null and b/plugins/emoji/public/images/google/articulated_lorry.png differ
diff --git a/plugins/emoji/public/images/google/astonished.png b/plugins/emoji/public/images/google/astonished.png
new file mode 100644
index 0000000000..a9003ec7b2
Binary files /dev/null and b/plugins/emoji/public/images/google/astonished.png differ
diff --git a/plugins/emoji/public/images/google/athletic_shoe.png b/plugins/emoji/public/images/google/athletic_shoe.png
new file mode 100644
index 0000000000..0d81df9d89
Binary files /dev/null and b/plugins/emoji/public/images/google/athletic_shoe.png differ
diff --git a/plugins/emoji/public/images/google/atm.png b/plugins/emoji/public/images/google/atm.png
new file mode 100644
index 0000000000..f6a80f5e9d
Binary files /dev/null and b/plugins/emoji/public/images/google/atm.png differ
diff --git a/plugins/emoji/public/images/google/b.png b/plugins/emoji/public/images/google/b.png
new file mode 100644
index 0000000000..c318b72ddc
Binary files /dev/null and b/plugins/emoji/public/images/google/b.png differ
diff --git a/plugins/emoji/public/images/google/baby.png b/plugins/emoji/public/images/google/baby.png
new file mode 100644
index 0000000000..8245b27bc5
Binary files /dev/null and b/plugins/emoji/public/images/google/baby.png differ
diff --git a/plugins/emoji/public/images/google/baby_bottle.png b/plugins/emoji/public/images/google/baby_bottle.png
new file mode 100644
index 0000000000..1dedb552e2
Binary files /dev/null and b/plugins/emoji/public/images/google/baby_bottle.png differ
diff --git a/plugins/emoji/public/images/google/baby_chick.png b/plugins/emoji/public/images/google/baby_chick.png
new file mode 100644
index 0000000000..820bfad63f
Binary files /dev/null and b/plugins/emoji/public/images/google/baby_chick.png differ
diff --git a/plugins/emoji/public/images/google/baby_symbol.png b/plugins/emoji/public/images/google/baby_symbol.png
new file mode 100644
index 0000000000..bccf92c0f1
Binary files /dev/null and b/plugins/emoji/public/images/google/baby_symbol.png differ
diff --git a/plugins/emoji/public/images/google/back.png b/plugins/emoji/public/images/google/back.png
new file mode 100644
index 0000000000..691c1a2eca
Binary files /dev/null and b/plugins/emoji/public/images/google/back.png differ
diff --git a/plugins/emoji/public/images/google/baggage_claim.png b/plugins/emoji/public/images/google/baggage_claim.png
new file mode 100644
index 0000000000..8d4369c04c
Binary files /dev/null and b/plugins/emoji/public/images/google/baggage_claim.png differ
diff --git a/plugins/emoji/public/images/google/balloon.png b/plugins/emoji/public/images/google/balloon.png
new file mode 100644
index 0000000000..99801931e5
Binary files /dev/null and b/plugins/emoji/public/images/google/balloon.png differ
diff --git a/plugins/emoji/public/images/google/ballot_box_with_check.png b/plugins/emoji/public/images/google/ballot_box_with_check.png
new file mode 100644
index 0000000000..a9773e0d71
Binary files /dev/null and b/plugins/emoji/public/images/google/ballot_box_with_check.png differ
diff --git a/plugins/emoji/public/images/google/bamboo.png b/plugins/emoji/public/images/google/bamboo.png
new file mode 100644
index 0000000000..b4daff77df
Binary files /dev/null and b/plugins/emoji/public/images/google/bamboo.png differ
diff --git a/plugins/emoji/public/images/google/banana.png b/plugins/emoji/public/images/google/banana.png
new file mode 100644
index 0000000000..ece706a50e
Binary files /dev/null and b/plugins/emoji/public/images/google/banana.png differ
diff --git a/plugins/emoji/public/images/google/bangbang.png b/plugins/emoji/public/images/google/bangbang.png
new file mode 100644
index 0000000000..2f97a6c5de
Binary files /dev/null and b/plugins/emoji/public/images/google/bangbang.png differ
diff --git a/plugins/emoji/public/images/google/bank.png b/plugins/emoji/public/images/google/bank.png
new file mode 100644
index 0000000000..2f3f8b760c
Binary files /dev/null and b/plugins/emoji/public/images/google/bank.png differ
diff --git a/plugins/emoji/public/images/google/bar_chart.png b/plugins/emoji/public/images/google/bar_chart.png
new file mode 100644
index 0000000000..ea845063d3
Binary files /dev/null and b/plugins/emoji/public/images/google/bar_chart.png differ
diff --git a/plugins/emoji/public/images/google/barber.png b/plugins/emoji/public/images/google/barber.png
new file mode 100644
index 0000000000..1bb57e9d5c
Binary files /dev/null and b/plugins/emoji/public/images/google/barber.png differ
diff --git a/plugins/emoji/public/images/google/baseball.png b/plugins/emoji/public/images/google/baseball.png
new file mode 100644
index 0000000000..3b3706f16f
Binary files /dev/null and b/plugins/emoji/public/images/google/baseball.png differ
diff --git a/plugins/emoji/public/images/google/basketball.png b/plugins/emoji/public/images/google/basketball.png
new file mode 100644
index 0000000000..5e9d06bfbe
Binary files /dev/null and b/plugins/emoji/public/images/google/basketball.png differ
diff --git a/plugins/emoji/public/images/google/bath.png b/plugins/emoji/public/images/google/bath.png
new file mode 100644
index 0000000000..af6108cd11
Binary files /dev/null and b/plugins/emoji/public/images/google/bath.png differ
diff --git a/plugins/emoji/public/images/google/bathtub.png b/plugins/emoji/public/images/google/bathtub.png
new file mode 100644
index 0000000000..175c609494
Binary files /dev/null and b/plugins/emoji/public/images/google/bathtub.png differ
diff --git a/plugins/emoji/public/images/google/battery.png b/plugins/emoji/public/images/google/battery.png
new file mode 100644
index 0000000000..08da3ee311
Binary files /dev/null and b/plugins/emoji/public/images/google/battery.png differ
diff --git a/plugins/emoji/public/images/google/bear.png b/plugins/emoji/public/images/google/bear.png
new file mode 100644
index 0000000000..596054e412
Binary files /dev/null and b/plugins/emoji/public/images/google/bear.png differ
diff --git a/plugins/emoji/public/images/google/bee.png b/plugins/emoji/public/images/google/bee.png
new file mode 100644
index 0000000000..031d526e4b
Binary files /dev/null and b/plugins/emoji/public/images/google/bee.png differ
diff --git a/plugins/emoji/public/images/google/beer.png b/plugins/emoji/public/images/google/beer.png
new file mode 100644
index 0000000000..c2056491dc
Binary files /dev/null and b/plugins/emoji/public/images/google/beer.png differ
diff --git a/plugins/emoji/public/images/google/beers.png b/plugins/emoji/public/images/google/beers.png
new file mode 100644
index 0000000000..f117716d2e
Binary files /dev/null and b/plugins/emoji/public/images/google/beers.png differ
diff --git a/plugins/emoji/public/images/google/beetle.png b/plugins/emoji/public/images/google/beetle.png
new file mode 100644
index 0000000000..c70cb22caa
Binary files /dev/null and b/plugins/emoji/public/images/google/beetle.png differ
diff --git a/plugins/emoji/public/images/google/beginner.png b/plugins/emoji/public/images/google/beginner.png
new file mode 100644
index 0000000000..e7affa1b0f
Binary files /dev/null and b/plugins/emoji/public/images/google/beginner.png differ
diff --git a/plugins/emoji/public/images/google/bell.png b/plugins/emoji/public/images/google/bell.png
new file mode 100644
index 0000000000..3bf8117489
Binary files /dev/null and b/plugins/emoji/public/images/google/bell.png differ
diff --git a/plugins/emoji/public/images/google/bento.png b/plugins/emoji/public/images/google/bento.png
new file mode 100644
index 0000000000..0c75570008
Binary files /dev/null and b/plugins/emoji/public/images/google/bento.png differ
diff --git a/plugins/emoji/public/images/google/bicyclist.png b/plugins/emoji/public/images/google/bicyclist.png
new file mode 100644
index 0000000000..727d56c13c
Binary files /dev/null and b/plugins/emoji/public/images/google/bicyclist.png differ
diff --git a/plugins/emoji/public/images/google/bike.png b/plugins/emoji/public/images/google/bike.png
new file mode 100644
index 0000000000..fcfb2a423a
Binary files /dev/null and b/plugins/emoji/public/images/google/bike.png differ
diff --git a/plugins/emoji/public/images/google/bikini.png b/plugins/emoji/public/images/google/bikini.png
new file mode 100644
index 0000000000..8a21b44d28
Binary files /dev/null and b/plugins/emoji/public/images/google/bikini.png differ
diff --git a/plugins/emoji/public/images/google/bird.png b/plugins/emoji/public/images/google/bird.png
new file mode 100644
index 0000000000..ea0eb511d1
Binary files /dev/null and b/plugins/emoji/public/images/google/bird.png differ
diff --git a/plugins/emoji/public/images/google/birthday.png b/plugins/emoji/public/images/google/birthday.png
new file mode 100644
index 0000000000..3a2f98f25e
Binary files /dev/null and b/plugins/emoji/public/images/google/birthday.png differ
diff --git a/plugins/emoji/public/images/google/black_circle.png b/plugins/emoji/public/images/google/black_circle.png
new file mode 100644
index 0000000000..f326349233
Binary files /dev/null and b/plugins/emoji/public/images/google/black_circle.png differ
diff --git a/plugins/emoji/public/images/google/black_joker.png b/plugins/emoji/public/images/google/black_joker.png
new file mode 100644
index 0000000000..1d0b4ad0ff
Binary files /dev/null and b/plugins/emoji/public/images/google/black_joker.png differ
diff --git a/plugins/emoji/public/images/google/black_large_square.png b/plugins/emoji/public/images/google/black_large_square.png
new file mode 100644
index 0000000000..1eee0d853a
Binary files /dev/null and b/plugins/emoji/public/images/google/black_large_square.png differ
diff --git a/plugins/emoji/public/images/google/black_medium_small_square.png b/plugins/emoji/public/images/google/black_medium_small_square.png
new file mode 100644
index 0000000000..6aa58f53dc
Binary files /dev/null and b/plugins/emoji/public/images/google/black_medium_small_square.png differ
diff --git a/plugins/emoji/public/images/google/black_medium_square.png b/plugins/emoji/public/images/google/black_medium_square.png
new file mode 100644
index 0000000000..379f836384
Binary files /dev/null and b/plugins/emoji/public/images/google/black_medium_square.png differ
diff --git a/plugins/emoji/public/images/google/black_nib.png b/plugins/emoji/public/images/google/black_nib.png
new file mode 100644
index 0000000000..826f0d2f52
Binary files /dev/null and b/plugins/emoji/public/images/google/black_nib.png differ
diff --git a/plugins/emoji/public/images/google/black_small_square.png b/plugins/emoji/public/images/google/black_small_square.png
new file mode 100644
index 0000000000..ba9df8a684
Binary files /dev/null and b/plugins/emoji/public/images/google/black_small_square.png differ
diff --git a/plugins/emoji/public/images/google/black_square_button.png b/plugins/emoji/public/images/google/black_square_button.png
new file mode 100644
index 0000000000..a94bd8fc1e
Binary files /dev/null and b/plugins/emoji/public/images/google/black_square_button.png differ
diff --git a/plugins/emoji/public/images/google/blossom.png b/plugins/emoji/public/images/google/blossom.png
new file mode 100644
index 0000000000..f5a67b864d
Binary files /dev/null and b/plugins/emoji/public/images/google/blossom.png differ
diff --git a/plugins/emoji/public/images/google/blowfish.png b/plugins/emoji/public/images/google/blowfish.png
new file mode 100644
index 0000000000..00103fcbe7
Binary files /dev/null and b/plugins/emoji/public/images/google/blowfish.png differ
diff --git a/plugins/emoji/public/images/google/blue_book.png b/plugins/emoji/public/images/google/blue_book.png
new file mode 100644
index 0000000000..0ff91b52ea
Binary files /dev/null and b/plugins/emoji/public/images/google/blue_book.png differ
diff --git a/plugins/emoji/public/images/google/blue_car.png b/plugins/emoji/public/images/google/blue_car.png
new file mode 100644
index 0000000000..55e2252f7b
Binary files /dev/null and b/plugins/emoji/public/images/google/blue_car.png differ
diff --git a/plugins/emoji/public/images/google/blue_heart.png b/plugins/emoji/public/images/google/blue_heart.png
new file mode 100644
index 0000000000..25bd6008f0
Binary files /dev/null and b/plugins/emoji/public/images/google/blue_heart.png differ
diff --git a/plugins/emoji/public/images/google/blush.png b/plugins/emoji/public/images/google/blush.png
new file mode 100644
index 0000000000..80376bf285
Binary files /dev/null and b/plugins/emoji/public/images/google/blush.png differ
diff --git a/plugins/emoji/public/images/google/boar.png b/plugins/emoji/public/images/google/boar.png
new file mode 100644
index 0000000000..27ad342c5d
Binary files /dev/null and b/plugins/emoji/public/images/google/boar.png differ
diff --git a/plugins/emoji/public/images/google/boat.png b/plugins/emoji/public/images/google/boat.png
new file mode 100644
index 0000000000..b4142fe1ec
Binary files /dev/null and b/plugins/emoji/public/images/google/boat.png differ
diff --git a/plugins/emoji/public/images/google/bomb.png b/plugins/emoji/public/images/google/bomb.png
new file mode 100644
index 0000000000..dcdfe8c1e8
Binary files /dev/null and b/plugins/emoji/public/images/google/bomb.png differ
diff --git a/plugins/emoji/public/images/google/book.png b/plugins/emoji/public/images/google/book.png
new file mode 100644
index 0000000000..890304706b
Binary files /dev/null and b/plugins/emoji/public/images/google/book.png differ
diff --git a/plugins/emoji/public/images/google/bookmark.png b/plugins/emoji/public/images/google/bookmark.png
new file mode 100644
index 0000000000..31a586c1d6
Binary files /dev/null and b/plugins/emoji/public/images/google/bookmark.png differ
diff --git a/plugins/emoji/public/images/google/bookmark_tabs.png b/plugins/emoji/public/images/google/bookmark_tabs.png
new file mode 100644
index 0000000000..f06b624479
Binary files /dev/null and b/plugins/emoji/public/images/google/bookmark_tabs.png differ
diff --git a/plugins/emoji/public/images/google/books.png b/plugins/emoji/public/images/google/books.png
new file mode 100644
index 0000000000..5687a34c95
Binary files /dev/null and b/plugins/emoji/public/images/google/books.png differ
diff --git a/plugins/emoji/public/images/google/boom.png b/plugins/emoji/public/images/google/boom.png
new file mode 100644
index 0000000000..d5dc3bb0e2
Binary files /dev/null and b/plugins/emoji/public/images/google/boom.png differ
diff --git a/plugins/emoji/public/images/google/boot.png b/plugins/emoji/public/images/google/boot.png
new file mode 100644
index 0000000000..cd2f9d8923
Binary files /dev/null and b/plugins/emoji/public/images/google/boot.png differ
diff --git a/plugins/emoji/public/images/google/bouquet.png b/plugins/emoji/public/images/google/bouquet.png
new file mode 100644
index 0000000000..aa738fa65d
Binary files /dev/null and b/plugins/emoji/public/images/google/bouquet.png differ
diff --git a/plugins/emoji/public/images/google/bow.png b/plugins/emoji/public/images/google/bow.png
new file mode 100644
index 0000000000..83c38d8fa7
Binary files /dev/null and b/plugins/emoji/public/images/google/bow.png differ
diff --git a/plugins/emoji/public/images/google/bowling.png b/plugins/emoji/public/images/google/bowling.png
new file mode 100644
index 0000000000..56978eaa74
Binary files /dev/null and b/plugins/emoji/public/images/google/bowling.png differ
diff --git a/plugins/emoji/public/images/google/boy.png b/plugins/emoji/public/images/google/boy.png
new file mode 100644
index 0000000000..cb76bdcb81
Binary files /dev/null and b/plugins/emoji/public/images/google/boy.png differ
diff --git a/plugins/emoji/public/images/google/bread.png b/plugins/emoji/public/images/google/bread.png
new file mode 100644
index 0000000000..6d696f3a76
Binary files /dev/null and b/plugins/emoji/public/images/google/bread.png differ
diff --git a/plugins/emoji/public/images/google/bride_with_veil.png b/plugins/emoji/public/images/google/bride_with_veil.png
new file mode 100644
index 0000000000..27ca2da0a7
Binary files /dev/null and b/plugins/emoji/public/images/google/bride_with_veil.png differ
diff --git a/plugins/emoji/public/images/google/bridge_at_night.png b/plugins/emoji/public/images/google/bridge_at_night.png
new file mode 100644
index 0000000000..7eb30ff87b
Binary files /dev/null and b/plugins/emoji/public/images/google/bridge_at_night.png differ
diff --git a/plugins/emoji/public/images/google/briefcase.png b/plugins/emoji/public/images/google/briefcase.png
new file mode 100644
index 0000000000..b0844bc5ca
Binary files /dev/null and b/plugins/emoji/public/images/google/briefcase.png differ
diff --git a/plugins/emoji/public/images/google/broken_heart.png b/plugins/emoji/public/images/google/broken_heart.png
new file mode 100644
index 0000000000..726d412787
Binary files /dev/null and b/plugins/emoji/public/images/google/broken_heart.png differ
diff --git a/plugins/emoji/public/images/google/bug.png b/plugins/emoji/public/images/google/bug.png
new file mode 100644
index 0000000000..bb996a9817
Binary files /dev/null and b/plugins/emoji/public/images/google/bug.png differ
diff --git a/plugins/emoji/public/images/google/bulb.png b/plugins/emoji/public/images/google/bulb.png
new file mode 100644
index 0000000000..d634b39f07
Binary files /dev/null and b/plugins/emoji/public/images/google/bulb.png differ
diff --git a/plugins/emoji/public/images/google/bullettrain_front.png b/plugins/emoji/public/images/google/bullettrain_front.png
new file mode 100644
index 0000000000..93edfb437b
Binary files /dev/null and b/plugins/emoji/public/images/google/bullettrain_front.png differ
diff --git a/plugins/emoji/public/images/google/bullettrain_side.png b/plugins/emoji/public/images/google/bullettrain_side.png
new file mode 100644
index 0000000000..054e397c07
Binary files /dev/null and b/plugins/emoji/public/images/google/bullettrain_side.png differ
diff --git a/plugins/emoji/public/images/google/bus.png b/plugins/emoji/public/images/google/bus.png
new file mode 100644
index 0000000000..688645b181
Binary files /dev/null and b/plugins/emoji/public/images/google/bus.png differ
diff --git a/plugins/emoji/public/images/google/busstop.png b/plugins/emoji/public/images/google/busstop.png
new file mode 100644
index 0000000000..b603f1872c
Binary files /dev/null and b/plugins/emoji/public/images/google/busstop.png differ
diff --git a/plugins/emoji/public/images/google/bust_in_silhouette.png b/plugins/emoji/public/images/google/bust_in_silhouette.png
new file mode 100644
index 0000000000..5da8aee353
Binary files /dev/null and b/plugins/emoji/public/images/google/bust_in_silhouette.png differ
diff --git a/plugins/emoji/public/images/google/busts_in_silhouette.png b/plugins/emoji/public/images/google/busts_in_silhouette.png
new file mode 100644
index 0000000000..843437a6db
Binary files /dev/null and b/plugins/emoji/public/images/google/busts_in_silhouette.png differ
diff --git a/plugins/emoji/public/images/google/cactus.png b/plugins/emoji/public/images/google/cactus.png
new file mode 100644
index 0000000000..37be6f029d
Binary files /dev/null and b/plugins/emoji/public/images/google/cactus.png differ
diff --git a/plugins/emoji/public/images/google/cake.png b/plugins/emoji/public/images/google/cake.png
new file mode 100644
index 0000000000..15c4beb01b
Binary files /dev/null and b/plugins/emoji/public/images/google/cake.png differ
diff --git a/plugins/emoji/public/images/google/calendar.png b/plugins/emoji/public/images/google/calendar.png
new file mode 100644
index 0000000000..804f95ed8a
Binary files /dev/null and b/plugins/emoji/public/images/google/calendar.png differ
diff --git a/plugins/emoji/public/images/google/calling.png b/plugins/emoji/public/images/google/calling.png
new file mode 100644
index 0000000000..fdbd10ef22
Binary files /dev/null and b/plugins/emoji/public/images/google/calling.png differ
diff --git a/plugins/emoji/public/images/google/camel.png b/plugins/emoji/public/images/google/camel.png
new file mode 100644
index 0000000000..fd1fdba78e
Binary files /dev/null and b/plugins/emoji/public/images/google/camel.png differ
diff --git a/plugins/emoji/public/images/google/camera.png b/plugins/emoji/public/images/google/camera.png
new file mode 100644
index 0000000000..7435ad88fa
Binary files /dev/null and b/plugins/emoji/public/images/google/camera.png differ
diff --git a/plugins/emoji/public/images/google/cancer.png b/plugins/emoji/public/images/google/cancer.png
new file mode 100644
index 0000000000..91a610bea5
Binary files /dev/null and b/plugins/emoji/public/images/google/cancer.png differ
diff --git a/plugins/emoji/public/images/google/candy.png b/plugins/emoji/public/images/google/candy.png
new file mode 100644
index 0000000000..d220dd56b0
Binary files /dev/null and b/plugins/emoji/public/images/google/candy.png differ
diff --git a/plugins/emoji/public/images/google/capital_abcd.png b/plugins/emoji/public/images/google/capital_abcd.png
new file mode 100644
index 0000000000..a72fb3c3dd
Binary files /dev/null and b/plugins/emoji/public/images/google/capital_abcd.png differ
diff --git a/plugins/emoji/public/images/google/capricorn.png b/plugins/emoji/public/images/google/capricorn.png
new file mode 100644
index 0000000000..85912cff75
Binary files /dev/null and b/plugins/emoji/public/images/google/capricorn.png differ
diff --git a/plugins/emoji/public/images/google/car.png b/plugins/emoji/public/images/google/car.png
new file mode 100644
index 0000000000..a97442b445
Binary files /dev/null and b/plugins/emoji/public/images/google/car.png differ
diff --git a/plugins/emoji/public/images/google/card_index.png b/plugins/emoji/public/images/google/card_index.png
new file mode 100644
index 0000000000..9d6ab19160
Binary files /dev/null and b/plugins/emoji/public/images/google/card_index.png differ
diff --git a/plugins/emoji/public/images/google/carousel_horse.png b/plugins/emoji/public/images/google/carousel_horse.png
new file mode 100644
index 0000000000..cc9b025c1e
Binary files /dev/null and b/plugins/emoji/public/images/google/carousel_horse.png differ
diff --git a/plugins/emoji/public/images/google/cat.png b/plugins/emoji/public/images/google/cat.png
new file mode 100644
index 0000000000..dc370e7274
Binary files /dev/null and b/plugins/emoji/public/images/google/cat.png differ
diff --git a/plugins/emoji/public/images/google/cat2.png b/plugins/emoji/public/images/google/cat2.png
new file mode 100644
index 0000000000..88bfcf82c6
Binary files /dev/null and b/plugins/emoji/public/images/google/cat2.png differ
diff --git a/plugins/emoji/public/images/google/cd.png b/plugins/emoji/public/images/google/cd.png
new file mode 100644
index 0000000000..148b36a7dc
Binary files /dev/null and b/plugins/emoji/public/images/google/cd.png differ
diff --git a/plugins/emoji/public/images/google/chart.png b/plugins/emoji/public/images/google/chart.png
new file mode 100644
index 0000000000..f4fd41a7cd
Binary files /dev/null and b/plugins/emoji/public/images/google/chart.png differ
diff --git a/plugins/emoji/public/images/google/chart_with_downwards_trend.png b/plugins/emoji/public/images/google/chart_with_downwards_trend.png
new file mode 100644
index 0000000000..555af431ec
Binary files /dev/null and b/plugins/emoji/public/images/google/chart_with_downwards_trend.png differ
diff --git a/plugins/emoji/public/images/google/chart_with_upwards_trend.png b/plugins/emoji/public/images/google/chart_with_upwards_trend.png
new file mode 100644
index 0000000000..458b51bbdb
Binary files /dev/null and b/plugins/emoji/public/images/google/chart_with_upwards_trend.png differ
diff --git a/plugins/emoji/public/images/google/checkered_flag.png b/plugins/emoji/public/images/google/checkered_flag.png
new file mode 100644
index 0000000000..ba3706fe38
Binary files /dev/null and b/plugins/emoji/public/images/google/checkered_flag.png differ
diff --git a/plugins/emoji/public/images/google/cherries.png b/plugins/emoji/public/images/google/cherries.png
new file mode 100644
index 0000000000..4e3c516744
Binary files /dev/null and b/plugins/emoji/public/images/google/cherries.png differ
diff --git a/plugins/emoji/public/images/google/cherry_blossom.png b/plugins/emoji/public/images/google/cherry_blossom.png
new file mode 100644
index 0000000000..72b90c132a
Binary files /dev/null and b/plugins/emoji/public/images/google/cherry_blossom.png differ
diff --git a/plugins/emoji/public/images/google/chestnut.png b/plugins/emoji/public/images/google/chestnut.png
new file mode 100644
index 0000000000..99d355210e
Binary files /dev/null and b/plugins/emoji/public/images/google/chestnut.png differ
diff --git a/plugins/emoji/public/images/google/chicken.png b/plugins/emoji/public/images/google/chicken.png
new file mode 100644
index 0000000000..fa02c88fb3
Binary files /dev/null and b/plugins/emoji/public/images/google/chicken.png differ
diff --git a/plugins/emoji/public/images/google/children_crossing.png b/plugins/emoji/public/images/google/children_crossing.png
new file mode 100644
index 0000000000..420499f21c
Binary files /dev/null and b/plugins/emoji/public/images/google/children_crossing.png differ
diff --git a/plugins/emoji/public/images/google/chocolate_bar.png b/plugins/emoji/public/images/google/chocolate_bar.png
new file mode 100644
index 0000000000..c4e36e7c29
Binary files /dev/null and b/plugins/emoji/public/images/google/chocolate_bar.png differ
diff --git a/plugins/emoji/public/images/google/christmas_tree.png b/plugins/emoji/public/images/google/christmas_tree.png
new file mode 100644
index 0000000000..ec84981ab6
Binary files /dev/null and b/plugins/emoji/public/images/google/christmas_tree.png differ
diff --git a/plugins/emoji/public/images/google/church.png b/plugins/emoji/public/images/google/church.png
new file mode 100644
index 0000000000..f754dc5f23
Binary files /dev/null and b/plugins/emoji/public/images/google/church.png differ
diff --git a/plugins/emoji/public/images/google/cinema.png b/plugins/emoji/public/images/google/cinema.png
new file mode 100644
index 0000000000..dac35d038f
Binary files /dev/null and b/plugins/emoji/public/images/google/cinema.png differ
diff --git a/plugins/emoji/public/images/google/circus_tent.png b/plugins/emoji/public/images/google/circus_tent.png
new file mode 100644
index 0000000000..2d894996ff
Binary files /dev/null and b/plugins/emoji/public/images/google/circus_tent.png differ
diff --git a/plugins/emoji/public/images/google/city_sunrise.png b/plugins/emoji/public/images/google/city_sunrise.png
new file mode 100644
index 0000000000..674740d816
Binary files /dev/null and b/plugins/emoji/public/images/google/city_sunrise.png differ
diff --git a/plugins/emoji/public/images/google/city_sunset.png b/plugins/emoji/public/images/google/city_sunset.png
new file mode 100644
index 0000000000..7519ef2a67
Binary files /dev/null and b/plugins/emoji/public/images/google/city_sunset.png differ
diff --git a/plugins/emoji/public/images/google/cl.png b/plugins/emoji/public/images/google/cl.png
new file mode 100644
index 0000000000..5e652c5e68
Binary files /dev/null and b/plugins/emoji/public/images/google/cl.png differ
diff --git a/plugins/emoji/public/images/google/clap.png b/plugins/emoji/public/images/google/clap.png
new file mode 100644
index 0000000000..56f0cb2654
Binary files /dev/null and b/plugins/emoji/public/images/google/clap.png differ
diff --git a/plugins/emoji/public/images/google/clapper.png b/plugins/emoji/public/images/google/clapper.png
new file mode 100644
index 0000000000..1b92e61720
Binary files /dev/null and b/plugins/emoji/public/images/google/clapper.png differ
diff --git a/plugins/emoji/public/images/google/clipboard.png b/plugins/emoji/public/images/google/clipboard.png
new file mode 100644
index 0000000000..bd7c7e47fe
Binary files /dev/null and b/plugins/emoji/public/images/google/clipboard.png differ
diff --git a/plugins/emoji/public/images/google/clock1.png b/plugins/emoji/public/images/google/clock1.png
new file mode 100644
index 0000000000..4babf7beae
Binary files /dev/null and b/plugins/emoji/public/images/google/clock1.png differ
diff --git a/plugins/emoji/public/images/google/clock10.png b/plugins/emoji/public/images/google/clock10.png
new file mode 100644
index 0000000000..f555dd5e10
Binary files /dev/null and b/plugins/emoji/public/images/google/clock10.png differ
diff --git a/plugins/emoji/public/images/google/clock1030.png b/plugins/emoji/public/images/google/clock1030.png
new file mode 100644
index 0000000000..7bf543130e
Binary files /dev/null and b/plugins/emoji/public/images/google/clock1030.png differ
diff --git a/plugins/emoji/public/images/google/clock11.png b/plugins/emoji/public/images/google/clock11.png
new file mode 100644
index 0000000000..9336c2c596
Binary files /dev/null and b/plugins/emoji/public/images/google/clock11.png differ
diff --git a/plugins/emoji/public/images/google/clock1130.png b/plugins/emoji/public/images/google/clock1130.png
new file mode 100644
index 0000000000..601b7ab35b
Binary files /dev/null and b/plugins/emoji/public/images/google/clock1130.png differ
diff --git a/plugins/emoji/public/images/google/clock12.png b/plugins/emoji/public/images/google/clock12.png
new file mode 100644
index 0000000000..f910e1400a
Binary files /dev/null and b/plugins/emoji/public/images/google/clock12.png differ
diff --git a/plugins/emoji/public/images/google/clock1230.png b/plugins/emoji/public/images/google/clock1230.png
new file mode 100644
index 0000000000..832e2ed7a0
Binary files /dev/null and b/plugins/emoji/public/images/google/clock1230.png differ
diff --git a/plugins/emoji/public/images/google/clock130.png b/plugins/emoji/public/images/google/clock130.png
new file mode 100644
index 0000000000..800a8560c5
Binary files /dev/null and b/plugins/emoji/public/images/google/clock130.png differ
diff --git a/plugins/emoji/public/images/google/clock2.png b/plugins/emoji/public/images/google/clock2.png
new file mode 100644
index 0000000000..c7cf64796c
Binary files /dev/null and b/plugins/emoji/public/images/google/clock2.png differ
diff --git a/plugins/emoji/public/images/google/clock230.png b/plugins/emoji/public/images/google/clock230.png
new file mode 100644
index 0000000000..f3e730c680
Binary files /dev/null and b/plugins/emoji/public/images/google/clock230.png differ
diff --git a/plugins/emoji/public/images/google/clock3.png b/plugins/emoji/public/images/google/clock3.png
new file mode 100644
index 0000000000..4e02197115
Binary files /dev/null and b/plugins/emoji/public/images/google/clock3.png differ
diff --git a/plugins/emoji/public/images/google/clock330.png b/plugins/emoji/public/images/google/clock330.png
new file mode 100644
index 0000000000..a9198ba7f1
Binary files /dev/null and b/plugins/emoji/public/images/google/clock330.png differ
diff --git a/plugins/emoji/public/images/google/clock4.png b/plugins/emoji/public/images/google/clock4.png
new file mode 100644
index 0000000000..e18f000695
Binary files /dev/null and b/plugins/emoji/public/images/google/clock4.png differ
diff --git a/plugins/emoji/public/images/google/clock430.png b/plugins/emoji/public/images/google/clock430.png
new file mode 100644
index 0000000000..308ee1a4d5
Binary files /dev/null and b/plugins/emoji/public/images/google/clock430.png differ
diff --git a/plugins/emoji/public/images/google/clock5.png b/plugins/emoji/public/images/google/clock5.png
new file mode 100644
index 0000000000..bb87514bf8
Binary files /dev/null and b/plugins/emoji/public/images/google/clock5.png differ
diff --git a/plugins/emoji/public/images/google/clock530.png b/plugins/emoji/public/images/google/clock530.png
new file mode 100644
index 0000000000..10086abd89
Binary files /dev/null and b/plugins/emoji/public/images/google/clock530.png differ
diff --git a/plugins/emoji/public/images/google/clock6.png b/plugins/emoji/public/images/google/clock6.png
new file mode 100644
index 0000000000..2af169e2c2
Binary files /dev/null and b/plugins/emoji/public/images/google/clock6.png differ
diff --git a/plugins/emoji/public/images/google/clock630.png b/plugins/emoji/public/images/google/clock630.png
new file mode 100644
index 0000000000..a5118b2202
Binary files /dev/null and b/plugins/emoji/public/images/google/clock630.png differ
diff --git a/plugins/emoji/public/images/google/clock7.png b/plugins/emoji/public/images/google/clock7.png
new file mode 100644
index 0000000000..e6ef0b6b66
Binary files /dev/null and b/plugins/emoji/public/images/google/clock7.png differ
diff --git a/plugins/emoji/public/images/google/clock730.png b/plugins/emoji/public/images/google/clock730.png
new file mode 100644
index 0000000000..b521ebd93f
Binary files /dev/null and b/plugins/emoji/public/images/google/clock730.png differ
diff --git a/plugins/emoji/public/images/google/clock8.png b/plugins/emoji/public/images/google/clock8.png
new file mode 100644
index 0000000000..c94c0141c4
Binary files /dev/null and b/plugins/emoji/public/images/google/clock8.png differ
diff --git a/plugins/emoji/public/images/google/clock830.png b/plugins/emoji/public/images/google/clock830.png
new file mode 100644
index 0000000000..a74fc49077
Binary files /dev/null and b/plugins/emoji/public/images/google/clock830.png differ
diff --git a/plugins/emoji/public/images/google/clock9.png b/plugins/emoji/public/images/google/clock9.png
new file mode 100644
index 0000000000..35609cd0b3
Binary files /dev/null and b/plugins/emoji/public/images/google/clock9.png differ
diff --git a/plugins/emoji/public/images/google/clock930.png b/plugins/emoji/public/images/google/clock930.png
new file mode 100644
index 0000000000..6cae7304c5
Binary files /dev/null and b/plugins/emoji/public/images/google/clock930.png differ
diff --git a/plugins/emoji/public/images/google/closed_book.png b/plugins/emoji/public/images/google/closed_book.png
new file mode 100644
index 0000000000..32630ad4e7
Binary files /dev/null and b/plugins/emoji/public/images/google/closed_book.png differ
diff --git a/plugins/emoji/public/images/google/closed_lock_with_key.png b/plugins/emoji/public/images/google/closed_lock_with_key.png
new file mode 100644
index 0000000000..4ce2b23465
Binary files /dev/null and b/plugins/emoji/public/images/google/closed_lock_with_key.png differ
diff --git a/plugins/emoji/public/images/google/closed_umbrella.png b/plugins/emoji/public/images/google/closed_umbrella.png
new file mode 100644
index 0000000000..063e9bfda3
Binary files /dev/null and b/plugins/emoji/public/images/google/closed_umbrella.png differ
diff --git a/plugins/emoji/public/images/google/cloud.png b/plugins/emoji/public/images/google/cloud.png
new file mode 100644
index 0000000000..9d5d1cde1b
Binary files /dev/null and b/plugins/emoji/public/images/google/cloud.png differ
diff --git a/plugins/emoji/public/images/google/clubs.png b/plugins/emoji/public/images/google/clubs.png
new file mode 100644
index 0000000000..05dadefbf1
Binary files /dev/null and b/plugins/emoji/public/images/google/clubs.png differ
diff --git a/plugins/emoji/public/images/google/cn.png b/plugins/emoji/public/images/google/cn.png
new file mode 100644
index 0000000000..6fcb042eb6
Binary files /dev/null and b/plugins/emoji/public/images/google/cn.png differ
diff --git a/plugins/emoji/public/images/google/cocktail.png b/plugins/emoji/public/images/google/cocktail.png
new file mode 100644
index 0000000000..84fed96eb9
Binary files /dev/null and b/plugins/emoji/public/images/google/cocktail.png differ
diff --git a/plugins/emoji/public/images/google/coffee.png b/plugins/emoji/public/images/google/coffee.png
new file mode 100644
index 0000000000..39e25512ae
Binary files /dev/null and b/plugins/emoji/public/images/google/coffee.png differ
diff --git a/plugins/emoji/public/images/google/cold_sweat.png b/plugins/emoji/public/images/google/cold_sweat.png
new file mode 100644
index 0000000000..52672867c0
Binary files /dev/null and b/plugins/emoji/public/images/google/cold_sweat.png differ
diff --git a/plugins/emoji/public/images/google/collision.png b/plugins/emoji/public/images/google/collision.png
new file mode 100644
index 0000000000..d5dc3bb0e2
Binary files /dev/null and b/plugins/emoji/public/images/google/collision.png differ
diff --git a/plugins/emoji/public/images/google/computer.png b/plugins/emoji/public/images/google/computer.png
new file mode 100644
index 0000000000..63d36f1340
Binary files /dev/null and b/plugins/emoji/public/images/google/computer.png differ
diff --git a/plugins/emoji/public/images/google/confetti_ball.png b/plugins/emoji/public/images/google/confetti_ball.png
new file mode 100644
index 0000000000..46c892ba91
Binary files /dev/null and b/plugins/emoji/public/images/google/confetti_ball.png differ
diff --git a/plugins/emoji/public/images/google/confounded.png b/plugins/emoji/public/images/google/confounded.png
new file mode 100644
index 0000000000..3e2c8548c7
Binary files /dev/null and b/plugins/emoji/public/images/google/confounded.png differ
diff --git a/plugins/emoji/public/images/google/confused.png b/plugins/emoji/public/images/google/confused.png
new file mode 100644
index 0000000000..9e875e8404
Binary files /dev/null and b/plugins/emoji/public/images/google/confused.png differ
diff --git a/plugins/emoji/public/images/google/congratulations.png b/plugins/emoji/public/images/google/congratulations.png
new file mode 100644
index 0000000000..e8f4319b41
Binary files /dev/null and b/plugins/emoji/public/images/google/congratulations.png differ
diff --git a/plugins/emoji/public/images/google/construction.png b/plugins/emoji/public/images/google/construction.png
new file mode 100644
index 0000000000..5e91f1f90e
Binary files /dev/null and b/plugins/emoji/public/images/google/construction.png differ
diff --git a/plugins/emoji/public/images/google/construction_worker.png b/plugins/emoji/public/images/google/construction_worker.png
new file mode 100644
index 0000000000..b09b92e57e
Binary files /dev/null and b/plugins/emoji/public/images/google/construction_worker.png differ
diff --git a/plugins/emoji/public/images/google/convenience_store.png b/plugins/emoji/public/images/google/convenience_store.png
new file mode 100644
index 0000000000..5db0312195
Binary files /dev/null and b/plugins/emoji/public/images/google/convenience_store.png differ
diff --git a/plugins/emoji/public/images/google/cookie.png b/plugins/emoji/public/images/google/cookie.png
new file mode 100644
index 0000000000..7929c68641
Binary files /dev/null and b/plugins/emoji/public/images/google/cookie.png differ
diff --git a/plugins/emoji/public/images/google/cool.png b/plugins/emoji/public/images/google/cool.png
new file mode 100644
index 0000000000..522c1032d3
Binary files /dev/null and b/plugins/emoji/public/images/google/cool.png differ
diff --git a/plugins/emoji/public/images/google/cop.png b/plugins/emoji/public/images/google/cop.png
new file mode 100644
index 0000000000..a1c326357b
Binary files /dev/null and b/plugins/emoji/public/images/google/cop.png differ
diff --git a/plugins/emoji/public/images/google/copyright.png b/plugins/emoji/public/images/google/copyright.png
new file mode 100644
index 0000000000..a3573d070b
Binary files /dev/null and b/plugins/emoji/public/images/google/copyright.png differ
diff --git a/plugins/emoji/public/images/google/corn.png b/plugins/emoji/public/images/google/corn.png
new file mode 100644
index 0000000000..31a7c327b6
Binary files /dev/null and b/plugins/emoji/public/images/google/corn.png differ
diff --git a/plugins/emoji/public/images/google/couple.png b/plugins/emoji/public/images/google/couple.png
new file mode 100644
index 0000000000..b43c5827fe
Binary files /dev/null and b/plugins/emoji/public/images/google/couple.png differ
diff --git a/plugins/emoji/public/images/google/couple_with_heart.png b/plugins/emoji/public/images/google/couple_with_heart.png
new file mode 100644
index 0000000000..301cae0ce9
Binary files /dev/null and b/plugins/emoji/public/images/google/couple_with_heart.png differ
diff --git a/plugins/emoji/public/images/google/couplekiss.png b/plugins/emoji/public/images/google/couplekiss.png
new file mode 100644
index 0000000000..3b658e86d0
Binary files /dev/null and b/plugins/emoji/public/images/google/couplekiss.png differ
diff --git a/plugins/emoji/public/images/google/cow.png b/plugins/emoji/public/images/google/cow.png
new file mode 100644
index 0000000000..5ee14f7d0c
Binary files /dev/null and b/plugins/emoji/public/images/google/cow.png differ
diff --git a/plugins/emoji/public/images/google/cow2.png b/plugins/emoji/public/images/google/cow2.png
new file mode 100644
index 0000000000..1401101e0b
Binary files /dev/null and b/plugins/emoji/public/images/google/cow2.png differ
diff --git a/plugins/emoji/public/images/google/credit_card.png b/plugins/emoji/public/images/google/credit_card.png
new file mode 100644
index 0000000000..897a839346
Binary files /dev/null and b/plugins/emoji/public/images/google/credit_card.png differ
diff --git a/plugins/emoji/public/images/google/crescent_moon.png b/plugins/emoji/public/images/google/crescent_moon.png
new file mode 100644
index 0000000000..f8792da59e
Binary files /dev/null and b/plugins/emoji/public/images/google/crescent_moon.png differ
diff --git a/plugins/emoji/public/images/google/crocodile.png b/plugins/emoji/public/images/google/crocodile.png
new file mode 100644
index 0000000000..1c93bc2c70
Binary files /dev/null and b/plugins/emoji/public/images/google/crocodile.png differ
diff --git a/plugins/emoji/public/images/google/crossed_flags.png b/plugins/emoji/public/images/google/crossed_flags.png
new file mode 100644
index 0000000000..5ac065a52a
Binary files /dev/null and b/plugins/emoji/public/images/google/crossed_flags.png differ
diff --git a/plugins/emoji/public/images/google/crown.png b/plugins/emoji/public/images/google/crown.png
new file mode 100644
index 0000000000..9c88b1d6b5
Binary files /dev/null and b/plugins/emoji/public/images/google/crown.png differ
diff --git a/plugins/emoji/public/images/google/cry.png b/plugins/emoji/public/images/google/cry.png
new file mode 100644
index 0000000000..335145a215
Binary files /dev/null and b/plugins/emoji/public/images/google/cry.png differ
diff --git a/plugins/emoji/public/images/google/crying_cat_face.png b/plugins/emoji/public/images/google/crying_cat_face.png
new file mode 100644
index 0000000000..1ed8e0ca68
Binary files /dev/null and b/plugins/emoji/public/images/google/crying_cat_face.png differ
diff --git a/plugins/emoji/public/images/google/crystal_ball.png b/plugins/emoji/public/images/google/crystal_ball.png
new file mode 100644
index 0000000000..248949553d
Binary files /dev/null and b/plugins/emoji/public/images/google/crystal_ball.png differ
diff --git a/plugins/emoji/public/images/google/cupid.png b/plugins/emoji/public/images/google/cupid.png
new file mode 100644
index 0000000000..0340d0a4c6
Binary files /dev/null and b/plugins/emoji/public/images/google/cupid.png differ
diff --git a/plugins/emoji/public/images/google/curly_loop.png b/plugins/emoji/public/images/google/curly_loop.png
new file mode 100644
index 0000000000..45e2d934cb
Binary files /dev/null and b/plugins/emoji/public/images/google/curly_loop.png differ
diff --git a/plugins/emoji/public/images/google/currency_exchange.png b/plugins/emoji/public/images/google/currency_exchange.png
new file mode 100644
index 0000000000..e3fad21ca1
Binary files /dev/null and b/plugins/emoji/public/images/google/currency_exchange.png differ
diff --git a/plugins/emoji/public/images/google/curry.png b/plugins/emoji/public/images/google/curry.png
new file mode 100644
index 0000000000..4b7e18e902
Binary files /dev/null and b/plugins/emoji/public/images/google/curry.png differ
diff --git a/plugins/emoji/public/images/google/custard.png b/plugins/emoji/public/images/google/custard.png
new file mode 100644
index 0000000000..97d1b4dc31
Binary files /dev/null and b/plugins/emoji/public/images/google/custard.png differ
diff --git a/plugins/emoji/public/images/google/customs.png b/plugins/emoji/public/images/google/customs.png
new file mode 100644
index 0000000000..4a6433d421
Binary files /dev/null and b/plugins/emoji/public/images/google/customs.png differ
diff --git a/plugins/emoji/public/images/google/cyclone.png b/plugins/emoji/public/images/google/cyclone.png
new file mode 100644
index 0000000000..317c7ac31b
Binary files /dev/null and b/plugins/emoji/public/images/google/cyclone.png differ
diff --git a/plugins/emoji/public/images/google/dancer.png b/plugins/emoji/public/images/google/dancer.png
new file mode 100644
index 0000000000..1c0c6f9fb3
Binary files /dev/null and b/plugins/emoji/public/images/google/dancer.png differ
diff --git a/plugins/emoji/public/images/google/dancers.png b/plugins/emoji/public/images/google/dancers.png
new file mode 100644
index 0000000000..13be3ed3fb
Binary files /dev/null and b/plugins/emoji/public/images/google/dancers.png differ
diff --git a/plugins/emoji/public/images/google/dango.png b/plugins/emoji/public/images/google/dango.png
new file mode 100644
index 0000000000..04e8d6ad29
Binary files /dev/null and b/plugins/emoji/public/images/google/dango.png differ
diff --git a/plugins/emoji/public/images/google/dart.png b/plugins/emoji/public/images/google/dart.png
new file mode 100644
index 0000000000..e80b86b294
Binary files /dev/null and b/plugins/emoji/public/images/google/dart.png differ
diff --git a/plugins/emoji/public/images/google/dash.png b/plugins/emoji/public/images/google/dash.png
new file mode 100644
index 0000000000..1e2b2e1187
Binary files /dev/null and b/plugins/emoji/public/images/google/dash.png differ
diff --git a/plugins/emoji/public/images/google/date.png b/plugins/emoji/public/images/google/date.png
new file mode 100644
index 0000000000..02d2ab8505
Binary files /dev/null and b/plugins/emoji/public/images/google/date.png differ
diff --git a/plugins/emoji/public/images/google/de.png b/plugins/emoji/public/images/google/de.png
new file mode 100644
index 0000000000..8ae9a4047a
Binary files /dev/null and b/plugins/emoji/public/images/google/de.png differ
diff --git a/plugins/emoji/public/images/google/deciduous_tree.png b/plugins/emoji/public/images/google/deciduous_tree.png
new file mode 100644
index 0000000000..479730e56d
Binary files /dev/null and b/plugins/emoji/public/images/google/deciduous_tree.png differ
diff --git a/plugins/emoji/public/images/google/department_store.png b/plugins/emoji/public/images/google/department_store.png
new file mode 100644
index 0000000000..1d29eebee9
Binary files /dev/null and b/plugins/emoji/public/images/google/department_store.png differ
diff --git a/plugins/emoji/public/images/google/diamond_shape_with_a_dot_inside.png b/plugins/emoji/public/images/google/diamond_shape_with_a_dot_inside.png
new file mode 100644
index 0000000000..1bfae8d3ff
Binary files /dev/null and b/plugins/emoji/public/images/google/diamond_shape_with_a_dot_inside.png differ
diff --git a/plugins/emoji/public/images/google/diamonds.png b/plugins/emoji/public/images/google/diamonds.png
new file mode 100644
index 0000000000..d22d35f345
Binary files /dev/null and b/plugins/emoji/public/images/google/diamonds.png differ
diff --git a/plugins/emoji/public/images/google/disappointed.png b/plugins/emoji/public/images/google/disappointed.png
new file mode 100644
index 0000000000..c7ec3145bb
Binary files /dev/null and b/plugins/emoji/public/images/google/disappointed.png differ
diff --git a/plugins/emoji/public/images/google/disappointed_relieved.png b/plugins/emoji/public/images/google/disappointed_relieved.png
new file mode 100644
index 0000000000..f27ea38e3c
Binary files /dev/null and b/plugins/emoji/public/images/google/disappointed_relieved.png differ
diff --git a/plugins/emoji/public/images/google/dizzy.png b/plugins/emoji/public/images/google/dizzy.png
new file mode 100644
index 0000000000..5d8a0a90db
Binary files /dev/null and b/plugins/emoji/public/images/google/dizzy.png differ
diff --git a/plugins/emoji/public/images/google/dizzy_face.png b/plugins/emoji/public/images/google/dizzy_face.png
new file mode 100644
index 0000000000..544536afc6
Binary files /dev/null and b/plugins/emoji/public/images/google/dizzy_face.png differ
diff --git a/plugins/emoji/public/images/google/do_not_litter.png b/plugins/emoji/public/images/google/do_not_litter.png
new file mode 100644
index 0000000000..cf4094c317
Binary files /dev/null and b/plugins/emoji/public/images/google/do_not_litter.png differ
diff --git a/plugins/emoji/public/images/google/dog.png b/plugins/emoji/public/images/google/dog.png
new file mode 100644
index 0000000000..568aaa5532
Binary files /dev/null and b/plugins/emoji/public/images/google/dog.png differ
diff --git a/plugins/emoji/public/images/google/dog2.png b/plugins/emoji/public/images/google/dog2.png
new file mode 100644
index 0000000000..a6dfd19545
Binary files /dev/null and b/plugins/emoji/public/images/google/dog2.png differ
diff --git a/plugins/emoji/public/images/google/dollar.png b/plugins/emoji/public/images/google/dollar.png
new file mode 100644
index 0000000000..e872d60abd
Binary files /dev/null and b/plugins/emoji/public/images/google/dollar.png differ
diff --git a/plugins/emoji/public/images/google/dolls.png b/plugins/emoji/public/images/google/dolls.png
new file mode 100644
index 0000000000..1618405ddf
Binary files /dev/null and b/plugins/emoji/public/images/google/dolls.png differ
diff --git a/plugins/emoji/public/images/google/dolphin.png b/plugins/emoji/public/images/google/dolphin.png
new file mode 100644
index 0000000000..6212a540ea
Binary files /dev/null and b/plugins/emoji/public/images/google/dolphin.png differ
diff --git a/plugins/emoji/public/images/google/door.png b/plugins/emoji/public/images/google/door.png
new file mode 100644
index 0000000000..e8384a3d1f
Binary files /dev/null and b/plugins/emoji/public/images/google/door.png differ
diff --git a/plugins/emoji/public/images/google/doughnut.png b/plugins/emoji/public/images/google/doughnut.png
new file mode 100644
index 0000000000..ee6f644faf
Binary files /dev/null and b/plugins/emoji/public/images/google/doughnut.png differ
diff --git a/plugins/emoji/public/images/google/dragon.png b/plugins/emoji/public/images/google/dragon.png
new file mode 100644
index 0000000000..bdf3467178
Binary files /dev/null and b/plugins/emoji/public/images/google/dragon.png differ
diff --git a/plugins/emoji/public/images/google/dragon_face.png b/plugins/emoji/public/images/google/dragon_face.png
new file mode 100644
index 0000000000..0d13df23ec
Binary files /dev/null and b/plugins/emoji/public/images/google/dragon_face.png differ
diff --git a/plugins/emoji/public/images/google/dress.png b/plugins/emoji/public/images/google/dress.png
new file mode 100644
index 0000000000..99b34537e3
Binary files /dev/null and b/plugins/emoji/public/images/google/dress.png differ
diff --git a/plugins/emoji/public/images/google/dromedary_camel.png b/plugins/emoji/public/images/google/dromedary_camel.png
new file mode 100644
index 0000000000..77b4340a17
Binary files /dev/null and b/plugins/emoji/public/images/google/dromedary_camel.png differ
diff --git a/plugins/emoji/public/images/google/droplet.png b/plugins/emoji/public/images/google/droplet.png
new file mode 100644
index 0000000000..64207a76be
Binary files /dev/null and b/plugins/emoji/public/images/google/droplet.png differ
diff --git a/plugins/emoji/public/images/google/dvd.png b/plugins/emoji/public/images/google/dvd.png
new file mode 100644
index 0000000000..c5abf0c0cc
Binary files /dev/null and b/plugins/emoji/public/images/google/dvd.png differ
diff --git a/plugins/emoji/public/images/google/e-mail.png b/plugins/emoji/public/images/google/e-mail.png
new file mode 100644
index 0000000000..dbfe415f44
Binary files /dev/null and b/plugins/emoji/public/images/google/e-mail.png differ
diff --git a/plugins/emoji/public/images/google/ear.png b/plugins/emoji/public/images/google/ear.png
new file mode 100644
index 0000000000..6e30e89651
Binary files /dev/null and b/plugins/emoji/public/images/google/ear.png differ
diff --git a/plugins/emoji/public/images/google/ear_of_rice.png b/plugins/emoji/public/images/google/ear_of_rice.png
new file mode 100644
index 0000000000..8101d0077a
Binary files /dev/null and b/plugins/emoji/public/images/google/ear_of_rice.png differ
diff --git a/plugins/emoji/public/images/google/earth_africa.png b/plugins/emoji/public/images/google/earth_africa.png
new file mode 100644
index 0000000000..0089c5f837
Binary files /dev/null and b/plugins/emoji/public/images/google/earth_africa.png differ
diff --git a/plugins/emoji/public/images/google/earth_americas.png b/plugins/emoji/public/images/google/earth_americas.png
new file mode 100644
index 0000000000..87a76c2ffe
Binary files /dev/null and b/plugins/emoji/public/images/google/earth_americas.png differ
diff --git a/plugins/emoji/public/images/google/earth_asia.png b/plugins/emoji/public/images/google/earth_asia.png
new file mode 100644
index 0000000000..0c765293e6
Binary files /dev/null and b/plugins/emoji/public/images/google/earth_asia.png differ
diff --git a/plugins/emoji/public/images/google/egg.png b/plugins/emoji/public/images/google/egg.png
new file mode 100644
index 0000000000..7f33d96f43
Binary files /dev/null and b/plugins/emoji/public/images/google/egg.png differ
diff --git a/plugins/emoji/public/images/google/eggplant.png b/plugins/emoji/public/images/google/eggplant.png
new file mode 100644
index 0000000000..c14049403e
Binary files /dev/null and b/plugins/emoji/public/images/google/eggplant.png differ
diff --git a/plugins/emoji/public/images/google/eight_pointed_black_star.png b/plugins/emoji/public/images/google/eight_pointed_black_star.png
new file mode 100644
index 0000000000..0b94873dc2
Binary files /dev/null and b/plugins/emoji/public/images/google/eight_pointed_black_star.png differ
diff --git a/plugins/emoji/public/images/google/eight_spoked_asterisk.png b/plugins/emoji/public/images/google/eight_spoked_asterisk.png
new file mode 100644
index 0000000000..8c843667a6
Binary files /dev/null and b/plugins/emoji/public/images/google/eight_spoked_asterisk.png differ
diff --git a/plugins/emoji/public/images/google/electric_plug.png b/plugins/emoji/public/images/google/electric_plug.png
new file mode 100644
index 0000000000..9b2935c0a9
Binary files /dev/null and b/plugins/emoji/public/images/google/electric_plug.png differ
diff --git a/plugins/emoji/public/images/google/elephant.png b/plugins/emoji/public/images/google/elephant.png
new file mode 100644
index 0000000000..b270bc1406
Binary files /dev/null and b/plugins/emoji/public/images/google/elephant.png differ
diff --git a/plugins/emoji/public/images/google/email.png b/plugins/emoji/public/images/google/email.png
new file mode 100644
index 0000000000..03fbf78643
Binary files /dev/null and b/plugins/emoji/public/images/google/email.png differ
diff --git a/plugins/emoji/public/images/google/end.png b/plugins/emoji/public/images/google/end.png
new file mode 100644
index 0000000000..7c1306c13e
Binary files /dev/null and b/plugins/emoji/public/images/google/end.png differ
diff --git a/plugins/emoji/public/images/google/envelope.png b/plugins/emoji/public/images/google/envelope.png
new file mode 100644
index 0000000000..03fbf78643
Binary files /dev/null and b/plugins/emoji/public/images/google/envelope.png differ
diff --git a/plugins/emoji/public/images/google/envelope_with_arrow.png b/plugins/emoji/public/images/google/envelope_with_arrow.png
new file mode 100644
index 0000000000..f83f0665cb
Binary files /dev/null and b/plugins/emoji/public/images/google/envelope_with_arrow.png differ
diff --git a/plugins/emoji/public/images/google/es.png b/plugins/emoji/public/images/google/es.png
new file mode 100644
index 0000000000..8227d8674e
Binary files /dev/null and b/plugins/emoji/public/images/google/es.png differ
diff --git a/plugins/emoji/public/images/google/euro.png b/plugins/emoji/public/images/google/euro.png
new file mode 100644
index 0000000000..775de396bb
Binary files /dev/null and b/plugins/emoji/public/images/google/euro.png differ
diff --git a/plugins/emoji/public/images/google/european_castle.png b/plugins/emoji/public/images/google/european_castle.png
new file mode 100644
index 0000000000..1cc2ff87b4
Binary files /dev/null and b/plugins/emoji/public/images/google/european_castle.png differ
diff --git a/plugins/emoji/public/images/google/european_post_office.png b/plugins/emoji/public/images/google/european_post_office.png
new file mode 100644
index 0000000000..b8493a5a23
Binary files /dev/null and b/plugins/emoji/public/images/google/european_post_office.png differ
diff --git a/plugins/emoji/public/images/google/evergreen_tree.png b/plugins/emoji/public/images/google/evergreen_tree.png
new file mode 100644
index 0000000000..3353d75e9c
Binary files /dev/null and b/plugins/emoji/public/images/google/evergreen_tree.png differ
diff --git a/plugins/emoji/public/images/google/exclamation.png b/plugins/emoji/public/images/google/exclamation.png
new file mode 100644
index 0000000000..6883966d8d
Binary files /dev/null and b/plugins/emoji/public/images/google/exclamation.png differ
diff --git a/plugins/emoji/public/images/google/expressionless.png b/plugins/emoji/public/images/google/expressionless.png
new file mode 100644
index 0000000000..cad5e6a69f
Binary files /dev/null and b/plugins/emoji/public/images/google/expressionless.png differ
diff --git a/plugins/emoji/public/images/google/eyeglasses.png b/plugins/emoji/public/images/google/eyeglasses.png
new file mode 100644
index 0000000000..dc7e71dffe
Binary files /dev/null and b/plugins/emoji/public/images/google/eyeglasses.png differ
diff --git a/plugins/emoji/public/images/google/eyes.png b/plugins/emoji/public/images/google/eyes.png
new file mode 100644
index 0000000000..d705949e60
Binary files /dev/null and b/plugins/emoji/public/images/google/eyes.png differ
diff --git a/plugins/emoji/public/images/google/facepunch.png b/plugins/emoji/public/images/google/facepunch.png
new file mode 100644
index 0000000000..e8d59e8932
Binary files /dev/null and b/plugins/emoji/public/images/google/facepunch.png differ
diff --git a/plugins/emoji/public/images/google/factory.png b/plugins/emoji/public/images/google/factory.png
new file mode 100644
index 0000000000..205006e0ac
Binary files /dev/null and b/plugins/emoji/public/images/google/factory.png differ
diff --git a/plugins/emoji/public/images/google/fallen_leaf.png b/plugins/emoji/public/images/google/fallen_leaf.png
new file mode 100644
index 0000000000..c0c9d75b25
Binary files /dev/null and b/plugins/emoji/public/images/google/fallen_leaf.png differ
diff --git a/plugins/emoji/public/images/google/family.png b/plugins/emoji/public/images/google/family.png
new file mode 100644
index 0000000000..1abc823e0d
Binary files /dev/null and b/plugins/emoji/public/images/google/family.png differ
diff --git a/plugins/emoji/public/images/google/fast_forward.png b/plugins/emoji/public/images/google/fast_forward.png
new file mode 100644
index 0000000000..42b4bcdd7a
Binary files /dev/null and b/plugins/emoji/public/images/google/fast_forward.png differ
diff --git a/plugins/emoji/public/images/google/fax.png b/plugins/emoji/public/images/google/fax.png
new file mode 100644
index 0000000000..ee6e12e1a7
Binary files /dev/null and b/plugins/emoji/public/images/google/fax.png differ
diff --git a/plugins/emoji/public/images/google/fearful.png b/plugins/emoji/public/images/google/fearful.png
new file mode 100644
index 0000000000..cb60d934da
Binary files /dev/null and b/plugins/emoji/public/images/google/fearful.png differ
diff --git a/plugins/emoji/public/images/google/feet.png b/plugins/emoji/public/images/google/feet.png
new file mode 100644
index 0000000000..427cf17448
Binary files /dev/null and b/plugins/emoji/public/images/google/feet.png differ
diff --git a/plugins/emoji/public/images/google/ferris_wheel.png b/plugins/emoji/public/images/google/ferris_wheel.png
new file mode 100644
index 0000000000..03fb834090
Binary files /dev/null and b/plugins/emoji/public/images/google/ferris_wheel.png differ
diff --git a/plugins/emoji/public/images/google/file_folder.png b/plugins/emoji/public/images/google/file_folder.png
new file mode 100644
index 0000000000..451773352b
Binary files /dev/null and b/plugins/emoji/public/images/google/file_folder.png differ
diff --git a/plugins/emoji/public/images/google/fire.png b/plugins/emoji/public/images/google/fire.png
new file mode 100644
index 0000000000..780eebbd8e
Binary files /dev/null and b/plugins/emoji/public/images/google/fire.png differ
diff --git a/plugins/emoji/public/images/google/fire_engine.png b/plugins/emoji/public/images/google/fire_engine.png
new file mode 100644
index 0000000000..fcbb1dbbd1
Binary files /dev/null and b/plugins/emoji/public/images/google/fire_engine.png differ
diff --git a/plugins/emoji/public/images/google/fireworks.png b/plugins/emoji/public/images/google/fireworks.png
new file mode 100644
index 0000000000..ef640a37b7
Binary files /dev/null and b/plugins/emoji/public/images/google/fireworks.png differ
diff --git a/plugins/emoji/public/images/google/first_quarter_moon.png b/plugins/emoji/public/images/google/first_quarter_moon.png
new file mode 100644
index 0000000000..3dc55e4985
Binary files /dev/null and b/plugins/emoji/public/images/google/first_quarter_moon.png differ
diff --git a/plugins/emoji/public/images/google/first_quarter_moon_with_face.png b/plugins/emoji/public/images/google/first_quarter_moon_with_face.png
new file mode 100644
index 0000000000..5d814a043e
Binary files /dev/null and b/plugins/emoji/public/images/google/first_quarter_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/google/fish.png b/plugins/emoji/public/images/google/fish.png
new file mode 100644
index 0000000000..b9de41f91f
Binary files /dev/null and b/plugins/emoji/public/images/google/fish.png differ
diff --git a/plugins/emoji/public/images/google/fish_cake.png b/plugins/emoji/public/images/google/fish_cake.png
new file mode 100644
index 0000000000..d1cefebca4
Binary files /dev/null and b/plugins/emoji/public/images/google/fish_cake.png differ
diff --git a/plugins/emoji/public/images/google/fishing_pole_and_fish.png b/plugins/emoji/public/images/google/fishing_pole_and_fish.png
new file mode 100644
index 0000000000..05abedf446
Binary files /dev/null and b/plugins/emoji/public/images/google/fishing_pole_and_fish.png differ
diff --git a/plugins/emoji/public/images/google/fist.png b/plugins/emoji/public/images/google/fist.png
new file mode 100644
index 0000000000..90efa0bb94
Binary files /dev/null and b/plugins/emoji/public/images/google/fist.png differ
diff --git a/plugins/emoji/public/images/google/flags.png b/plugins/emoji/public/images/google/flags.png
new file mode 100644
index 0000000000..558d0911fa
Binary files /dev/null and b/plugins/emoji/public/images/google/flags.png differ
diff --git a/plugins/emoji/public/images/google/flashlight.png b/plugins/emoji/public/images/google/flashlight.png
new file mode 100644
index 0000000000..55a40eceb3
Binary files /dev/null and b/plugins/emoji/public/images/google/flashlight.png differ
diff --git a/plugins/emoji/public/images/google/flipper.png b/plugins/emoji/public/images/google/flipper.png
new file mode 100644
index 0000000000..6212a540ea
Binary files /dev/null and b/plugins/emoji/public/images/google/flipper.png differ
diff --git a/plugins/emoji/public/images/google/floppy_disk.png b/plugins/emoji/public/images/google/floppy_disk.png
new file mode 100644
index 0000000000..5195453749
Binary files /dev/null and b/plugins/emoji/public/images/google/floppy_disk.png differ
diff --git a/plugins/emoji/public/images/google/flower_playing_cards.png b/plugins/emoji/public/images/google/flower_playing_cards.png
new file mode 100644
index 0000000000..287df66f2e
Binary files /dev/null and b/plugins/emoji/public/images/google/flower_playing_cards.png differ
diff --git a/plugins/emoji/public/images/google/flushed.png b/plugins/emoji/public/images/google/flushed.png
new file mode 100644
index 0000000000..9c0433a898
Binary files /dev/null and b/plugins/emoji/public/images/google/flushed.png differ
diff --git a/plugins/emoji/public/images/google/foggy.png b/plugins/emoji/public/images/google/foggy.png
new file mode 100644
index 0000000000..1d67529cf1
Binary files /dev/null and b/plugins/emoji/public/images/google/foggy.png differ
diff --git a/plugins/emoji/public/images/google/football.png b/plugins/emoji/public/images/google/football.png
new file mode 100644
index 0000000000..db4b5e4eb4
Binary files /dev/null and b/plugins/emoji/public/images/google/football.png differ
diff --git a/plugins/emoji/public/images/google/footprints.png b/plugins/emoji/public/images/google/footprints.png
new file mode 100644
index 0000000000..cba157f06b
Binary files /dev/null and b/plugins/emoji/public/images/google/footprints.png differ
diff --git a/plugins/emoji/public/images/google/fork_and_knife.png b/plugins/emoji/public/images/google/fork_and_knife.png
new file mode 100644
index 0000000000..3fac92b09f
Binary files /dev/null and b/plugins/emoji/public/images/google/fork_and_knife.png differ
diff --git a/plugins/emoji/public/images/google/fountain.png b/plugins/emoji/public/images/google/fountain.png
new file mode 100644
index 0000000000..b731bfa06b
Binary files /dev/null and b/plugins/emoji/public/images/google/fountain.png differ
diff --git a/plugins/emoji/public/images/google/four_leaf_clover.png b/plugins/emoji/public/images/google/four_leaf_clover.png
new file mode 100644
index 0000000000..19ab75fa62
Binary files /dev/null and b/plugins/emoji/public/images/google/four_leaf_clover.png differ
diff --git a/plugins/emoji/public/images/google/fr.png b/plugins/emoji/public/images/google/fr.png
new file mode 100644
index 0000000000..ce45086f06
Binary files /dev/null and b/plugins/emoji/public/images/google/fr.png differ
diff --git a/plugins/emoji/public/images/google/free.png b/plugins/emoji/public/images/google/free.png
new file mode 100644
index 0000000000..8368ecc6a1
Binary files /dev/null and b/plugins/emoji/public/images/google/free.png differ
diff --git a/plugins/emoji/public/images/google/fried_shrimp.png b/plugins/emoji/public/images/google/fried_shrimp.png
new file mode 100644
index 0000000000..b21b4ac045
Binary files /dev/null and b/plugins/emoji/public/images/google/fried_shrimp.png differ
diff --git a/plugins/emoji/public/images/google/fries.png b/plugins/emoji/public/images/google/fries.png
new file mode 100644
index 0000000000..504a3d3863
Binary files /dev/null and b/plugins/emoji/public/images/google/fries.png differ
diff --git a/plugins/emoji/public/images/google/frog.png b/plugins/emoji/public/images/google/frog.png
new file mode 100644
index 0000000000..dbe265adde
Binary files /dev/null and b/plugins/emoji/public/images/google/frog.png differ
diff --git a/plugins/emoji/public/images/google/frowning.png b/plugins/emoji/public/images/google/frowning.png
new file mode 100644
index 0000000000..f9bee211b1
Binary files /dev/null and b/plugins/emoji/public/images/google/frowning.png differ
diff --git a/plugins/emoji/public/images/google/fuelpump.png b/plugins/emoji/public/images/google/fuelpump.png
new file mode 100644
index 0000000000..6e8e14616a
Binary files /dev/null and b/plugins/emoji/public/images/google/fuelpump.png differ
diff --git a/plugins/emoji/public/images/google/full_moon.png b/plugins/emoji/public/images/google/full_moon.png
new file mode 100644
index 0000000000..3e508ea1ed
Binary files /dev/null and b/plugins/emoji/public/images/google/full_moon.png differ
diff --git a/plugins/emoji/public/images/google/full_moon_with_face.png b/plugins/emoji/public/images/google/full_moon_with_face.png
new file mode 100644
index 0000000000..44c2c05f46
Binary files /dev/null and b/plugins/emoji/public/images/google/full_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/google/game_die.png b/plugins/emoji/public/images/google/game_die.png
new file mode 100644
index 0000000000..faa56e8518
Binary files /dev/null and b/plugins/emoji/public/images/google/game_die.png differ
diff --git a/plugins/emoji/public/images/google/gb.png b/plugins/emoji/public/images/google/gb.png
new file mode 100644
index 0000000000..901dc8d30a
Binary files /dev/null and b/plugins/emoji/public/images/google/gb.png differ
diff --git a/plugins/emoji/public/images/google/gem.png b/plugins/emoji/public/images/google/gem.png
new file mode 100644
index 0000000000..b92f64ac0a
Binary files /dev/null and b/plugins/emoji/public/images/google/gem.png differ
diff --git a/plugins/emoji/public/images/google/gemini.png b/plugins/emoji/public/images/google/gemini.png
new file mode 100644
index 0000000000..5aa103c096
Binary files /dev/null and b/plugins/emoji/public/images/google/gemini.png differ
diff --git a/plugins/emoji/public/images/google/ghost.png b/plugins/emoji/public/images/google/ghost.png
new file mode 100644
index 0000000000..b41306434a
Binary files /dev/null and b/plugins/emoji/public/images/google/ghost.png differ
diff --git a/plugins/emoji/public/images/google/gift.png b/plugins/emoji/public/images/google/gift.png
new file mode 100644
index 0000000000..b3722073df
Binary files /dev/null and b/plugins/emoji/public/images/google/gift.png differ
diff --git a/plugins/emoji/public/images/google/gift_heart.png b/plugins/emoji/public/images/google/gift_heart.png
new file mode 100644
index 0000000000..11c172470f
Binary files /dev/null and b/plugins/emoji/public/images/google/gift_heart.png differ
diff --git a/plugins/emoji/public/images/google/girl.png b/plugins/emoji/public/images/google/girl.png
new file mode 100644
index 0000000000..7730c61e4c
Binary files /dev/null and b/plugins/emoji/public/images/google/girl.png differ
diff --git a/plugins/emoji/public/images/google/globe_with_meridians.png b/plugins/emoji/public/images/google/globe_with_meridians.png
new file mode 100644
index 0000000000..e39cf29f1b
Binary files /dev/null and b/plugins/emoji/public/images/google/globe_with_meridians.png differ
diff --git a/plugins/emoji/public/images/google/goat.png b/plugins/emoji/public/images/google/goat.png
new file mode 100644
index 0000000000..382f99996e
Binary files /dev/null and b/plugins/emoji/public/images/google/goat.png differ
diff --git a/plugins/emoji/public/images/google/golf.png b/plugins/emoji/public/images/google/golf.png
new file mode 100644
index 0000000000..25c4f587cc
Binary files /dev/null and b/plugins/emoji/public/images/google/golf.png differ
diff --git a/plugins/emoji/public/images/google/grapes.png b/plugins/emoji/public/images/google/grapes.png
new file mode 100644
index 0000000000..a22a2bf06a
Binary files /dev/null and b/plugins/emoji/public/images/google/grapes.png differ
diff --git a/plugins/emoji/public/images/google/green_apple.png b/plugins/emoji/public/images/google/green_apple.png
new file mode 100644
index 0000000000..61c6c2f418
Binary files /dev/null and b/plugins/emoji/public/images/google/green_apple.png differ
diff --git a/plugins/emoji/public/images/google/green_book.png b/plugins/emoji/public/images/google/green_book.png
new file mode 100644
index 0000000000..b3d88d4cca
Binary files /dev/null and b/plugins/emoji/public/images/google/green_book.png differ
diff --git a/plugins/emoji/public/images/google/green_heart.png b/plugins/emoji/public/images/google/green_heart.png
new file mode 100644
index 0000000000..fcc0094623
Binary files /dev/null and b/plugins/emoji/public/images/google/green_heart.png differ
diff --git a/plugins/emoji/public/images/google/grey_exclamation.png b/plugins/emoji/public/images/google/grey_exclamation.png
new file mode 100644
index 0000000000..4163830d4e
Binary files /dev/null and b/plugins/emoji/public/images/google/grey_exclamation.png differ
diff --git a/plugins/emoji/public/images/google/grey_question.png b/plugins/emoji/public/images/google/grey_question.png
new file mode 100644
index 0000000000..2b75c8752a
Binary files /dev/null and b/plugins/emoji/public/images/google/grey_question.png differ
diff --git a/plugins/emoji/public/images/google/grimacing.png b/plugins/emoji/public/images/google/grimacing.png
new file mode 100644
index 0000000000..b2034a227f
Binary files /dev/null and b/plugins/emoji/public/images/google/grimacing.png differ
diff --git a/plugins/emoji/public/images/google/grin.png b/plugins/emoji/public/images/google/grin.png
new file mode 100644
index 0000000000..d8df40f516
Binary files /dev/null and b/plugins/emoji/public/images/google/grin.png differ
diff --git a/plugins/emoji/public/images/google/grinning.png b/plugins/emoji/public/images/google/grinning.png
new file mode 100644
index 0000000000..415bd257ca
Binary files /dev/null and b/plugins/emoji/public/images/google/grinning.png differ
diff --git a/plugins/emoji/public/images/google/guardsman.png b/plugins/emoji/public/images/google/guardsman.png
new file mode 100644
index 0000000000..a7bd1bb0c7
Binary files /dev/null and b/plugins/emoji/public/images/google/guardsman.png differ
diff --git a/plugins/emoji/public/images/google/guitar.png b/plugins/emoji/public/images/google/guitar.png
new file mode 100644
index 0000000000..3dc3d99322
Binary files /dev/null and b/plugins/emoji/public/images/google/guitar.png differ
diff --git a/plugins/emoji/public/images/google/gun.png b/plugins/emoji/public/images/google/gun.png
new file mode 100644
index 0000000000..d6112d1888
Binary files /dev/null and b/plugins/emoji/public/images/google/gun.png differ
diff --git a/plugins/emoji/public/images/google/haircut.png b/plugins/emoji/public/images/google/haircut.png
new file mode 100644
index 0000000000..2aa6b3c350
Binary files /dev/null and b/plugins/emoji/public/images/google/haircut.png differ
diff --git a/plugins/emoji/public/images/google/hamburger.png b/plugins/emoji/public/images/google/hamburger.png
new file mode 100644
index 0000000000..4eef81d519
Binary files /dev/null and b/plugins/emoji/public/images/google/hamburger.png differ
diff --git a/plugins/emoji/public/images/google/hammer.png b/plugins/emoji/public/images/google/hammer.png
new file mode 100644
index 0000000000..e516256230
Binary files /dev/null and b/plugins/emoji/public/images/google/hammer.png differ
diff --git a/plugins/emoji/public/images/google/hamster.png b/plugins/emoji/public/images/google/hamster.png
new file mode 100644
index 0000000000..42892906e1
Binary files /dev/null and b/plugins/emoji/public/images/google/hamster.png differ
diff --git a/plugins/emoji/public/images/google/hand.png b/plugins/emoji/public/images/google/hand.png
new file mode 100644
index 0000000000..beb6c8b91e
Binary files /dev/null and b/plugins/emoji/public/images/google/hand.png differ
diff --git a/plugins/emoji/public/images/google/handbag.png b/plugins/emoji/public/images/google/handbag.png
new file mode 100644
index 0000000000..2b03117ebe
Binary files /dev/null and b/plugins/emoji/public/images/google/handbag.png differ
diff --git a/plugins/emoji/public/images/google/hankey.png b/plugins/emoji/public/images/google/hankey.png
new file mode 100644
index 0000000000..2aacba589e
Binary files /dev/null and b/plugins/emoji/public/images/google/hankey.png differ
diff --git a/plugins/emoji/public/images/google/hatched_chick.png b/plugins/emoji/public/images/google/hatched_chick.png
new file mode 100644
index 0000000000..f21d84a12e
Binary files /dev/null and b/plugins/emoji/public/images/google/hatched_chick.png differ
diff --git a/plugins/emoji/public/images/google/hatching_chick.png b/plugins/emoji/public/images/google/hatching_chick.png
new file mode 100644
index 0000000000..5c0efa50d3
Binary files /dev/null and b/plugins/emoji/public/images/google/hatching_chick.png differ
diff --git a/plugins/emoji/public/images/google/headphones.png b/plugins/emoji/public/images/google/headphones.png
new file mode 100644
index 0000000000..a1c6816de3
Binary files /dev/null and b/plugins/emoji/public/images/google/headphones.png differ
diff --git a/plugins/emoji/public/images/google/hear_no_evil.png b/plugins/emoji/public/images/google/hear_no_evil.png
new file mode 100644
index 0000000000..52dfc210ad
Binary files /dev/null and b/plugins/emoji/public/images/google/hear_no_evil.png differ
diff --git a/plugins/emoji/public/images/google/heart.png b/plugins/emoji/public/images/google/heart.png
new file mode 100644
index 0000000000..0684cd4c65
Binary files /dev/null and b/plugins/emoji/public/images/google/heart.png differ
diff --git a/plugins/emoji/public/images/google/heart_decoration.png b/plugins/emoji/public/images/google/heart_decoration.png
new file mode 100644
index 0000000000..e79e4b07ee
Binary files /dev/null and b/plugins/emoji/public/images/google/heart_decoration.png differ
diff --git a/plugins/emoji/public/images/google/heart_eyes.png b/plugins/emoji/public/images/google/heart_eyes.png
new file mode 100644
index 0000000000..ce46bde080
Binary files /dev/null and b/plugins/emoji/public/images/google/heart_eyes.png differ
diff --git a/plugins/emoji/public/images/google/heart_eyes_cat.png b/plugins/emoji/public/images/google/heart_eyes_cat.png
new file mode 100644
index 0000000000..c202b88ef5
Binary files /dev/null and b/plugins/emoji/public/images/google/heart_eyes_cat.png differ
diff --git a/plugins/emoji/public/images/google/heartbeat.png b/plugins/emoji/public/images/google/heartbeat.png
new file mode 100644
index 0000000000..efc01a98c7
Binary files /dev/null and b/plugins/emoji/public/images/google/heartbeat.png differ
diff --git a/plugins/emoji/public/images/google/heartpulse.png b/plugins/emoji/public/images/google/heartpulse.png
new file mode 100644
index 0000000000..e462ba4202
Binary files /dev/null and b/plugins/emoji/public/images/google/heartpulse.png differ
diff --git a/plugins/emoji/public/images/google/hearts.png b/plugins/emoji/public/images/google/hearts.png
new file mode 100644
index 0000000000..bd907bb4d8
Binary files /dev/null and b/plugins/emoji/public/images/google/hearts.png differ
diff --git a/plugins/emoji/public/images/google/heavy_check_mark.png b/plugins/emoji/public/images/google/heavy_check_mark.png
new file mode 100644
index 0000000000..c1cfabe3f8
Binary files /dev/null and b/plugins/emoji/public/images/google/heavy_check_mark.png differ
diff --git a/plugins/emoji/public/images/google/heavy_division_sign.png b/plugins/emoji/public/images/google/heavy_division_sign.png
new file mode 100644
index 0000000000..9635f68f0b
Binary files /dev/null and b/plugins/emoji/public/images/google/heavy_division_sign.png differ
diff --git a/plugins/emoji/public/images/google/heavy_dollar_sign.png b/plugins/emoji/public/images/google/heavy_dollar_sign.png
new file mode 100644
index 0000000000..7f3e04946d
Binary files /dev/null and b/plugins/emoji/public/images/google/heavy_dollar_sign.png differ
diff --git a/plugins/emoji/public/images/google/heavy_exclamation_mark.png b/plugins/emoji/public/images/google/heavy_exclamation_mark.png
new file mode 100644
index 0000000000..6883966d8d
Binary files /dev/null and b/plugins/emoji/public/images/google/heavy_exclamation_mark.png differ
diff --git a/plugins/emoji/public/images/google/heavy_minus_sign.png b/plugins/emoji/public/images/google/heavy_minus_sign.png
new file mode 100644
index 0000000000..397af23e93
Binary files /dev/null and b/plugins/emoji/public/images/google/heavy_minus_sign.png differ
diff --git a/plugins/emoji/public/images/google/heavy_multiplication_x.png b/plugins/emoji/public/images/google/heavy_multiplication_x.png
new file mode 100644
index 0000000000..69a2115a21
Binary files /dev/null and b/plugins/emoji/public/images/google/heavy_multiplication_x.png differ
diff --git a/plugins/emoji/public/images/google/heavy_plus_sign.png b/plugins/emoji/public/images/google/heavy_plus_sign.png
new file mode 100644
index 0000000000..35f67b5b0c
Binary files /dev/null and b/plugins/emoji/public/images/google/heavy_plus_sign.png differ
diff --git a/plugins/emoji/public/images/google/helicopter.png b/plugins/emoji/public/images/google/helicopter.png
new file mode 100644
index 0000000000..6210b39977
Binary files /dev/null and b/plugins/emoji/public/images/google/helicopter.png differ
diff --git a/plugins/emoji/public/images/google/herb.png b/plugins/emoji/public/images/google/herb.png
new file mode 100644
index 0000000000..640f2556af
Binary files /dev/null and b/plugins/emoji/public/images/google/herb.png differ
diff --git a/plugins/emoji/public/images/google/hibiscus.png b/plugins/emoji/public/images/google/hibiscus.png
new file mode 100644
index 0000000000..1473e8e5a8
Binary files /dev/null and b/plugins/emoji/public/images/google/hibiscus.png differ
diff --git a/plugins/emoji/public/images/google/high_brightness.png b/plugins/emoji/public/images/google/high_brightness.png
new file mode 100644
index 0000000000..578d8b6531
Binary files /dev/null and b/plugins/emoji/public/images/google/high_brightness.png differ
diff --git a/plugins/emoji/public/images/google/high_heel.png b/plugins/emoji/public/images/google/high_heel.png
new file mode 100644
index 0000000000..bf04c22b64
Binary files /dev/null and b/plugins/emoji/public/images/google/high_heel.png differ
diff --git a/plugins/emoji/public/images/google/hocho.png b/plugins/emoji/public/images/google/hocho.png
new file mode 100644
index 0000000000..e9e552e66e
Binary files /dev/null and b/plugins/emoji/public/images/google/hocho.png differ
diff --git a/plugins/emoji/public/images/google/honey_pot.png b/plugins/emoji/public/images/google/honey_pot.png
new file mode 100644
index 0000000000..f399777db4
Binary files /dev/null and b/plugins/emoji/public/images/google/honey_pot.png differ
diff --git a/plugins/emoji/public/images/google/honeybee.png b/plugins/emoji/public/images/google/honeybee.png
new file mode 100644
index 0000000000..031d526e4b
Binary files /dev/null and b/plugins/emoji/public/images/google/honeybee.png differ
diff --git a/plugins/emoji/public/images/google/horse.png b/plugins/emoji/public/images/google/horse.png
new file mode 100644
index 0000000000..19c2f63a34
Binary files /dev/null and b/plugins/emoji/public/images/google/horse.png differ
diff --git a/plugins/emoji/public/images/google/horse_racing.png b/plugins/emoji/public/images/google/horse_racing.png
new file mode 100644
index 0000000000..928cb2fb41
Binary files /dev/null and b/plugins/emoji/public/images/google/horse_racing.png differ
diff --git a/plugins/emoji/public/images/google/hospital.png b/plugins/emoji/public/images/google/hospital.png
new file mode 100644
index 0000000000..722382992d
Binary files /dev/null and b/plugins/emoji/public/images/google/hospital.png differ
diff --git a/plugins/emoji/public/images/google/hotel.png b/plugins/emoji/public/images/google/hotel.png
new file mode 100644
index 0000000000..efeb2eafd5
Binary files /dev/null and b/plugins/emoji/public/images/google/hotel.png differ
diff --git a/plugins/emoji/public/images/google/hotsprings.png b/plugins/emoji/public/images/google/hotsprings.png
new file mode 100644
index 0000000000..c9e6816ca2
Binary files /dev/null and b/plugins/emoji/public/images/google/hotsprings.png differ
diff --git a/plugins/emoji/public/images/google/hourglass.png b/plugins/emoji/public/images/google/hourglass.png
new file mode 100644
index 0000000000..837f50679e
Binary files /dev/null and b/plugins/emoji/public/images/google/hourglass.png differ
diff --git a/plugins/emoji/public/images/google/hourglass_flowing_sand.png b/plugins/emoji/public/images/google/hourglass_flowing_sand.png
new file mode 100644
index 0000000000..a586e6ed2e
Binary files /dev/null and b/plugins/emoji/public/images/google/hourglass_flowing_sand.png differ
diff --git a/plugins/emoji/public/images/google/house.png b/plugins/emoji/public/images/google/house.png
new file mode 100644
index 0000000000..556bfc5548
Binary files /dev/null and b/plugins/emoji/public/images/google/house.png differ
diff --git a/plugins/emoji/public/images/google/house_with_garden.png b/plugins/emoji/public/images/google/house_with_garden.png
new file mode 100644
index 0000000000..d49ab44382
Binary files /dev/null and b/plugins/emoji/public/images/google/house_with_garden.png differ
diff --git a/plugins/emoji/public/images/google/hushed.png b/plugins/emoji/public/images/google/hushed.png
new file mode 100644
index 0000000000..53769360a2
Binary files /dev/null and b/plugins/emoji/public/images/google/hushed.png differ
diff --git a/plugins/emoji/public/images/google/ice_cream.png b/plugins/emoji/public/images/google/ice_cream.png
new file mode 100644
index 0000000000..db4582bbc6
Binary files /dev/null and b/plugins/emoji/public/images/google/ice_cream.png differ
diff --git a/plugins/emoji/public/images/google/icecream.png b/plugins/emoji/public/images/google/icecream.png
new file mode 100644
index 0000000000..45a1a71dc6
Binary files /dev/null and b/plugins/emoji/public/images/google/icecream.png differ
diff --git a/plugins/emoji/public/images/google/id.png b/plugins/emoji/public/images/google/id.png
new file mode 100644
index 0000000000..095086932c
Binary files /dev/null and b/plugins/emoji/public/images/google/id.png differ
diff --git a/plugins/emoji/public/images/google/ideograph_advantage.png b/plugins/emoji/public/images/google/ideograph_advantage.png
new file mode 100644
index 0000000000..e29656bbe1
Binary files /dev/null and b/plugins/emoji/public/images/google/ideograph_advantage.png differ
diff --git a/plugins/emoji/public/images/google/imp.png b/plugins/emoji/public/images/google/imp.png
new file mode 100644
index 0000000000..eaddaceaf4
Binary files /dev/null and b/plugins/emoji/public/images/google/imp.png differ
diff --git a/plugins/emoji/public/images/google/inbox_tray.png b/plugins/emoji/public/images/google/inbox_tray.png
new file mode 100644
index 0000000000..ae6ad958d2
Binary files /dev/null and b/plugins/emoji/public/images/google/inbox_tray.png differ
diff --git a/plugins/emoji/public/images/google/incoming_envelope.png b/plugins/emoji/public/images/google/incoming_envelope.png
new file mode 100644
index 0000000000..82a1f664be
Binary files /dev/null and b/plugins/emoji/public/images/google/incoming_envelope.png differ
diff --git a/plugins/emoji/public/images/google/information_desk_person.png b/plugins/emoji/public/images/google/information_desk_person.png
new file mode 100644
index 0000000000..c3d69a8e08
Binary files /dev/null and b/plugins/emoji/public/images/google/information_desk_person.png differ
diff --git a/plugins/emoji/public/images/google/information_source.png b/plugins/emoji/public/images/google/information_source.png
new file mode 100644
index 0000000000..560378a59e
Binary files /dev/null and b/plugins/emoji/public/images/google/information_source.png differ
diff --git a/plugins/emoji/public/images/google/innocent.png b/plugins/emoji/public/images/google/innocent.png
new file mode 100644
index 0000000000..ef413af8c5
Binary files /dev/null and b/plugins/emoji/public/images/google/innocent.png differ
diff --git a/plugins/emoji/public/images/google/interrobang.png b/plugins/emoji/public/images/google/interrobang.png
new file mode 100644
index 0000000000..2f4c7d1d38
Binary files /dev/null and b/plugins/emoji/public/images/google/interrobang.png differ
diff --git a/plugins/emoji/public/images/google/iphone.png b/plugins/emoji/public/images/google/iphone.png
new file mode 100644
index 0000000000..5e3768160f
Binary files /dev/null and b/plugins/emoji/public/images/google/iphone.png differ
diff --git a/plugins/emoji/public/images/google/it.png b/plugins/emoji/public/images/google/it.png
new file mode 100644
index 0000000000..c546e38d84
Binary files /dev/null and b/plugins/emoji/public/images/google/it.png differ
diff --git a/plugins/emoji/public/images/google/izakaya_lantern.png b/plugins/emoji/public/images/google/izakaya_lantern.png
new file mode 100644
index 0000000000..61c02be048
Binary files /dev/null and b/plugins/emoji/public/images/google/izakaya_lantern.png differ
diff --git a/plugins/emoji/public/images/google/jack_o_lantern.png b/plugins/emoji/public/images/google/jack_o_lantern.png
new file mode 100644
index 0000000000..47c7d017c6
Binary files /dev/null and b/plugins/emoji/public/images/google/jack_o_lantern.png differ
diff --git a/plugins/emoji/public/images/google/japan.png b/plugins/emoji/public/images/google/japan.png
new file mode 100644
index 0000000000..f5a596e286
Binary files /dev/null and b/plugins/emoji/public/images/google/japan.png differ
diff --git a/plugins/emoji/public/images/google/japanese_castle.png b/plugins/emoji/public/images/google/japanese_castle.png
new file mode 100644
index 0000000000..e10a121e47
Binary files /dev/null and b/plugins/emoji/public/images/google/japanese_castle.png differ
diff --git a/plugins/emoji/public/images/google/japanese_goblin.png b/plugins/emoji/public/images/google/japanese_goblin.png
new file mode 100644
index 0000000000..7f76bf65e2
Binary files /dev/null and b/plugins/emoji/public/images/google/japanese_goblin.png differ
diff --git a/plugins/emoji/public/images/google/japanese_ogre.png b/plugins/emoji/public/images/google/japanese_ogre.png
new file mode 100644
index 0000000000..03b2af294a
Binary files /dev/null and b/plugins/emoji/public/images/google/japanese_ogre.png differ
diff --git a/plugins/emoji/public/images/google/jeans.png b/plugins/emoji/public/images/google/jeans.png
new file mode 100644
index 0000000000..c92b42446c
Binary files /dev/null and b/plugins/emoji/public/images/google/jeans.png differ
diff --git a/plugins/emoji/public/images/google/joy.png b/plugins/emoji/public/images/google/joy.png
new file mode 100644
index 0000000000..214232e32d
Binary files /dev/null and b/plugins/emoji/public/images/google/joy.png differ
diff --git a/plugins/emoji/public/images/google/joy_cat.png b/plugins/emoji/public/images/google/joy_cat.png
new file mode 100644
index 0000000000..8dccc29ab7
Binary files /dev/null and b/plugins/emoji/public/images/google/joy_cat.png differ
diff --git a/plugins/emoji/public/images/google/jp.png b/plugins/emoji/public/images/google/jp.png
new file mode 100644
index 0000000000..993397696c
Binary files /dev/null and b/plugins/emoji/public/images/google/jp.png differ
diff --git a/plugins/emoji/public/images/google/key.png b/plugins/emoji/public/images/google/key.png
new file mode 100644
index 0000000000..b9494c56e7
Binary files /dev/null and b/plugins/emoji/public/images/google/key.png differ
diff --git a/plugins/emoji/public/images/google/keycap_ten.png b/plugins/emoji/public/images/google/keycap_ten.png
new file mode 100644
index 0000000000..ac71f9ed4b
Binary files /dev/null and b/plugins/emoji/public/images/google/keycap_ten.png differ
diff --git a/plugins/emoji/public/images/google/kimono.png b/plugins/emoji/public/images/google/kimono.png
new file mode 100644
index 0000000000..474a425b91
Binary files /dev/null and b/plugins/emoji/public/images/google/kimono.png differ
diff --git a/plugins/emoji/public/images/google/kiss.png b/plugins/emoji/public/images/google/kiss.png
new file mode 100644
index 0000000000..95edaf4812
Binary files /dev/null and b/plugins/emoji/public/images/google/kiss.png differ
diff --git a/plugins/emoji/public/images/google/kissing.png b/plugins/emoji/public/images/google/kissing.png
new file mode 100644
index 0000000000..b1a69fefae
Binary files /dev/null and b/plugins/emoji/public/images/google/kissing.png differ
diff --git a/plugins/emoji/public/images/google/kissing_cat.png b/plugins/emoji/public/images/google/kissing_cat.png
new file mode 100644
index 0000000000..e5e5450810
Binary files /dev/null and b/plugins/emoji/public/images/google/kissing_cat.png differ
diff --git a/plugins/emoji/public/images/google/kissing_closed_eyes.png b/plugins/emoji/public/images/google/kissing_closed_eyes.png
new file mode 100644
index 0000000000..0f59127b73
Binary files /dev/null and b/plugins/emoji/public/images/google/kissing_closed_eyes.png differ
diff --git a/plugins/emoji/public/images/google/kissing_heart.png b/plugins/emoji/public/images/google/kissing_heart.png
new file mode 100644
index 0000000000..97f56a6aee
Binary files /dev/null and b/plugins/emoji/public/images/google/kissing_heart.png differ
diff --git a/plugins/emoji/public/images/google/kissing_smiling_eyes.png b/plugins/emoji/public/images/google/kissing_smiling_eyes.png
new file mode 100644
index 0000000000..24c041491f
Binary files /dev/null and b/plugins/emoji/public/images/google/kissing_smiling_eyes.png differ
diff --git a/plugins/emoji/public/images/google/knife.png b/plugins/emoji/public/images/google/knife.png
new file mode 100644
index 0000000000..e9e552e66e
Binary files /dev/null and b/plugins/emoji/public/images/google/knife.png differ
diff --git a/plugins/emoji/public/images/google/koala.png b/plugins/emoji/public/images/google/koala.png
new file mode 100644
index 0000000000..21c2193669
Binary files /dev/null and b/plugins/emoji/public/images/google/koala.png differ
diff --git a/plugins/emoji/public/images/google/koko.png b/plugins/emoji/public/images/google/koko.png
new file mode 100644
index 0000000000..a833998de2
Binary files /dev/null and b/plugins/emoji/public/images/google/koko.png differ
diff --git a/plugins/emoji/public/images/google/kr.png b/plugins/emoji/public/images/google/kr.png
new file mode 100644
index 0000000000..1a99cfcf97
Binary files /dev/null and b/plugins/emoji/public/images/google/kr.png differ
diff --git a/plugins/emoji/public/images/google/lantern.png b/plugins/emoji/public/images/google/lantern.png
new file mode 100644
index 0000000000..61c02be048
Binary files /dev/null and b/plugins/emoji/public/images/google/lantern.png differ
diff --git a/plugins/emoji/public/images/google/large_blue_circle.png b/plugins/emoji/public/images/google/large_blue_circle.png
new file mode 100644
index 0000000000..568dd1ca03
Binary files /dev/null and b/plugins/emoji/public/images/google/large_blue_circle.png differ
diff --git a/plugins/emoji/public/images/google/large_blue_diamond.png b/plugins/emoji/public/images/google/large_blue_diamond.png
new file mode 100644
index 0000000000..9c18710558
Binary files /dev/null and b/plugins/emoji/public/images/google/large_blue_diamond.png differ
diff --git a/plugins/emoji/public/images/google/large_orange_diamond.png b/plugins/emoji/public/images/google/large_orange_diamond.png
new file mode 100644
index 0000000000..9c3303e454
Binary files /dev/null and b/plugins/emoji/public/images/google/large_orange_diamond.png differ
diff --git a/plugins/emoji/public/images/google/last_quarter_moon.png b/plugins/emoji/public/images/google/last_quarter_moon.png
new file mode 100644
index 0000000000..8293c87151
Binary files /dev/null and b/plugins/emoji/public/images/google/last_quarter_moon.png differ
diff --git a/plugins/emoji/public/images/google/last_quarter_moon_with_face.png b/plugins/emoji/public/images/google/last_quarter_moon_with_face.png
new file mode 100644
index 0000000000..20900aabd8
Binary files /dev/null and b/plugins/emoji/public/images/google/last_quarter_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/google/laughing.png b/plugins/emoji/public/images/google/laughing.png
new file mode 100644
index 0000000000..3ecd034332
Binary files /dev/null and b/plugins/emoji/public/images/google/laughing.png differ
diff --git a/plugins/emoji/public/images/google/leaves.png b/plugins/emoji/public/images/google/leaves.png
new file mode 100644
index 0000000000..80a7bfa3c7
Binary files /dev/null and b/plugins/emoji/public/images/google/leaves.png differ
diff --git a/plugins/emoji/public/images/google/ledger.png b/plugins/emoji/public/images/google/ledger.png
new file mode 100644
index 0000000000..0c8e28f568
Binary files /dev/null and b/plugins/emoji/public/images/google/ledger.png differ
diff --git a/plugins/emoji/public/images/google/left_luggage.png b/plugins/emoji/public/images/google/left_luggage.png
new file mode 100644
index 0000000000..e4b43bebcd
Binary files /dev/null and b/plugins/emoji/public/images/google/left_luggage.png differ
diff --git a/plugins/emoji/public/images/google/left_right_arrow.png b/plugins/emoji/public/images/google/left_right_arrow.png
new file mode 100644
index 0000000000..597f953bdf
Binary files /dev/null and b/plugins/emoji/public/images/google/left_right_arrow.png differ
diff --git a/plugins/emoji/public/images/google/leftwards_arrow_with_hook.png b/plugins/emoji/public/images/google/leftwards_arrow_with_hook.png
new file mode 100644
index 0000000000..f8f5166e11
Binary files /dev/null and b/plugins/emoji/public/images/google/leftwards_arrow_with_hook.png differ
diff --git a/plugins/emoji/public/images/google/lemon.png b/plugins/emoji/public/images/google/lemon.png
new file mode 100644
index 0000000000..876952723e
Binary files /dev/null and b/plugins/emoji/public/images/google/lemon.png differ
diff --git a/plugins/emoji/public/images/google/leo.png b/plugins/emoji/public/images/google/leo.png
new file mode 100644
index 0000000000..de7daa3d7e
Binary files /dev/null and b/plugins/emoji/public/images/google/leo.png differ
diff --git a/plugins/emoji/public/images/google/leopard.png b/plugins/emoji/public/images/google/leopard.png
new file mode 100644
index 0000000000..6f4a4368e3
Binary files /dev/null and b/plugins/emoji/public/images/google/leopard.png differ
diff --git a/plugins/emoji/public/images/google/libra.png b/plugins/emoji/public/images/google/libra.png
new file mode 100644
index 0000000000..b5ef8e02c8
Binary files /dev/null and b/plugins/emoji/public/images/google/libra.png differ
diff --git a/plugins/emoji/public/images/google/light_rail.png b/plugins/emoji/public/images/google/light_rail.png
new file mode 100644
index 0000000000..e395df31e3
Binary files /dev/null and b/plugins/emoji/public/images/google/light_rail.png differ
diff --git a/plugins/emoji/public/images/google/link.png b/plugins/emoji/public/images/google/link.png
new file mode 100644
index 0000000000..0073fd18b0
Binary files /dev/null and b/plugins/emoji/public/images/google/link.png differ
diff --git a/plugins/emoji/public/images/google/lips.png b/plugins/emoji/public/images/google/lips.png
new file mode 100644
index 0000000000..df29650a9e
Binary files /dev/null and b/plugins/emoji/public/images/google/lips.png differ
diff --git a/plugins/emoji/public/images/google/lipstick.png b/plugins/emoji/public/images/google/lipstick.png
new file mode 100644
index 0000000000..8c460674cd
Binary files /dev/null and b/plugins/emoji/public/images/google/lipstick.png differ
diff --git a/plugins/emoji/public/images/google/lock.png b/plugins/emoji/public/images/google/lock.png
new file mode 100644
index 0000000000..ee7f048404
Binary files /dev/null and b/plugins/emoji/public/images/google/lock.png differ
diff --git a/plugins/emoji/public/images/google/lock_with_ink_pen.png b/plugins/emoji/public/images/google/lock_with_ink_pen.png
new file mode 100644
index 0000000000..a8ab043395
Binary files /dev/null and b/plugins/emoji/public/images/google/lock_with_ink_pen.png differ
diff --git a/plugins/emoji/public/images/google/lollipop.png b/plugins/emoji/public/images/google/lollipop.png
new file mode 100644
index 0000000000..2de4da16d9
Binary files /dev/null and b/plugins/emoji/public/images/google/lollipop.png differ
diff --git a/plugins/emoji/public/images/google/loud_sound.png b/plugins/emoji/public/images/google/loud_sound.png
new file mode 100644
index 0000000000..099203eace
Binary files /dev/null and b/plugins/emoji/public/images/google/loud_sound.png differ
diff --git a/plugins/emoji/public/images/google/loudspeaker.png b/plugins/emoji/public/images/google/loudspeaker.png
new file mode 100644
index 0000000000..d37043bc1a
Binary files /dev/null and b/plugins/emoji/public/images/google/loudspeaker.png differ
diff --git a/plugins/emoji/public/images/google/love_hotel.png b/plugins/emoji/public/images/google/love_hotel.png
new file mode 100644
index 0000000000..091170c7b1
Binary files /dev/null and b/plugins/emoji/public/images/google/love_hotel.png differ
diff --git a/plugins/emoji/public/images/google/love_letter.png b/plugins/emoji/public/images/google/love_letter.png
new file mode 100644
index 0000000000..1945635cca
Binary files /dev/null and b/plugins/emoji/public/images/google/love_letter.png differ
diff --git a/plugins/emoji/public/images/google/low_brightness.png b/plugins/emoji/public/images/google/low_brightness.png
new file mode 100644
index 0000000000..d5610ecdc7
Binary files /dev/null and b/plugins/emoji/public/images/google/low_brightness.png differ
diff --git a/plugins/emoji/public/images/google/m.png b/plugins/emoji/public/images/google/m.png
new file mode 100644
index 0000000000..55917bb18b
Binary files /dev/null and b/plugins/emoji/public/images/google/m.png differ
diff --git a/plugins/emoji/public/images/google/mag.png b/plugins/emoji/public/images/google/mag.png
new file mode 100644
index 0000000000..b697cf23d0
Binary files /dev/null and b/plugins/emoji/public/images/google/mag.png differ
diff --git a/plugins/emoji/public/images/google/mag_right.png b/plugins/emoji/public/images/google/mag_right.png
new file mode 100644
index 0000000000..02685375bb
Binary files /dev/null and b/plugins/emoji/public/images/google/mag_right.png differ
diff --git a/plugins/emoji/public/images/google/mahjong.png b/plugins/emoji/public/images/google/mahjong.png
new file mode 100644
index 0000000000..e73e41fc14
Binary files /dev/null and b/plugins/emoji/public/images/google/mahjong.png differ
diff --git a/plugins/emoji/public/images/google/mailbox.png b/plugins/emoji/public/images/google/mailbox.png
new file mode 100644
index 0000000000..355dfbfeaf
Binary files /dev/null and b/plugins/emoji/public/images/google/mailbox.png differ
diff --git a/plugins/emoji/public/images/google/mailbox_closed.png b/plugins/emoji/public/images/google/mailbox_closed.png
new file mode 100644
index 0000000000..b503a551ba
Binary files /dev/null and b/plugins/emoji/public/images/google/mailbox_closed.png differ
diff --git a/plugins/emoji/public/images/google/mailbox_with_mail.png b/plugins/emoji/public/images/google/mailbox_with_mail.png
new file mode 100644
index 0000000000..72253a9963
Binary files /dev/null and b/plugins/emoji/public/images/google/mailbox_with_mail.png differ
diff --git a/plugins/emoji/public/images/google/mailbox_with_no_mail.png b/plugins/emoji/public/images/google/mailbox_with_no_mail.png
new file mode 100644
index 0000000000..f43a6f62f3
Binary files /dev/null and b/plugins/emoji/public/images/google/mailbox_with_no_mail.png differ
diff --git a/plugins/emoji/public/images/google/man.png b/plugins/emoji/public/images/google/man.png
new file mode 100644
index 0000000000..0c4cad1134
Binary files /dev/null and b/plugins/emoji/public/images/google/man.png differ
diff --git a/plugins/emoji/public/images/google/man_with_gua_pi_mao.png b/plugins/emoji/public/images/google/man_with_gua_pi_mao.png
new file mode 100644
index 0000000000..8f29ef6581
Binary files /dev/null and b/plugins/emoji/public/images/google/man_with_gua_pi_mao.png differ
diff --git a/plugins/emoji/public/images/google/man_with_turban.png b/plugins/emoji/public/images/google/man_with_turban.png
new file mode 100644
index 0000000000..ad22559ba2
Binary files /dev/null and b/plugins/emoji/public/images/google/man_with_turban.png differ
diff --git a/plugins/emoji/public/images/google/mans_shoe.png b/plugins/emoji/public/images/google/mans_shoe.png
new file mode 100644
index 0000000000..34341146f2
Binary files /dev/null and b/plugins/emoji/public/images/google/mans_shoe.png differ
diff --git a/plugins/emoji/public/images/google/maple_leaf.png b/plugins/emoji/public/images/google/maple_leaf.png
new file mode 100644
index 0000000000..ffafc290e2
Binary files /dev/null and b/plugins/emoji/public/images/google/maple_leaf.png differ
diff --git a/plugins/emoji/public/images/google/mask.png b/plugins/emoji/public/images/google/mask.png
new file mode 100644
index 0000000000..2fec007868
Binary files /dev/null and b/plugins/emoji/public/images/google/mask.png differ
diff --git a/plugins/emoji/public/images/google/massage.png b/plugins/emoji/public/images/google/massage.png
new file mode 100644
index 0000000000..c969b548e7
Binary files /dev/null and b/plugins/emoji/public/images/google/massage.png differ
diff --git a/plugins/emoji/public/images/google/meat_on_bone.png b/plugins/emoji/public/images/google/meat_on_bone.png
new file mode 100644
index 0000000000..4be9354f01
Binary files /dev/null and b/plugins/emoji/public/images/google/meat_on_bone.png differ
diff --git a/plugins/emoji/public/images/google/mega.png b/plugins/emoji/public/images/google/mega.png
new file mode 100644
index 0000000000..6d91527f07
Binary files /dev/null and b/plugins/emoji/public/images/google/mega.png differ
diff --git a/plugins/emoji/public/images/google/melon.png b/plugins/emoji/public/images/google/melon.png
new file mode 100644
index 0000000000..4b01abb9ef
Binary files /dev/null and b/plugins/emoji/public/images/google/melon.png differ
diff --git a/plugins/emoji/public/images/google/memo.png b/plugins/emoji/public/images/google/memo.png
new file mode 100644
index 0000000000..db2595c899
Binary files /dev/null and b/plugins/emoji/public/images/google/memo.png differ
diff --git a/plugins/emoji/public/images/google/mens.png b/plugins/emoji/public/images/google/mens.png
new file mode 100644
index 0000000000..1f30777fc9
Binary files /dev/null and b/plugins/emoji/public/images/google/mens.png differ
diff --git a/plugins/emoji/public/images/google/metro.png b/plugins/emoji/public/images/google/metro.png
new file mode 100644
index 0000000000..d685348e35
Binary files /dev/null and b/plugins/emoji/public/images/google/metro.png differ
diff --git a/plugins/emoji/public/images/google/microphone.png b/plugins/emoji/public/images/google/microphone.png
new file mode 100644
index 0000000000..6e797410f9
Binary files /dev/null and b/plugins/emoji/public/images/google/microphone.png differ
diff --git a/plugins/emoji/public/images/google/microscope.png b/plugins/emoji/public/images/google/microscope.png
new file mode 100644
index 0000000000..7e8c3cdee1
Binary files /dev/null and b/plugins/emoji/public/images/google/microscope.png differ
diff --git a/plugins/emoji/public/images/google/milky_way.png b/plugins/emoji/public/images/google/milky_way.png
new file mode 100644
index 0000000000..44738f8581
Binary files /dev/null and b/plugins/emoji/public/images/google/milky_way.png differ
diff --git a/plugins/emoji/public/images/google/minibus.png b/plugins/emoji/public/images/google/minibus.png
new file mode 100644
index 0000000000..49637678e0
Binary files /dev/null and b/plugins/emoji/public/images/google/minibus.png differ
diff --git a/plugins/emoji/public/images/google/minidisc.png b/plugins/emoji/public/images/google/minidisc.png
new file mode 100644
index 0000000000..ef77f81f0b
Binary files /dev/null and b/plugins/emoji/public/images/google/minidisc.png differ
diff --git a/plugins/emoji/public/images/google/mobile_phone_off.png b/plugins/emoji/public/images/google/mobile_phone_off.png
new file mode 100644
index 0000000000..cc9afa98d7
Binary files /dev/null and b/plugins/emoji/public/images/google/mobile_phone_off.png differ
diff --git a/plugins/emoji/public/images/google/money_with_wings.png b/plugins/emoji/public/images/google/money_with_wings.png
new file mode 100644
index 0000000000..14b98f40a4
Binary files /dev/null and b/plugins/emoji/public/images/google/money_with_wings.png differ
diff --git a/plugins/emoji/public/images/google/moneybag.png b/plugins/emoji/public/images/google/moneybag.png
new file mode 100644
index 0000000000..624144c107
Binary files /dev/null and b/plugins/emoji/public/images/google/moneybag.png differ
diff --git a/plugins/emoji/public/images/google/monkey.png b/plugins/emoji/public/images/google/monkey.png
new file mode 100644
index 0000000000..5da3d96195
Binary files /dev/null and b/plugins/emoji/public/images/google/monkey.png differ
diff --git a/plugins/emoji/public/images/google/monkey_face.png b/plugins/emoji/public/images/google/monkey_face.png
new file mode 100644
index 0000000000..1df92ec9e4
Binary files /dev/null and b/plugins/emoji/public/images/google/monkey_face.png differ
diff --git a/plugins/emoji/public/images/google/monorail.png b/plugins/emoji/public/images/google/monorail.png
new file mode 100644
index 0000000000..42a31555ba
Binary files /dev/null and b/plugins/emoji/public/images/google/monorail.png differ
diff --git a/plugins/emoji/public/images/google/moon.png b/plugins/emoji/public/images/google/moon.png
new file mode 100644
index 0000000000..2d161b9593
Binary files /dev/null and b/plugins/emoji/public/images/google/moon.png differ
diff --git a/plugins/emoji/public/images/google/mortar_board.png b/plugins/emoji/public/images/google/mortar_board.png
new file mode 100644
index 0000000000..b2e045a41e
Binary files /dev/null and b/plugins/emoji/public/images/google/mortar_board.png differ
diff --git a/plugins/emoji/public/images/google/mount_fuji.png b/plugins/emoji/public/images/google/mount_fuji.png
new file mode 100644
index 0000000000..deb69b662d
Binary files /dev/null and b/plugins/emoji/public/images/google/mount_fuji.png differ
diff --git a/plugins/emoji/public/images/google/mountain_bicyclist.png b/plugins/emoji/public/images/google/mountain_bicyclist.png
new file mode 100644
index 0000000000..688e5d7e16
Binary files /dev/null and b/plugins/emoji/public/images/google/mountain_bicyclist.png differ
diff --git a/plugins/emoji/public/images/google/mountain_cableway.png b/plugins/emoji/public/images/google/mountain_cableway.png
new file mode 100644
index 0000000000..6a02f5ce3f
Binary files /dev/null and b/plugins/emoji/public/images/google/mountain_cableway.png differ
diff --git a/plugins/emoji/public/images/google/mountain_railway.png b/plugins/emoji/public/images/google/mountain_railway.png
new file mode 100644
index 0000000000..8fb0e4756a
Binary files /dev/null and b/plugins/emoji/public/images/google/mountain_railway.png differ
diff --git a/plugins/emoji/public/images/google/mouse.png b/plugins/emoji/public/images/google/mouse.png
new file mode 100644
index 0000000000..49193de586
Binary files /dev/null and b/plugins/emoji/public/images/google/mouse.png differ
diff --git a/plugins/emoji/public/images/google/mouse2.png b/plugins/emoji/public/images/google/mouse2.png
new file mode 100644
index 0000000000..6a7b14163a
Binary files /dev/null and b/plugins/emoji/public/images/google/mouse2.png differ
diff --git a/plugins/emoji/public/images/google/movie_camera.png b/plugins/emoji/public/images/google/movie_camera.png
new file mode 100644
index 0000000000..e87f48d05c
Binary files /dev/null and b/plugins/emoji/public/images/google/movie_camera.png differ
diff --git a/plugins/emoji/public/images/google/moyai.png b/plugins/emoji/public/images/google/moyai.png
new file mode 100644
index 0000000000..232acacd1b
Binary files /dev/null and b/plugins/emoji/public/images/google/moyai.png differ
diff --git a/plugins/emoji/public/images/google/muscle.png b/plugins/emoji/public/images/google/muscle.png
new file mode 100644
index 0000000000..c9be2ef823
Binary files /dev/null and b/plugins/emoji/public/images/google/muscle.png differ
diff --git a/plugins/emoji/public/images/google/mushroom.png b/plugins/emoji/public/images/google/mushroom.png
new file mode 100644
index 0000000000..78c77c179e
Binary files /dev/null and b/plugins/emoji/public/images/google/mushroom.png differ
diff --git a/plugins/emoji/public/images/google/musical_keyboard.png b/plugins/emoji/public/images/google/musical_keyboard.png
new file mode 100644
index 0000000000..34688761e3
Binary files /dev/null and b/plugins/emoji/public/images/google/musical_keyboard.png differ
diff --git a/plugins/emoji/public/images/google/musical_note.png b/plugins/emoji/public/images/google/musical_note.png
new file mode 100644
index 0000000000..b050511322
Binary files /dev/null and b/plugins/emoji/public/images/google/musical_note.png differ
diff --git a/plugins/emoji/public/images/google/musical_score.png b/plugins/emoji/public/images/google/musical_score.png
new file mode 100644
index 0000000000..27563b0f21
Binary files /dev/null and b/plugins/emoji/public/images/google/musical_score.png differ
diff --git a/plugins/emoji/public/images/google/mute.png b/plugins/emoji/public/images/google/mute.png
new file mode 100644
index 0000000000..2bc220647f
Binary files /dev/null and b/plugins/emoji/public/images/google/mute.png differ
diff --git a/plugins/emoji/public/images/google/nail_care.png b/plugins/emoji/public/images/google/nail_care.png
new file mode 100644
index 0000000000..4a9b6b2b93
Binary files /dev/null and b/plugins/emoji/public/images/google/nail_care.png differ
diff --git a/plugins/emoji/public/images/google/name_badge.png b/plugins/emoji/public/images/google/name_badge.png
new file mode 100644
index 0000000000..283ca7b656
Binary files /dev/null and b/plugins/emoji/public/images/google/name_badge.png differ
diff --git a/plugins/emoji/public/images/google/necktie.png b/plugins/emoji/public/images/google/necktie.png
new file mode 100644
index 0000000000..bab6d18efc
Binary files /dev/null and b/plugins/emoji/public/images/google/necktie.png differ
diff --git a/plugins/emoji/public/images/google/negative_squared_cross_mark.png b/plugins/emoji/public/images/google/negative_squared_cross_mark.png
new file mode 100644
index 0000000000..e54dcfa6d8
Binary files /dev/null and b/plugins/emoji/public/images/google/negative_squared_cross_mark.png differ
diff --git a/plugins/emoji/public/images/google/neutral_face.png b/plugins/emoji/public/images/google/neutral_face.png
new file mode 100644
index 0000000000..b86dd16ec7
Binary files /dev/null and b/plugins/emoji/public/images/google/neutral_face.png differ
diff --git a/plugins/emoji/public/images/google/new.png b/plugins/emoji/public/images/google/new.png
new file mode 100644
index 0000000000..ef886bfc2a
Binary files /dev/null and b/plugins/emoji/public/images/google/new.png differ
diff --git a/plugins/emoji/public/images/google/new_moon.png b/plugins/emoji/public/images/google/new_moon.png
new file mode 100644
index 0000000000..d46df097f8
Binary files /dev/null and b/plugins/emoji/public/images/google/new_moon.png differ
diff --git a/plugins/emoji/public/images/google/new_moon_with_face.png b/plugins/emoji/public/images/google/new_moon_with_face.png
new file mode 100644
index 0000000000..a429c962fa
Binary files /dev/null and b/plugins/emoji/public/images/google/new_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/google/newspaper.png b/plugins/emoji/public/images/google/newspaper.png
new file mode 100644
index 0000000000..2b6c645004
Binary files /dev/null and b/plugins/emoji/public/images/google/newspaper.png differ
diff --git a/plugins/emoji/public/images/google/ng.png b/plugins/emoji/public/images/google/ng.png
new file mode 100644
index 0000000000..ce53648e30
Binary files /dev/null and b/plugins/emoji/public/images/google/ng.png differ
diff --git a/plugins/emoji/public/images/google/night_with_stars.png b/plugins/emoji/public/images/google/night_with_stars.png
new file mode 100644
index 0000000000..6dd44810af
Binary files /dev/null and b/plugins/emoji/public/images/google/night_with_stars.png differ
diff --git a/plugins/emoji/public/images/google/no_bell.png b/plugins/emoji/public/images/google/no_bell.png
new file mode 100644
index 0000000000..f871eba68e
Binary files /dev/null and b/plugins/emoji/public/images/google/no_bell.png differ
diff --git a/plugins/emoji/public/images/google/no_bicycles.png b/plugins/emoji/public/images/google/no_bicycles.png
new file mode 100644
index 0000000000..a8df6968be
Binary files /dev/null and b/plugins/emoji/public/images/google/no_bicycles.png differ
diff --git a/plugins/emoji/public/images/google/no_entry.png b/plugins/emoji/public/images/google/no_entry.png
new file mode 100644
index 0000000000..c09831ff43
Binary files /dev/null and b/plugins/emoji/public/images/google/no_entry.png differ
diff --git a/plugins/emoji/public/images/google/no_entry_sign.png b/plugins/emoji/public/images/google/no_entry_sign.png
new file mode 100644
index 0000000000..f8d4479e91
Binary files /dev/null and b/plugins/emoji/public/images/google/no_entry_sign.png differ
diff --git a/plugins/emoji/public/images/google/no_good.png b/plugins/emoji/public/images/google/no_good.png
new file mode 100644
index 0000000000..e872f0aa72
Binary files /dev/null and b/plugins/emoji/public/images/google/no_good.png differ
diff --git a/plugins/emoji/public/images/google/no_mobile_phones.png b/plugins/emoji/public/images/google/no_mobile_phones.png
new file mode 100644
index 0000000000..a737daa759
Binary files /dev/null and b/plugins/emoji/public/images/google/no_mobile_phones.png differ
diff --git a/plugins/emoji/public/images/google/no_mouth.png b/plugins/emoji/public/images/google/no_mouth.png
new file mode 100644
index 0000000000..31a67dfa43
Binary files /dev/null and b/plugins/emoji/public/images/google/no_mouth.png differ
diff --git a/plugins/emoji/public/images/google/no_pedestrians.png b/plugins/emoji/public/images/google/no_pedestrians.png
new file mode 100644
index 0000000000..661d5e74f3
Binary files /dev/null and b/plugins/emoji/public/images/google/no_pedestrians.png differ
diff --git a/plugins/emoji/public/images/google/no_smoking.png b/plugins/emoji/public/images/google/no_smoking.png
new file mode 100644
index 0000000000..c3b4491ef1
Binary files /dev/null and b/plugins/emoji/public/images/google/no_smoking.png differ
diff --git a/plugins/emoji/public/images/google/non-potable_water.png b/plugins/emoji/public/images/google/non-potable_water.png
new file mode 100644
index 0000000000..2a286056c8
Binary files /dev/null and b/plugins/emoji/public/images/google/non-potable_water.png differ
diff --git a/plugins/emoji/public/images/google/nose.png b/plugins/emoji/public/images/google/nose.png
new file mode 100644
index 0000000000..cf4ab5ddb4
Binary files /dev/null and b/plugins/emoji/public/images/google/nose.png differ
diff --git a/plugins/emoji/public/images/google/notebook.png b/plugins/emoji/public/images/google/notebook.png
new file mode 100644
index 0000000000..de1992a40a
Binary files /dev/null and b/plugins/emoji/public/images/google/notebook.png differ
diff --git a/plugins/emoji/public/images/google/notebook_with_decorative_cover.png b/plugins/emoji/public/images/google/notebook_with_decorative_cover.png
new file mode 100644
index 0000000000..d3c42043ed
Binary files /dev/null and b/plugins/emoji/public/images/google/notebook_with_decorative_cover.png differ
diff --git a/plugins/emoji/public/images/google/notes.png b/plugins/emoji/public/images/google/notes.png
new file mode 100644
index 0000000000..20acc5b400
Binary files /dev/null and b/plugins/emoji/public/images/google/notes.png differ
diff --git a/plugins/emoji/public/images/google/nut_and_bolt.png b/plugins/emoji/public/images/google/nut_and_bolt.png
new file mode 100644
index 0000000000..ef58dfd4e6
Binary files /dev/null and b/plugins/emoji/public/images/google/nut_and_bolt.png differ
diff --git a/plugins/emoji/public/images/google/o.png b/plugins/emoji/public/images/google/o.png
new file mode 100644
index 0000000000..3732057a4a
Binary files /dev/null and b/plugins/emoji/public/images/google/o.png differ
diff --git a/plugins/emoji/public/images/google/o2.png b/plugins/emoji/public/images/google/o2.png
new file mode 100644
index 0000000000..649d17b64c
Binary files /dev/null and b/plugins/emoji/public/images/google/o2.png differ
diff --git a/plugins/emoji/public/images/google/ocean.png b/plugins/emoji/public/images/google/ocean.png
new file mode 100644
index 0000000000..4ea7f5ba47
Binary files /dev/null and b/plugins/emoji/public/images/google/ocean.png differ
diff --git a/plugins/emoji/public/images/google/octopus.png b/plugins/emoji/public/images/google/octopus.png
new file mode 100644
index 0000000000..f0f67829c4
Binary files /dev/null and b/plugins/emoji/public/images/google/octopus.png differ
diff --git a/plugins/emoji/public/images/google/oden.png b/plugins/emoji/public/images/google/oden.png
new file mode 100644
index 0000000000..2726097950
Binary files /dev/null and b/plugins/emoji/public/images/google/oden.png differ
diff --git a/plugins/emoji/public/images/google/office.png b/plugins/emoji/public/images/google/office.png
new file mode 100644
index 0000000000..85f7e4438f
Binary files /dev/null and b/plugins/emoji/public/images/google/office.png differ
diff --git a/plugins/emoji/public/images/google/ok.png b/plugins/emoji/public/images/google/ok.png
new file mode 100644
index 0000000000..eb6601dcc9
Binary files /dev/null and b/plugins/emoji/public/images/google/ok.png differ
diff --git a/plugins/emoji/public/images/google/ok_hand.png b/plugins/emoji/public/images/google/ok_hand.png
new file mode 100644
index 0000000000..396abcc7ab
Binary files /dev/null and b/plugins/emoji/public/images/google/ok_hand.png differ
diff --git a/plugins/emoji/public/images/google/ok_woman.png b/plugins/emoji/public/images/google/ok_woman.png
new file mode 100644
index 0000000000..29d5e8c249
Binary files /dev/null and b/plugins/emoji/public/images/google/ok_woman.png differ
diff --git a/plugins/emoji/public/images/google/older_man.png b/plugins/emoji/public/images/google/older_man.png
new file mode 100644
index 0000000000..4af0c2d815
Binary files /dev/null and b/plugins/emoji/public/images/google/older_man.png differ
diff --git a/plugins/emoji/public/images/google/older_woman.png b/plugins/emoji/public/images/google/older_woman.png
new file mode 100644
index 0000000000..7a5aedf4b8
Binary files /dev/null and b/plugins/emoji/public/images/google/older_woman.png differ
diff --git a/plugins/emoji/public/images/google/on.png b/plugins/emoji/public/images/google/on.png
new file mode 100644
index 0000000000..6b95d1b92b
Binary files /dev/null and b/plugins/emoji/public/images/google/on.png differ
diff --git a/plugins/emoji/public/images/google/oncoming_automobile.png b/plugins/emoji/public/images/google/oncoming_automobile.png
new file mode 100644
index 0000000000..b58b1e78f5
Binary files /dev/null and b/plugins/emoji/public/images/google/oncoming_automobile.png differ
diff --git a/plugins/emoji/public/images/google/oncoming_bus.png b/plugins/emoji/public/images/google/oncoming_bus.png
new file mode 100644
index 0000000000..0f2d5b7512
Binary files /dev/null and b/plugins/emoji/public/images/google/oncoming_bus.png differ
diff --git a/plugins/emoji/public/images/google/oncoming_police_car.png b/plugins/emoji/public/images/google/oncoming_police_car.png
new file mode 100644
index 0000000000..158602e91b
Binary files /dev/null and b/plugins/emoji/public/images/google/oncoming_police_car.png differ
diff --git a/plugins/emoji/public/images/google/oncoming_taxi.png b/plugins/emoji/public/images/google/oncoming_taxi.png
new file mode 100644
index 0000000000..3ffb2a2aa0
Binary files /dev/null and b/plugins/emoji/public/images/google/oncoming_taxi.png differ
diff --git a/plugins/emoji/public/images/google/open_book.png b/plugins/emoji/public/images/google/open_book.png
new file mode 100644
index 0000000000..890304706b
Binary files /dev/null and b/plugins/emoji/public/images/google/open_book.png differ
diff --git a/plugins/emoji/public/images/google/open_file_folder.png b/plugins/emoji/public/images/google/open_file_folder.png
new file mode 100644
index 0000000000..ec8b6530f8
Binary files /dev/null and b/plugins/emoji/public/images/google/open_file_folder.png differ
diff --git a/plugins/emoji/public/images/google/open_hands.png b/plugins/emoji/public/images/google/open_hands.png
new file mode 100644
index 0000000000..b164a447cb
Binary files /dev/null and b/plugins/emoji/public/images/google/open_hands.png differ
diff --git a/plugins/emoji/public/images/google/open_mouth.png b/plugins/emoji/public/images/google/open_mouth.png
new file mode 100644
index 0000000000..8eda142c1a
Binary files /dev/null and b/plugins/emoji/public/images/google/open_mouth.png differ
diff --git a/plugins/emoji/public/images/google/ophiuchus.png b/plugins/emoji/public/images/google/ophiuchus.png
new file mode 100644
index 0000000000..5b41d45b49
Binary files /dev/null and b/plugins/emoji/public/images/google/ophiuchus.png differ
diff --git a/plugins/emoji/public/images/google/orange_book.png b/plugins/emoji/public/images/google/orange_book.png
new file mode 100644
index 0000000000..29e672987b
Binary files /dev/null and b/plugins/emoji/public/images/google/orange_book.png differ
diff --git a/plugins/emoji/public/images/google/outbox_tray.png b/plugins/emoji/public/images/google/outbox_tray.png
new file mode 100644
index 0000000000..75bd669f14
Binary files /dev/null and b/plugins/emoji/public/images/google/outbox_tray.png differ
diff --git a/plugins/emoji/public/images/google/ox.png b/plugins/emoji/public/images/google/ox.png
new file mode 100644
index 0000000000..0b778e4edc
Binary files /dev/null and b/plugins/emoji/public/images/google/ox.png differ
diff --git a/plugins/emoji/public/images/google/package.png b/plugins/emoji/public/images/google/package.png
new file mode 100644
index 0000000000..bfdc94104f
Binary files /dev/null and b/plugins/emoji/public/images/google/package.png differ
diff --git a/plugins/emoji/public/images/google/page_facing_up.png b/plugins/emoji/public/images/google/page_facing_up.png
new file mode 100644
index 0000000000..c76b8634cb
Binary files /dev/null and b/plugins/emoji/public/images/google/page_facing_up.png differ
diff --git a/plugins/emoji/public/images/google/page_with_curl.png b/plugins/emoji/public/images/google/page_with_curl.png
new file mode 100644
index 0000000000..77bba55b0d
Binary files /dev/null and b/plugins/emoji/public/images/google/page_with_curl.png differ
diff --git a/plugins/emoji/public/images/google/pager.png b/plugins/emoji/public/images/google/pager.png
new file mode 100644
index 0000000000..f2435c9ae0
Binary files /dev/null and b/plugins/emoji/public/images/google/pager.png differ
diff --git a/plugins/emoji/public/images/google/palm_tree.png b/plugins/emoji/public/images/google/palm_tree.png
new file mode 100644
index 0000000000..f5260c67a9
Binary files /dev/null and b/plugins/emoji/public/images/google/palm_tree.png differ
diff --git a/plugins/emoji/public/images/google/panda_face.png b/plugins/emoji/public/images/google/panda_face.png
new file mode 100644
index 0000000000..63c4dc121b
Binary files /dev/null and b/plugins/emoji/public/images/google/panda_face.png differ
diff --git a/plugins/emoji/public/images/google/paperclip.png b/plugins/emoji/public/images/google/paperclip.png
new file mode 100644
index 0000000000..8c40b3b964
Binary files /dev/null and b/plugins/emoji/public/images/google/paperclip.png differ
diff --git a/plugins/emoji/public/images/google/parking.png b/plugins/emoji/public/images/google/parking.png
new file mode 100644
index 0000000000..855b9aa03f
Binary files /dev/null and b/plugins/emoji/public/images/google/parking.png differ
diff --git a/plugins/emoji/public/images/google/part_alternation_mark.png b/plugins/emoji/public/images/google/part_alternation_mark.png
new file mode 100644
index 0000000000..b5f7f61b3e
Binary files /dev/null and b/plugins/emoji/public/images/google/part_alternation_mark.png differ
diff --git a/plugins/emoji/public/images/google/partly_sunny.png b/plugins/emoji/public/images/google/partly_sunny.png
new file mode 100644
index 0000000000..25c792b9f7
Binary files /dev/null and b/plugins/emoji/public/images/google/partly_sunny.png differ
diff --git a/plugins/emoji/public/images/google/passport_control.png b/plugins/emoji/public/images/google/passport_control.png
new file mode 100644
index 0000000000..c9e7b665d9
Binary files /dev/null and b/plugins/emoji/public/images/google/passport_control.png differ
diff --git a/plugins/emoji/public/images/google/paw_prints.png b/plugins/emoji/public/images/google/paw_prints.png
new file mode 100644
index 0000000000..427cf17448
Binary files /dev/null and b/plugins/emoji/public/images/google/paw_prints.png differ
diff --git a/plugins/emoji/public/images/google/peach.png b/plugins/emoji/public/images/google/peach.png
new file mode 100644
index 0000000000..d0653b20f0
Binary files /dev/null and b/plugins/emoji/public/images/google/peach.png differ
diff --git a/plugins/emoji/public/images/google/pear.png b/plugins/emoji/public/images/google/pear.png
new file mode 100644
index 0000000000..489308d8f7
Binary files /dev/null and b/plugins/emoji/public/images/google/pear.png differ
diff --git a/plugins/emoji/public/images/google/pencil.png b/plugins/emoji/public/images/google/pencil.png
new file mode 100644
index 0000000000..db2595c899
Binary files /dev/null and b/plugins/emoji/public/images/google/pencil.png differ
diff --git a/plugins/emoji/public/images/google/pencil2.png b/plugins/emoji/public/images/google/pencil2.png
new file mode 100644
index 0000000000..6b9e12e726
Binary files /dev/null and b/plugins/emoji/public/images/google/pencil2.png differ
diff --git a/plugins/emoji/public/images/google/penguin.png b/plugins/emoji/public/images/google/penguin.png
new file mode 100644
index 0000000000..7c8dfc13c4
Binary files /dev/null and b/plugins/emoji/public/images/google/penguin.png differ
diff --git a/plugins/emoji/public/images/google/pensive.png b/plugins/emoji/public/images/google/pensive.png
new file mode 100644
index 0000000000..583ea37b5d
Binary files /dev/null and b/plugins/emoji/public/images/google/pensive.png differ
diff --git a/plugins/emoji/public/images/google/performing_arts.png b/plugins/emoji/public/images/google/performing_arts.png
new file mode 100644
index 0000000000..5f54f205b3
Binary files /dev/null and b/plugins/emoji/public/images/google/performing_arts.png differ
diff --git a/plugins/emoji/public/images/google/persevere.png b/plugins/emoji/public/images/google/persevere.png
new file mode 100644
index 0000000000..4c0dd03393
Binary files /dev/null and b/plugins/emoji/public/images/google/persevere.png differ
diff --git a/plugins/emoji/public/images/google/person_frowning.png b/plugins/emoji/public/images/google/person_frowning.png
new file mode 100644
index 0000000000..dca20cb45d
Binary files /dev/null and b/plugins/emoji/public/images/google/person_frowning.png differ
diff --git a/plugins/emoji/public/images/google/person_with_blond_hair.png b/plugins/emoji/public/images/google/person_with_blond_hair.png
new file mode 100644
index 0000000000..12f34e1c86
Binary files /dev/null and b/plugins/emoji/public/images/google/person_with_blond_hair.png differ
diff --git a/plugins/emoji/public/images/google/person_with_pouting_face.png b/plugins/emoji/public/images/google/person_with_pouting_face.png
new file mode 100644
index 0000000000..9bf9b2dfc2
Binary files /dev/null and b/plugins/emoji/public/images/google/person_with_pouting_face.png differ
diff --git a/plugins/emoji/public/images/google/phone.png b/plugins/emoji/public/images/google/phone.png
new file mode 100644
index 0000000000..24e614c9c9
Binary files /dev/null and b/plugins/emoji/public/images/google/phone.png differ
diff --git a/plugins/emoji/public/images/google/pig.png b/plugins/emoji/public/images/google/pig.png
new file mode 100644
index 0000000000..d7ea308523
Binary files /dev/null and b/plugins/emoji/public/images/google/pig.png differ
diff --git a/plugins/emoji/public/images/google/pig2.png b/plugins/emoji/public/images/google/pig2.png
new file mode 100644
index 0000000000..d64fff1699
Binary files /dev/null and b/plugins/emoji/public/images/google/pig2.png differ
diff --git a/plugins/emoji/public/images/google/pig_nose.png b/plugins/emoji/public/images/google/pig_nose.png
new file mode 100644
index 0000000000..257daee1f6
Binary files /dev/null and b/plugins/emoji/public/images/google/pig_nose.png differ
diff --git a/plugins/emoji/public/images/google/pill.png b/plugins/emoji/public/images/google/pill.png
new file mode 100644
index 0000000000..a6829a5e91
Binary files /dev/null and b/plugins/emoji/public/images/google/pill.png differ
diff --git a/plugins/emoji/public/images/google/pineapple.png b/plugins/emoji/public/images/google/pineapple.png
new file mode 100644
index 0000000000..c7218d24d7
Binary files /dev/null and b/plugins/emoji/public/images/google/pineapple.png differ
diff --git a/plugins/emoji/public/images/google/pisces.png b/plugins/emoji/public/images/google/pisces.png
new file mode 100644
index 0000000000..587aebccb1
Binary files /dev/null and b/plugins/emoji/public/images/google/pisces.png differ
diff --git a/plugins/emoji/public/images/google/pizza.png b/plugins/emoji/public/images/google/pizza.png
new file mode 100644
index 0000000000..4a5da24103
Binary files /dev/null and b/plugins/emoji/public/images/google/pizza.png differ
diff --git a/plugins/emoji/public/images/google/point_down.png b/plugins/emoji/public/images/google/point_down.png
new file mode 100644
index 0000000000..518b27bc16
Binary files /dev/null and b/plugins/emoji/public/images/google/point_down.png differ
diff --git a/plugins/emoji/public/images/google/point_left.png b/plugins/emoji/public/images/google/point_left.png
new file mode 100644
index 0000000000..f57463f7f4
Binary files /dev/null and b/plugins/emoji/public/images/google/point_left.png differ
diff --git a/plugins/emoji/public/images/google/point_right.png b/plugins/emoji/public/images/google/point_right.png
new file mode 100644
index 0000000000..baacdf77d1
Binary files /dev/null and b/plugins/emoji/public/images/google/point_right.png differ
diff --git a/plugins/emoji/public/images/google/point_up.png b/plugins/emoji/public/images/google/point_up.png
new file mode 100644
index 0000000000..6a8f02cc3d
Binary files /dev/null and b/plugins/emoji/public/images/google/point_up.png differ
diff --git a/plugins/emoji/public/images/google/point_up_2.png b/plugins/emoji/public/images/google/point_up_2.png
new file mode 100644
index 0000000000..32f0e3a9d6
Binary files /dev/null and b/plugins/emoji/public/images/google/point_up_2.png differ
diff --git a/plugins/emoji/public/images/google/police_car.png b/plugins/emoji/public/images/google/police_car.png
new file mode 100644
index 0000000000..8cf1062b42
Binary files /dev/null and b/plugins/emoji/public/images/google/police_car.png differ
diff --git a/plugins/emoji/public/images/google/poodle.png b/plugins/emoji/public/images/google/poodle.png
new file mode 100644
index 0000000000..835859647f
Binary files /dev/null and b/plugins/emoji/public/images/google/poodle.png differ
diff --git a/plugins/emoji/public/images/google/poop.png b/plugins/emoji/public/images/google/poop.png
new file mode 100644
index 0000000000..2aacba589e
Binary files /dev/null and b/plugins/emoji/public/images/google/poop.png differ
diff --git a/plugins/emoji/public/images/google/post_office.png b/plugins/emoji/public/images/google/post_office.png
new file mode 100644
index 0000000000..682ad47192
Binary files /dev/null and b/plugins/emoji/public/images/google/post_office.png differ
diff --git a/plugins/emoji/public/images/google/postal_horn.png b/plugins/emoji/public/images/google/postal_horn.png
new file mode 100644
index 0000000000..5ba027918a
Binary files /dev/null and b/plugins/emoji/public/images/google/postal_horn.png differ
diff --git a/plugins/emoji/public/images/google/postbox.png b/plugins/emoji/public/images/google/postbox.png
new file mode 100644
index 0000000000..ca370e3120
Binary files /dev/null and b/plugins/emoji/public/images/google/postbox.png differ
diff --git a/plugins/emoji/public/images/google/potable_water.png b/plugins/emoji/public/images/google/potable_water.png
new file mode 100644
index 0000000000..b318aa6f2d
Binary files /dev/null and b/plugins/emoji/public/images/google/potable_water.png differ
diff --git a/plugins/emoji/public/images/google/pouch.png b/plugins/emoji/public/images/google/pouch.png
new file mode 100644
index 0000000000..4ae522d83e
Binary files /dev/null and b/plugins/emoji/public/images/google/pouch.png differ
diff --git a/plugins/emoji/public/images/google/poultry_leg.png b/plugins/emoji/public/images/google/poultry_leg.png
new file mode 100644
index 0000000000..931e32f10d
Binary files /dev/null and b/plugins/emoji/public/images/google/poultry_leg.png differ
diff --git a/plugins/emoji/public/images/google/pound.png b/plugins/emoji/public/images/google/pound.png
new file mode 100644
index 0000000000..f108b938e2
Binary files /dev/null and b/plugins/emoji/public/images/google/pound.png differ
diff --git a/plugins/emoji/public/images/google/pouting_cat.png b/plugins/emoji/public/images/google/pouting_cat.png
new file mode 100644
index 0000000000..08003db04b
Binary files /dev/null and b/plugins/emoji/public/images/google/pouting_cat.png differ
diff --git a/plugins/emoji/public/images/google/pray.png b/plugins/emoji/public/images/google/pray.png
new file mode 100644
index 0000000000..0e42773a40
Binary files /dev/null and b/plugins/emoji/public/images/google/pray.png differ
diff --git a/plugins/emoji/public/images/google/princess.png b/plugins/emoji/public/images/google/princess.png
new file mode 100644
index 0000000000..aa5f0248ad
Binary files /dev/null and b/plugins/emoji/public/images/google/princess.png differ
diff --git a/plugins/emoji/public/images/google/punch.png b/plugins/emoji/public/images/google/punch.png
new file mode 100644
index 0000000000..e8d59e8932
Binary files /dev/null and b/plugins/emoji/public/images/google/punch.png differ
diff --git a/plugins/emoji/public/images/google/purple_heart.png b/plugins/emoji/public/images/google/purple_heart.png
new file mode 100644
index 0000000000..dfc6180240
Binary files /dev/null and b/plugins/emoji/public/images/google/purple_heart.png differ
diff --git a/plugins/emoji/public/images/google/purse.png b/plugins/emoji/public/images/google/purse.png
new file mode 100644
index 0000000000..98e642c7a9
Binary files /dev/null and b/plugins/emoji/public/images/google/purse.png differ
diff --git a/plugins/emoji/public/images/google/pushpin.png b/plugins/emoji/public/images/google/pushpin.png
new file mode 100644
index 0000000000..e2e71f3bd8
Binary files /dev/null and b/plugins/emoji/public/images/google/pushpin.png differ
diff --git a/plugins/emoji/public/images/google/put_litter_in_its_place.png b/plugins/emoji/public/images/google/put_litter_in_its_place.png
new file mode 100644
index 0000000000..ab314b02a1
Binary files /dev/null and b/plugins/emoji/public/images/google/put_litter_in_its_place.png differ
diff --git a/plugins/emoji/public/images/google/question.png b/plugins/emoji/public/images/google/question.png
new file mode 100644
index 0000000000..4074b0d0c3
Binary files /dev/null and b/plugins/emoji/public/images/google/question.png differ
diff --git a/plugins/emoji/public/images/google/rabbit.png b/plugins/emoji/public/images/google/rabbit.png
new file mode 100644
index 0000000000..a81c6fc8b9
Binary files /dev/null and b/plugins/emoji/public/images/google/rabbit.png differ
diff --git a/plugins/emoji/public/images/google/rabbit2.png b/plugins/emoji/public/images/google/rabbit2.png
new file mode 100644
index 0000000000..00ffe9dd10
Binary files /dev/null and b/plugins/emoji/public/images/google/rabbit2.png differ
diff --git a/plugins/emoji/public/images/google/racehorse.png b/plugins/emoji/public/images/google/racehorse.png
new file mode 100644
index 0000000000..9029b8ae99
Binary files /dev/null and b/plugins/emoji/public/images/google/racehorse.png differ
diff --git a/plugins/emoji/public/images/google/radio.png b/plugins/emoji/public/images/google/radio.png
new file mode 100644
index 0000000000..b03393f8c8
Binary files /dev/null and b/plugins/emoji/public/images/google/radio.png differ
diff --git a/plugins/emoji/public/images/google/radio_button.png b/plugins/emoji/public/images/google/radio_button.png
new file mode 100644
index 0000000000..4d2e27fca0
Binary files /dev/null and b/plugins/emoji/public/images/google/radio_button.png differ
diff --git a/plugins/emoji/public/images/google/rage.png b/plugins/emoji/public/images/google/rage.png
new file mode 100644
index 0000000000..a0799a822f
Binary files /dev/null and b/plugins/emoji/public/images/google/rage.png differ
diff --git a/plugins/emoji/public/images/google/railway_car.png b/plugins/emoji/public/images/google/railway_car.png
new file mode 100644
index 0000000000..e7fb497f16
Binary files /dev/null and b/plugins/emoji/public/images/google/railway_car.png differ
diff --git a/plugins/emoji/public/images/google/rainbow.png b/plugins/emoji/public/images/google/rainbow.png
new file mode 100644
index 0000000000..dff6eaffdf
Binary files /dev/null and b/plugins/emoji/public/images/google/rainbow.png differ
diff --git a/plugins/emoji/public/images/google/raised_hand.png b/plugins/emoji/public/images/google/raised_hand.png
new file mode 100644
index 0000000000..beb6c8b91e
Binary files /dev/null and b/plugins/emoji/public/images/google/raised_hand.png differ
diff --git a/plugins/emoji/public/images/google/raised_hands.png b/plugins/emoji/public/images/google/raised_hands.png
new file mode 100644
index 0000000000..0d25c8d6e7
Binary files /dev/null and b/plugins/emoji/public/images/google/raised_hands.png differ
diff --git a/plugins/emoji/public/images/google/raising_hand.png b/plugins/emoji/public/images/google/raising_hand.png
new file mode 100644
index 0000000000..88fbd18eaf
Binary files /dev/null and b/plugins/emoji/public/images/google/raising_hand.png differ
diff --git a/plugins/emoji/public/images/google/ram.png b/plugins/emoji/public/images/google/ram.png
new file mode 100644
index 0000000000..610b454d07
Binary files /dev/null and b/plugins/emoji/public/images/google/ram.png differ
diff --git a/plugins/emoji/public/images/google/ramen.png b/plugins/emoji/public/images/google/ramen.png
new file mode 100644
index 0000000000..ff8703c318
Binary files /dev/null and b/plugins/emoji/public/images/google/ramen.png differ
diff --git a/plugins/emoji/public/images/google/rat.png b/plugins/emoji/public/images/google/rat.png
new file mode 100644
index 0000000000..092a867be6
Binary files /dev/null and b/plugins/emoji/public/images/google/rat.png differ
diff --git a/plugins/emoji/public/images/google/recycle.png b/plugins/emoji/public/images/google/recycle.png
new file mode 100644
index 0000000000..7e0f7873bb
Binary files /dev/null and b/plugins/emoji/public/images/google/recycle.png differ
diff --git a/plugins/emoji/public/images/google/red_car.png b/plugins/emoji/public/images/google/red_car.png
new file mode 100644
index 0000000000..a97442b445
Binary files /dev/null and b/plugins/emoji/public/images/google/red_car.png differ
diff --git a/plugins/emoji/public/images/google/red_circle.png b/plugins/emoji/public/images/google/red_circle.png
new file mode 100644
index 0000000000..45ca8802c3
Binary files /dev/null and b/plugins/emoji/public/images/google/red_circle.png differ
diff --git a/plugins/emoji/public/images/google/registered.png b/plugins/emoji/public/images/google/registered.png
new file mode 100644
index 0000000000..da81982071
Binary files /dev/null and b/plugins/emoji/public/images/google/registered.png differ
diff --git a/plugins/emoji/public/images/google/relaxed.png b/plugins/emoji/public/images/google/relaxed.png
new file mode 100644
index 0000000000..4e57f758d2
Binary files /dev/null and b/plugins/emoji/public/images/google/relaxed.png differ
diff --git a/plugins/emoji/public/images/google/relieved.png b/plugins/emoji/public/images/google/relieved.png
new file mode 100644
index 0000000000..99cb0dd545
Binary files /dev/null and b/plugins/emoji/public/images/google/relieved.png differ
diff --git a/plugins/emoji/public/images/google/repeat.png b/plugins/emoji/public/images/google/repeat.png
new file mode 100644
index 0000000000..2d66933222
Binary files /dev/null and b/plugins/emoji/public/images/google/repeat.png differ
diff --git a/plugins/emoji/public/images/google/repeat_one.png b/plugins/emoji/public/images/google/repeat_one.png
new file mode 100644
index 0000000000..a9e868bb97
Binary files /dev/null and b/plugins/emoji/public/images/google/repeat_one.png differ
diff --git a/plugins/emoji/public/images/google/restroom.png b/plugins/emoji/public/images/google/restroom.png
new file mode 100644
index 0000000000..0419efd110
Binary files /dev/null and b/plugins/emoji/public/images/google/restroom.png differ
diff --git a/plugins/emoji/public/images/google/revolving_hearts.png b/plugins/emoji/public/images/google/revolving_hearts.png
new file mode 100644
index 0000000000..226c83ca04
Binary files /dev/null and b/plugins/emoji/public/images/google/revolving_hearts.png differ
diff --git a/plugins/emoji/public/images/google/rewind.png b/plugins/emoji/public/images/google/rewind.png
new file mode 100644
index 0000000000..462d84d0b2
Binary files /dev/null and b/plugins/emoji/public/images/google/rewind.png differ
diff --git a/plugins/emoji/public/images/google/ribbon.png b/plugins/emoji/public/images/google/ribbon.png
new file mode 100644
index 0000000000..e626fa382c
Binary files /dev/null and b/plugins/emoji/public/images/google/ribbon.png differ
diff --git a/plugins/emoji/public/images/google/rice.png b/plugins/emoji/public/images/google/rice.png
new file mode 100644
index 0000000000..8bd1fea405
Binary files /dev/null and b/plugins/emoji/public/images/google/rice.png differ
diff --git a/plugins/emoji/public/images/google/rice_ball.png b/plugins/emoji/public/images/google/rice_ball.png
new file mode 100644
index 0000000000..46bd5286b3
Binary files /dev/null and b/plugins/emoji/public/images/google/rice_ball.png differ
diff --git a/plugins/emoji/public/images/google/rice_cracker.png b/plugins/emoji/public/images/google/rice_cracker.png
new file mode 100644
index 0000000000..f0c9c5746c
Binary files /dev/null and b/plugins/emoji/public/images/google/rice_cracker.png differ
diff --git a/plugins/emoji/public/images/google/rice_scene.png b/plugins/emoji/public/images/google/rice_scene.png
new file mode 100644
index 0000000000..04951b5887
Binary files /dev/null and b/plugins/emoji/public/images/google/rice_scene.png differ
diff --git a/plugins/emoji/public/images/google/ring.png b/plugins/emoji/public/images/google/ring.png
new file mode 100644
index 0000000000..54d8189d5f
Binary files /dev/null and b/plugins/emoji/public/images/google/ring.png differ
diff --git a/plugins/emoji/public/images/google/rocket.png b/plugins/emoji/public/images/google/rocket.png
new file mode 100644
index 0000000000..6085906e75
Binary files /dev/null and b/plugins/emoji/public/images/google/rocket.png differ
diff --git a/plugins/emoji/public/images/google/roller_coaster.png b/plugins/emoji/public/images/google/roller_coaster.png
new file mode 100644
index 0000000000..083ada5830
Binary files /dev/null and b/plugins/emoji/public/images/google/roller_coaster.png differ
diff --git a/plugins/emoji/public/images/google/rooster.png b/plugins/emoji/public/images/google/rooster.png
new file mode 100644
index 0000000000..b3125a3714
Binary files /dev/null and b/plugins/emoji/public/images/google/rooster.png differ
diff --git a/plugins/emoji/public/images/google/rose.png b/plugins/emoji/public/images/google/rose.png
new file mode 100644
index 0000000000..fa5d483eb5
Binary files /dev/null and b/plugins/emoji/public/images/google/rose.png differ
diff --git a/plugins/emoji/public/images/google/rotating_light.png b/plugins/emoji/public/images/google/rotating_light.png
new file mode 100644
index 0000000000..5335d68926
Binary files /dev/null and b/plugins/emoji/public/images/google/rotating_light.png differ
diff --git a/plugins/emoji/public/images/google/round_pushpin.png b/plugins/emoji/public/images/google/round_pushpin.png
new file mode 100644
index 0000000000..600521ba86
Binary files /dev/null and b/plugins/emoji/public/images/google/round_pushpin.png differ
diff --git a/plugins/emoji/public/images/google/rowboat.png b/plugins/emoji/public/images/google/rowboat.png
new file mode 100644
index 0000000000..6d470bc4b6
Binary files /dev/null and b/plugins/emoji/public/images/google/rowboat.png differ
diff --git a/plugins/emoji/public/images/google/ru.png b/plugins/emoji/public/images/google/ru.png
new file mode 100644
index 0000000000..788639fe8d
Binary files /dev/null and b/plugins/emoji/public/images/google/ru.png differ
diff --git a/plugins/emoji/public/images/google/rugby_football.png b/plugins/emoji/public/images/google/rugby_football.png
new file mode 100644
index 0000000000..e3c286db98
Binary files /dev/null and b/plugins/emoji/public/images/google/rugby_football.png differ
diff --git a/plugins/emoji/public/images/google/runner.png b/plugins/emoji/public/images/google/runner.png
new file mode 100644
index 0000000000..d85348e5cf
Binary files /dev/null and b/plugins/emoji/public/images/google/runner.png differ
diff --git a/plugins/emoji/public/images/google/running.png b/plugins/emoji/public/images/google/running.png
new file mode 100644
index 0000000000..d85348e5cf
Binary files /dev/null and b/plugins/emoji/public/images/google/running.png differ
diff --git a/plugins/emoji/public/images/google/running_shirt_with_sash.png b/plugins/emoji/public/images/google/running_shirt_with_sash.png
new file mode 100644
index 0000000000..3cd2441eba
Binary files /dev/null and b/plugins/emoji/public/images/google/running_shirt_with_sash.png differ
diff --git a/plugins/emoji/public/images/google/sa.png b/plugins/emoji/public/images/google/sa.png
new file mode 100644
index 0000000000..fd5cc1e58f
Binary files /dev/null and b/plugins/emoji/public/images/google/sa.png differ
diff --git a/plugins/emoji/public/images/google/sagittarius.png b/plugins/emoji/public/images/google/sagittarius.png
new file mode 100644
index 0000000000..d149f4fb32
Binary files /dev/null and b/plugins/emoji/public/images/google/sagittarius.png differ
diff --git a/plugins/emoji/public/images/google/sailboat.png b/plugins/emoji/public/images/google/sailboat.png
new file mode 100644
index 0000000000..b4142fe1ec
Binary files /dev/null and b/plugins/emoji/public/images/google/sailboat.png differ
diff --git a/plugins/emoji/public/images/google/sake.png b/plugins/emoji/public/images/google/sake.png
new file mode 100644
index 0000000000..4da652165d
Binary files /dev/null and b/plugins/emoji/public/images/google/sake.png differ
diff --git a/plugins/emoji/public/images/google/sandal.png b/plugins/emoji/public/images/google/sandal.png
new file mode 100644
index 0000000000..4b179f00a5
Binary files /dev/null and b/plugins/emoji/public/images/google/sandal.png differ
diff --git a/plugins/emoji/public/images/google/santa.png b/plugins/emoji/public/images/google/santa.png
new file mode 100644
index 0000000000..1b919be400
Binary files /dev/null and b/plugins/emoji/public/images/google/santa.png differ
diff --git a/plugins/emoji/public/images/google/satellite.png b/plugins/emoji/public/images/google/satellite.png
new file mode 100644
index 0000000000..ae29dafb51
Binary files /dev/null and b/plugins/emoji/public/images/google/satellite.png differ
diff --git a/plugins/emoji/public/images/google/satisfied.png b/plugins/emoji/public/images/google/satisfied.png
new file mode 100644
index 0000000000..ef6e2d643d
Binary files /dev/null and b/plugins/emoji/public/images/google/satisfied.png differ
diff --git a/plugins/emoji/public/images/google/saxophone.png b/plugins/emoji/public/images/google/saxophone.png
new file mode 100644
index 0000000000..dde26c6f48
Binary files /dev/null and b/plugins/emoji/public/images/google/saxophone.png differ
diff --git a/plugins/emoji/public/images/google/school.png b/plugins/emoji/public/images/google/school.png
new file mode 100644
index 0000000000..c4221ee2c6
Binary files /dev/null and b/plugins/emoji/public/images/google/school.png differ
diff --git a/plugins/emoji/public/images/google/school_satchel.png b/plugins/emoji/public/images/google/school_satchel.png
new file mode 100644
index 0000000000..e91f4183be
Binary files /dev/null and b/plugins/emoji/public/images/google/school_satchel.png differ
diff --git a/plugins/emoji/public/images/google/scissors.png b/plugins/emoji/public/images/google/scissors.png
new file mode 100644
index 0000000000..a4499d5d39
Binary files /dev/null and b/plugins/emoji/public/images/google/scissors.png differ
diff --git a/plugins/emoji/public/images/google/scorpius.png b/plugins/emoji/public/images/google/scorpius.png
new file mode 100644
index 0000000000..08068c974b
Binary files /dev/null and b/plugins/emoji/public/images/google/scorpius.png differ
diff --git a/plugins/emoji/public/images/google/scream.png b/plugins/emoji/public/images/google/scream.png
new file mode 100644
index 0000000000..b1883bfe16
Binary files /dev/null and b/plugins/emoji/public/images/google/scream.png differ
diff --git a/plugins/emoji/public/images/google/scream_cat.png b/plugins/emoji/public/images/google/scream_cat.png
new file mode 100644
index 0000000000..486febd892
Binary files /dev/null and b/plugins/emoji/public/images/google/scream_cat.png differ
diff --git a/plugins/emoji/public/images/google/scroll.png b/plugins/emoji/public/images/google/scroll.png
new file mode 100644
index 0000000000..674fbcbbe0
Binary files /dev/null and b/plugins/emoji/public/images/google/scroll.png differ
diff --git a/plugins/emoji/public/images/google/seat.png b/plugins/emoji/public/images/google/seat.png
new file mode 100644
index 0000000000..e96832a5b6
Binary files /dev/null and b/plugins/emoji/public/images/google/seat.png differ
diff --git a/plugins/emoji/public/images/google/secret.png b/plugins/emoji/public/images/google/secret.png
new file mode 100644
index 0000000000..a8456d8ba3
Binary files /dev/null and b/plugins/emoji/public/images/google/secret.png differ
diff --git a/plugins/emoji/public/images/google/see_no_evil.png b/plugins/emoji/public/images/google/see_no_evil.png
new file mode 100644
index 0000000000..f6e00e95b5
Binary files /dev/null and b/plugins/emoji/public/images/google/see_no_evil.png differ
diff --git a/plugins/emoji/public/images/google/seedling.png b/plugins/emoji/public/images/google/seedling.png
new file mode 100644
index 0000000000..1c780d91d6
Binary files /dev/null and b/plugins/emoji/public/images/google/seedling.png differ
diff --git a/plugins/emoji/public/images/google/shaved_ice.png b/plugins/emoji/public/images/google/shaved_ice.png
new file mode 100644
index 0000000000..3d5f3ce8a4
Binary files /dev/null and b/plugins/emoji/public/images/google/shaved_ice.png differ
diff --git a/plugins/emoji/public/images/google/sheep.png b/plugins/emoji/public/images/google/sheep.png
new file mode 100644
index 0000000000..a9298fcc2c
Binary files /dev/null and b/plugins/emoji/public/images/google/sheep.png differ
diff --git a/plugins/emoji/public/images/google/shell.png b/plugins/emoji/public/images/google/shell.png
new file mode 100644
index 0000000000..3c5bd9cb29
Binary files /dev/null and b/plugins/emoji/public/images/google/shell.png differ
diff --git a/plugins/emoji/public/images/google/ship.png b/plugins/emoji/public/images/google/ship.png
new file mode 100644
index 0000000000..2daa142bbd
Binary files /dev/null and b/plugins/emoji/public/images/google/ship.png differ
diff --git a/plugins/emoji/public/images/google/shirt.png b/plugins/emoji/public/images/google/shirt.png
new file mode 100644
index 0000000000..484cb70e01
Binary files /dev/null and b/plugins/emoji/public/images/google/shirt.png differ
diff --git a/plugins/emoji/public/images/google/shit.png b/plugins/emoji/public/images/google/shit.png
new file mode 100644
index 0000000000..2aacba589e
Binary files /dev/null and b/plugins/emoji/public/images/google/shit.png differ
diff --git a/plugins/emoji/public/images/google/shoe.png b/plugins/emoji/public/images/google/shoe.png
new file mode 100644
index 0000000000..34341146f2
Binary files /dev/null and b/plugins/emoji/public/images/google/shoe.png differ
diff --git a/plugins/emoji/public/images/google/shower.png b/plugins/emoji/public/images/google/shower.png
new file mode 100644
index 0000000000..3a60c263d6
Binary files /dev/null and b/plugins/emoji/public/images/google/shower.png differ
diff --git a/plugins/emoji/public/images/google/signal_strength.png b/plugins/emoji/public/images/google/signal_strength.png
new file mode 100644
index 0000000000..fefbfa13f6
Binary files /dev/null and b/plugins/emoji/public/images/google/signal_strength.png differ
diff --git a/plugins/emoji/public/images/google/six_pointed_star.png b/plugins/emoji/public/images/google/six_pointed_star.png
new file mode 100644
index 0000000000..17746fbea0
Binary files /dev/null and b/plugins/emoji/public/images/google/six_pointed_star.png differ
diff --git a/plugins/emoji/public/images/google/ski.png b/plugins/emoji/public/images/google/ski.png
new file mode 100644
index 0000000000..d794cfe9a9
Binary files /dev/null and b/plugins/emoji/public/images/google/ski.png differ
diff --git a/plugins/emoji/public/images/google/skull.png b/plugins/emoji/public/images/google/skull.png
new file mode 100644
index 0000000000..2633ade37b
Binary files /dev/null and b/plugins/emoji/public/images/google/skull.png differ
diff --git a/plugins/emoji/public/images/google/sleeping.png b/plugins/emoji/public/images/google/sleeping.png
new file mode 100644
index 0000000000..29d7d382c1
Binary files /dev/null and b/plugins/emoji/public/images/google/sleeping.png differ
diff --git a/plugins/emoji/public/images/google/sleepy.png b/plugins/emoji/public/images/google/sleepy.png
new file mode 100644
index 0000000000..468f94abb9
Binary files /dev/null and b/plugins/emoji/public/images/google/sleepy.png differ
diff --git a/plugins/emoji/public/images/google/slot_machine.png b/plugins/emoji/public/images/google/slot_machine.png
new file mode 100644
index 0000000000..55ee9c5f14
Binary files /dev/null and b/plugins/emoji/public/images/google/slot_machine.png differ
diff --git a/plugins/emoji/public/images/google/small_blue_diamond.png b/plugins/emoji/public/images/google/small_blue_diamond.png
new file mode 100644
index 0000000000..38782329cd
Binary files /dev/null and b/plugins/emoji/public/images/google/small_blue_diamond.png differ
diff --git a/plugins/emoji/public/images/google/small_orange_diamond.png b/plugins/emoji/public/images/google/small_orange_diamond.png
new file mode 100644
index 0000000000..b712f0da05
Binary files /dev/null and b/plugins/emoji/public/images/google/small_orange_diamond.png differ
diff --git a/plugins/emoji/public/images/google/small_red_triangle.png b/plugins/emoji/public/images/google/small_red_triangle.png
new file mode 100644
index 0000000000..fdd4c92786
Binary files /dev/null and b/plugins/emoji/public/images/google/small_red_triangle.png differ
diff --git a/plugins/emoji/public/images/google/small_red_triangle_down.png b/plugins/emoji/public/images/google/small_red_triangle_down.png
new file mode 100644
index 0000000000..7fa230f9ea
Binary files /dev/null and b/plugins/emoji/public/images/google/small_red_triangle_down.png differ
diff --git a/plugins/emoji/public/images/google/smile.png b/plugins/emoji/public/images/google/smile.png
new file mode 100644
index 0000000000..fa3ce2bfcd
Binary files /dev/null and b/plugins/emoji/public/images/google/smile.png differ
diff --git a/plugins/emoji/public/images/google/smile_cat.png b/plugins/emoji/public/images/google/smile_cat.png
new file mode 100644
index 0000000000..9198ddf8f2
Binary files /dev/null and b/plugins/emoji/public/images/google/smile_cat.png differ
diff --git a/plugins/emoji/public/images/google/smiley.png b/plugins/emoji/public/images/google/smiley.png
new file mode 100644
index 0000000000..d078fc0b8b
Binary files /dev/null and b/plugins/emoji/public/images/google/smiley.png differ
diff --git a/plugins/emoji/public/images/google/smiley_cat.png b/plugins/emoji/public/images/google/smiley_cat.png
new file mode 100644
index 0000000000..5a181ef14e
Binary files /dev/null and b/plugins/emoji/public/images/google/smiley_cat.png differ
diff --git a/plugins/emoji/public/images/google/smiling_imp.png b/plugins/emoji/public/images/google/smiling_imp.png
new file mode 100644
index 0000000000..ec8827f87f
Binary files /dev/null and b/plugins/emoji/public/images/google/smiling_imp.png differ
diff --git a/plugins/emoji/public/images/google/smirk.png b/plugins/emoji/public/images/google/smirk.png
new file mode 100644
index 0000000000..f40f5c2477
Binary files /dev/null and b/plugins/emoji/public/images/google/smirk.png differ
diff --git a/plugins/emoji/public/images/google/smirk_cat.png b/plugins/emoji/public/images/google/smirk_cat.png
new file mode 100644
index 0000000000..ccbe15544c
Binary files /dev/null and b/plugins/emoji/public/images/google/smirk_cat.png differ
diff --git a/plugins/emoji/public/images/google/smoking.png b/plugins/emoji/public/images/google/smoking.png
new file mode 100644
index 0000000000..711997e3ae
Binary files /dev/null and b/plugins/emoji/public/images/google/smoking.png differ
diff --git a/plugins/emoji/public/images/google/snail.png b/plugins/emoji/public/images/google/snail.png
new file mode 100644
index 0000000000..a4a8ceba83
Binary files /dev/null and b/plugins/emoji/public/images/google/snail.png differ
diff --git a/plugins/emoji/public/images/google/snake.png b/plugins/emoji/public/images/google/snake.png
new file mode 100644
index 0000000000..b812fe1d31
Binary files /dev/null and b/plugins/emoji/public/images/google/snake.png differ
diff --git a/plugins/emoji/public/images/google/snowboarder.png b/plugins/emoji/public/images/google/snowboarder.png
new file mode 100644
index 0000000000..3e4a3b3346
Binary files /dev/null and b/plugins/emoji/public/images/google/snowboarder.png differ
diff --git a/plugins/emoji/public/images/google/snowflake.png b/plugins/emoji/public/images/google/snowflake.png
new file mode 100644
index 0000000000..0673d37b2a
Binary files /dev/null and b/plugins/emoji/public/images/google/snowflake.png differ
diff --git a/plugins/emoji/public/images/google/snowman.png b/plugins/emoji/public/images/google/snowman.png
new file mode 100644
index 0000000000..0ea394a2be
Binary files /dev/null and b/plugins/emoji/public/images/google/snowman.png differ
diff --git a/plugins/emoji/public/images/google/sob.png b/plugins/emoji/public/images/google/sob.png
new file mode 100644
index 0000000000..bb18e4f754
Binary files /dev/null and b/plugins/emoji/public/images/google/sob.png differ
diff --git a/plugins/emoji/public/images/google/soccer.png b/plugins/emoji/public/images/google/soccer.png
new file mode 100644
index 0000000000..39817b8cb9
Binary files /dev/null and b/plugins/emoji/public/images/google/soccer.png differ
diff --git a/plugins/emoji/public/images/google/soon.png b/plugins/emoji/public/images/google/soon.png
new file mode 100644
index 0000000000..31ec2acc20
Binary files /dev/null and b/plugins/emoji/public/images/google/soon.png differ
diff --git a/plugins/emoji/public/images/google/sos.png b/plugins/emoji/public/images/google/sos.png
new file mode 100644
index 0000000000..e942466530
Binary files /dev/null and b/plugins/emoji/public/images/google/sos.png differ
diff --git a/plugins/emoji/public/images/google/sound.png b/plugins/emoji/public/images/google/sound.png
new file mode 100644
index 0000000000..09416feabf
Binary files /dev/null and b/plugins/emoji/public/images/google/sound.png differ
diff --git a/plugins/emoji/public/images/google/space_invader.png b/plugins/emoji/public/images/google/space_invader.png
new file mode 100644
index 0000000000..aee7bc9142
Binary files /dev/null and b/plugins/emoji/public/images/google/space_invader.png differ
diff --git a/plugins/emoji/public/images/google/spades.png b/plugins/emoji/public/images/google/spades.png
new file mode 100644
index 0000000000..4529ec3d3b
Binary files /dev/null and b/plugins/emoji/public/images/google/spades.png differ
diff --git a/plugins/emoji/public/images/google/spaghetti.png b/plugins/emoji/public/images/google/spaghetti.png
new file mode 100644
index 0000000000..df54d0cca7
Binary files /dev/null and b/plugins/emoji/public/images/google/spaghetti.png differ
diff --git a/plugins/emoji/public/images/google/sparkle.png b/plugins/emoji/public/images/google/sparkle.png
new file mode 100644
index 0000000000..aee83312c4
Binary files /dev/null and b/plugins/emoji/public/images/google/sparkle.png differ
diff --git a/plugins/emoji/public/images/google/sparkler.png b/plugins/emoji/public/images/google/sparkler.png
new file mode 100644
index 0000000000..7708d65829
Binary files /dev/null and b/plugins/emoji/public/images/google/sparkler.png differ
diff --git a/plugins/emoji/public/images/google/sparkles.png b/plugins/emoji/public/images/google/sparkles.png
new file mode 100644
index 0000000000..27fa5a7291
Binary files /dev/null and b/plugins/emoji/public/images/google/sparkles.png differ
diff --git a/plugins/emoji/public/images/google/sparkling_heart.png b/plugins/emoji/public/images/google/sparkling_heart.png
new file mode 100644
index 0000000000..1eab87281e
Binary files /dev/null and b/plugins/emoji/public/images/google/sparkling_heart.png differ
diff --git a/plugins/emoji/public/images/google/speak_no_evil.png b/plugins/emoji/public/images/google/speak_no_evil.png
new file mode 100644
index 0000000000..ba80bfd3c7
Binary files /dev/null and b/plugins/emoji/public/images/google/speak_no_evil.png differ
diff --git a/plugins/emoji/public/images/google/speech_balloon.png b/plugins/emoji/public/images/google/speech_balloon.png
new file mode 100644
index 0000000000..a27e4e4453
Binary files /dev/null and b/plugins/emoji/public/images/google/speech_balloon.png differ
diff --git a/plugins/emoji/public/images/google/speedboat.png b/plugins/emoji/public/images/google/speedboat.png
new file mode 100644
index 0000000000..104abe88fa
Binary files /dev/null and b/plugins/emoji/public/images/google/speedboat.png differ
diff --git a/plugins/emoji/public/images/google/star.png b/plugins/emoji/public/images/google/star.png
new file mode 100644
index 0000000000..95079a0f17
Binary files /dev/null and b/plugins/emoji/public/images/google/star.png differ
diff --git a/plugins/emoji/public/images/google/star2.png b/plugins/emoji/public/images/google/star2.png
new file mode 100644
index 0000000000..2e56e35541
Binary files /dev/null and b/plugins/emoji/public/images/google/star2.png differ
diff --git a/plugins/emoji/public/images/google/stars.png b/plugins/emoji/public/images/google/stars.png
new file mode 100644
index 0000000000..befc7dbdf7
Binary files /dev/null and b/plugins/emoji/public/images/google/stars.png differ
diff --git a/plugins/emoji/public/images/google/station.png b/plugins/emoji/public/images/google/station.png
new file mode 100644
index 0000000000..1937a8e2fc
Binary files /dev/null and b/plugins/emoji/public/images/google/station.png differ
diff --git a/plugins/emoji/public/images/google/statue_of_liberty.png b/plugins/emoji/public/images/google/statue_of_liberty.png
new file mode 100644
index 0000000000..bafaf556fc
Binary files /dev/null and b/plugins/emoji/public/images/google/statue_of_liberty.png differ
diff --git a/plugins/emoji/public/images/google/steam_locomotive.png b/plugins/emoji/public/images/google/steam_locomotive.png
new file mode 100644
index 0000000000..b6cca56aa7
Binary files /dev/null and b/plugins/emoji/public/images/google/steam_locomotive.png differ
diff --git a/plugins/emoji/public/images/google/stew.png b/plugins/emoji/public/images/google/stew.png
new file mode 100644
index 0000000000..c698aaf45e
Binary files /dev/null and b/plugins/emoji/public/images/google/stew.png differ
diff --git a/plugins/emoji/public/images/google/straight_ruler.png b/plugins/emoji/public/images/google/straight_ruler.png
new file mode 100644
index 0000000000..ca485102a3
Binary files /dev/null and b/plugins/emoji/public/images/google/straight_ruler.png differ
diff --git a/plugins/emoji/public/images/google/strawberry.png b/plugins/emoji/public/images/google/strawberry.png
new file mode 100644
index 0000000000..0ec9bbfc45
Binary files /dev/null and b/plugins/emoji/public/images/google/strawberry.png differ
diff --git a/plugins/emoji/public/images/google/stuck_out_tongue.png b/plugins/emoji/public/images/google/stuck_out_tongue.png
new file mode 100644
index 0000000000..783de268d7
Binary files /dev/null and b/plugins/emoji/public/images/google/stuck_out_tongue.png differ
diff --git a/plugins/emoji/public/images/google/stuck_out_tongue_closed_eyes.png b/plugins/emoji/public/images/google/stuck_out_tongue_closed_eyes.png
new file mode 100644
index 0000000000..4140a19ac0
Binary files /dev/null and b/plugins/emoji/public/images/google/stuck_out_tongue_closed_eyes.png differ
diff --git a/plugins/emoji/public/images/google/stuck_out_tongue_winking_eye.png b/plugins/emoji/public/images/google/stuck_out_tongue_winking_eye.png
new file mode 100644
index 0000000000..e458568819
Binary files /dev/null and b/plugins/emoji/public/images/google/stuck_out_tongue_winking_eye.png differ
diff --git a/plugins/emoji/public/images/google/sun_with_face.png b/plugins/emoji/public/images/google/sun_with_face.png
new file mode 100644
index 0000000000..fa4fe022cd
Binary files /dev/null and b/plugins/emoji/public/images/google/sun_with_face.png differ
diff --git a/plugins/emoji/public/images/google/sunflower.png b/plugins/emoji/public/images/google/sunflower.png
new file mode 100644
index 0000000000..55a2758f1c
Binary files /dev/null and b/plugins/emoji/public/images/google/sunflower.png differ
diff --git a/plugins/emoji/public/images/google/sunglasses.png b/plugins/emoji/public/images/google/sunglasses.png
new file mode 100644
index 0000000000..e9293e0a45
Binary files /dev/null and b/plugins/emoji/public/images/google/sunglasses.png differ
diff --git a/plugins/emoji/public/images/google/sunny.png b/plugins/emoji/public/images/google/sunny.png
new file mode 100644
index 0000000000..ca228423fe
Binary files /dev/null and b/plugins/emoji/public/images/google/sunny.png differ
diff --git a/plugins/emoji/public/images/google/sunrise.png b/plugins/emoji/public/images/google/sunrise.png
new file mode 100644
index 0000000000..6c1e7d6978
Binary files /dev/null and b/plugins/emoji/public/images/google/sunrise.png differ
diff --git a/plugins/emoji/public/images/google/sunrise_over_mountains.png b/plugins/emoji/public/images/google/sunrise_over_mountains.png
new file mode 100644
index 0000000000..e92089ace3
Binary files /dev/null and b/plugins/emoji/public/images/google/sunrise_over_mountains.png differ
diff --git a/plugins/emoji/public/images/google/surfer.png b/plugins/emoji/public/images/google/surfer.png
new file mode 100644
index 0000000000..01310a4726
Binary files /dev/null and b/plugins/emoji/public/images/google/surfer.png differ
diff --git a/plugins/emoji/public/images/google/sushi.png b/plugins/emoji/public/images/google/sushi.png
new file mode 100644
index 0000000000..56ba273acb
Binary files /dev/null and b/plugins/emoji/public/images/google/sushi.png differ
diff --git a/plugins/emoji/public/images/google/suspension_railway.png b/plugins/emoji/public/images/google/suspension_railway.png
new file mode 100644
index 0000000000..ca86f68722
Binary files /dev/null and b/plugins/emoji/public/images/google/suspension_railway.png differ
diff --git a/plugins/emoji/public/images/google/sweat.png b/plugins/emoji/public/images/google/sweat.png
new file mode 100644
index 0000000000..8b738d2ded
Binary files /dev/null and b/plugins/emoji/public/images/google/sweat.png differ
diff --git a/plugins/emoji/public/images/google/sweat_drops.png b/plugins/emoji/public/images/google/sweat_drops.png
new file mode 100644
index 0000000000..7d452fe740
Binary files /dev/null and b/plugins/emoji/public/images/google/sweat_drops.png differ
diff --git a/plugins/emoji/public/images/google/sweat_smile.png b/plugins/emoji/public/images/google/sweat_smile.png
new file mode 100644
index 0000000000..d02aa093e9
Binary files /dev/null and b/plugins/emoji/public/images/google/sweat_smile.png differ
diff --git a/plugins/emoji/public/images/google/sweet_potato.png b/plugins/emoji/public/images/google/sweet_potato.png
new file mode 100644
index 0000000000..9cc7e8e3e3
Binary files /dev/null and b/plugins/emoji/public/images/google/sweet_potato.png differ
diff --git a/plugins/emoji/public/images/google/swimmer.png b/plugins/emoji/public/images/google/swimmer.png
new file mode 100644
index 0000000000..35041ba604
Binary files /dev/null and b/plugins/emoji/public/images/google/swimmer.png differ
diff --git a/plugins/emoji/public/images/google/symbols.png b/plugins/emoji/public/images/google/symbols.png
new file mode 100644
index 0000000000..36a429944c
Binary files /dev/null and b/plugins/emoji/public/images/google/symbols.png differ
diff --git a/plugins/emoji/public/images/google/syringe.png b/plugins/emoji/public/images/google/syringe.png
new file mode 100644
index 0000000000..974dba42b7
Binary files /dev/null and b/plugins/emoji/public/images/google/syringe.png differ
diff --git a/plugins/emoji/public/images/google/tada.png b/plugins/emoji/public/images/google/tada.png
new file mode 100644
index 0000000000..9e315cd240
Binary files /dev/null and b/plugins/emoji/public/images/google/tada.png differ
diff --git a/plugins/emoji/public/images/google/tanabata_tree.png b/plugins/emoji/public/images/google/tanabata_tree.png
new file mode 100644
index 0000000000..80264962cb
Binary files /dev/null and b/plugins/emoji/public/images/google/tanabata_tree.png differ
diff --git a/plugins/emoji/public/images/google/tangerine.png b/plugins/emoji/public/images/google/tangerine.png
new file mode 100644
index 0000000000..bd0c4eb293
Binary files /dev/null and b/plugins/emoji/public/images/google/tangerine.png differ
diff --git a/plugins/emoji/public/images/google/taurus.png b/plugins/emoji/public/images/google/taurus.png
new file mode 100644
index 0000000000..265e9a0f5e
Binary files /dev/null and b/plugins/emoji/public/images/google/taurus.png differ
diff --git a/plugins/emoji/public/images/google/taxi.png b/plugins/emoji/public/images/google/taxi.png
new file mode 100644
index 0000000000..a51767c9ca
Binary files /dev/null and b/plugins/emoji/public/images/google/taxi.png differ
diff --git a/plugins/emoji/public/images/google/tea.png b/plugins/emoji/public/images/google/tea.png
new file mode 100644
index 0000000000..e2b2f82d39
Binary files /dev/null and b/plugins/emoji/public/images/google/tea.png differ
diff --git a/plugins/emoji/public/images/google/telephone.png b/plugins/emoji/public/images/google/telephone.png
new file mode 100644
index 0000000000..24e614c9c9
Binary files /dev/null and b/plugins/emoji/public/images/google/telephone.png differ
diff --git a/plugins/emoji/public/images/google/telephone_receiver.png b/plugins/emoji/public/images/google/telephone_receiver.png
new file mode 100644
index 0000000000..5307cee354
Binary files /dev/null and b/plugins/emoji/public/images/google/telephone_receiver.png differ
diff --git a/plugins/emoji/public/images/google/telescope.png b/plugins/emoji/public/images/google/telescope.png
new file mode 100644
index 0000000000..e7cc4ffcd9
Binary files /dev/null and b/plugins/emoji/public/images/google/telescope.png differ
diff --git a/plugins/emoji/public/images/google/tennis.png b/plugins/emoji/public/images/google/tennis.png
new file mode 100644
index 0000000000..253d96bd0e
Binary files /dev/null and b/plugins/emoji/public/images/google/tennis.png differ
diff --git a/plugins/emoji/public/images/google/tent.png b/plugins/emoji/public/images/google/tent.png
new file mode 100644
index 0000000000..b411a171a4
Binary files /dev/null and b/plugins/emoji/public/images/google/tent.png differ
diff --git a/plugins/emoji/public/images/google/thought_balloon.png b/plugins/emoji/public/images/google/thought_balloon.png
new file mode 100644
index 0000000000..3df332ac0e
Binary files /dev/null and b/plugins/emoji/public/images/google/thought_balloon.png differ
diff --git a/plugins/emoji/public/images/google/thumbsdown.png b/plugins/emoji/public/images/google/thumbsdown.png
new file mode 100644
index 0000000000..96be997bfb
Binary files /dev/null and b/plugins/emoji/public/images/google/thumbsdown.png differ
diff --git a/plugins/emoji/public/images/google/thumbsup.png b/plugins/emoji/public/images/google/thumbsup.png
new file mode 100644
index 0000000000..2f1ba2803b
Binary files /dev/null and b/plugins/emoji/public/images/google/thumbsup.png differ
diff --git a/plugins/emoji/public/images/google/ticket.png b/plugins/emoji/public/images/google/ticket.png
new file mode 100644
index 0000000000..dbfc2894f8
Binary files /dev/null and b/plugins/emoji/public/images/google/ticket.png differ
diff --git a/plugins/emoji/public/images/google/tiger.png b/plugins/emoji/public/images/google/tiger.png
new file mode 100644
index 0000000000..382b82bfa2
Binary files /dev/null and b/plugins/emoji/public/images/google/tiger.png differ
diff --git a/plugins/emoji/public/images/google/tiger2.png b/plugins/emoji/public/images/google/tiger2.png
new file mode 100644
index 0000000000..a042fbb57e
Binary files /dev/null and b/plugins/emoji/public/images/google/tiger2.png differ
diff --git a/plugins/emoji/public/images/google/tired_face.png b/plugins/emoji/public/images/google/tired_face.png
new file mode 100644
index 0000000000..bcd8c5b4f7
Binary files /dev/null and b/plugins/emoji/public/images/google/tired_face.png differ
diff --git a/plugins/emoji/public/images/google/tm.png b/plugins/emoji/public/images/google/tm.png
new file mode 100644
index 0000000000..de2a8f3899
Binary files /dev/null and b/plugins/emoji/public/images/google/tm.png differ
diff --git a/plugins/emoji/public/images/google/toilet.png b/plugins/emoji/public/images/google/toilet.png
new file mode 100644
index 0000000000..401913ac87
Binary files /dev/null and b/plugins/emoji/public/images/google/toilet.png differ
diff --git a/plugins/emoji/public/images/google/tokyo_tower.png b/plugins/emoji/public/images/google/tokyo_tower.png
new file mode 100644
index 0000000000..08d4a97d97
Binary files /dev/null and b/plugins/emoji/public/images/google/tokyo_tower.png differ
diff --git a/plugins/emoji/public/images/google/tomato.png b/plugins/emoji/public/images/google/tomato.png
new file mode 100644
index 0000000000..9e39e3457a
Binary files /dev/null and b/plugins/emoji/public/images/google/tomato.png differ
diff --git a/plugins/emoji/public/images/google/tongue.png b/plugins/emoji/public/images/google/tongue.png
new file mode 100644
index 0000000000..552e46ff7e
Binary files /dev/null and b/plugins/emoji/public/images/google/tongue.png differ
diff --git a/plugins/emoji/public/images/google/top.png b/plugins/emoji/public/images/google/top.png
new file mode 100644
index 0000000000..589410334f
Binary files /dev/null and b/plugins/emoji/public/images/google/top.png differ
diff --git a/plugins/emoji/public/images/google/tophat.png b/plugins/emoji/public/images/google/tophat.png
new file mode 100644
index 0000000000..a38acb4aeb
Binary files /dev/null and b/plugins/emoji/public/images/google/tophat.png differ
diff --git a/plugins/emoji/public/images/google/tractor.png b/plugins/emoji/public/images/google/tractor.png
new file mode 100644
index 0000000000..9e5cb19a46
Binary files /dev/null and b/plugins/emoji/public/images/google/tractor.png differ
diff --git a/plugins/emoji/public/images/google/traffic_light.png b/plugins/emoji/public/images/google/traffic_light.png
new file mode 100644
index 0000000000..38ecce0bf1
Binary files /dev/null and b/plugins/emoji/public/images/google/traffic_light.png differ
diff --git a/plugins/emoji/public/images/google/train2.png b/plugins/emoji/public/images/google/train2.png
new file mode 100644
index 0000000000..d520d90f2b
Binary files /dev/null and b/plugins/emoji/public/images/google/train2.png differ
diff --git a/plugins/emoji/public/images/google/tram.png b/plugins/emoji/public/images/google/tram.png
new file mode 100644
index 0000000000..253a0e3735
Binary files /dev/null and b/plugins/emoji/public/images/google/tram.png differ
diff --git a/plugins/emoji/public/images/google/triangular_flag_on_post.png b/plugins/emoji/public/images/google/triangular_flag_on_post.png
new file mode 100644
index 0000000000..3a3e175e89
Binary files /dev/null and b/plugins/emoji/public/images/google/triangular_flag_on_post.png differ
diff --git a/plugins/emoji/public/images/google/triangular_ruler.png b/plugins/emoji/public/images/google/triangular_ruler.png
new file mode 100644
index 0000000000..eb5f66613b
Binary files /dev/null and b/plugins/emoji/public/images/google/triangular_ruler.png differ
diff --git a/plugins/emoji/public/images/google/trident.png b/plugins/emoji/public/images/google/trident.png
new file mode 100644
index 0000000000..910bd3fe97
Binary files /dev/null and b/plugins/emoji/public/images/google/trident.png differ
diff --git a/plugins/emoji/public/images/google/triumph.png b/plugins/emoji/public/images/google/triumph.png
new file mode 100644
index 0000000000..2f6eecef1b
Binary files /dev/null and b/plugins/emoji/public/images/google/triumph.png differ
diff --git a/plugins/emoji/public/images/google/trolleybus.png b/plugins/emoji/public/images/google/trolleybus.png
new file mode 100644
index 0000000000..e27e8d34f3
Binary files /dev/null and b/plugins/emoji/public/images/google/trolleybus.png differ
diff --git a/plugins/emoji/public/images/google/trophy.png b/plugins/emoji/public/images/google/trophy.png
new file mode 100644
index 0000000000..8e867ff8d6
Binary files /dev/null and b/plugins/emoji/public/images/google/trophy.png differ
diff --git a/plugins/emoji/public/images/google/tropical_drink.png b/plugins/emoji/public/images/google/tropical_drink.png
new file mode 100644
index 0000000000..3be69e2d6c
Binary files /dev/null and b/plugins/emoji/public/images/google/tropical_drink.png differ
diff --git a/plugins/emoji/public/images/google/tropical_fish.png b/plugins/emoji/public/images/google/tropical_fish.png
new file mode 100644
index 0000000000..26ce18a5a6
Binary files /dev/null and b/plugins/emoji/public/images/google/tropical_fish.png differ
diff --git a/plugins/emoji/public/images/google/truck.png b/plugins/emoji/public/images/google/truck.png
new file mode 100644
index 0000000000..376baff3dc
Binary files /dev/null and b/plugins/emoji/public/images/google/truck.png differ
diff --git a/plugins/emoji/public/images/google/trumpet.png b/plugins/emoji/public/images/google/trumpet.png
new file mode 100644
index 0000000000..2c01c6eb90
Binary files /dev/null and b/plugins/emoji/public/images/google/trumpet.png differ
diff --git a/plugins/emoji/public/images/google/tshirt.png b/plugins/emoji/public/images/google/tshirt.png
new file mode 100644
index 0000000000..2b4ecb3a76
Binary files /dev/null and b/plugins/emoji/public/images/google/tshirt.png differ
diff --git a/plugins/emoji/public/images/google/tulip.png b/plugins/emoji/public/images/google/tulip.png
new file mode 100644
index 0000000000..e000f0412d
Binary files /dev/null and b/plugins/emoji/public/images/google/tulip.png differ
diff --git a/plugins/emoji/public/images/google/turtle.png b/plugins/emoji/public/images/google/turtle.png
new file mode 100644
index 0000000000..3d2e197d97
Binary files /dev/null and b/plugins/emoji/public/images/google/turtle.png differ
diff --git a/plugins/emoji/public/images/google/tv.png b/plugins/emoji/public/images/google/tv.png
new file mode 100644
index 0000000000..fde772175a
Binary files /dev/null and b/plugins/emoji/public/images/google/tv.png differ
diff --git a/plugins/emoji/public/images/google/twisted_rightwards_arrows.png b/plugins/emoji/public/images/google/twisted_rightwards_arrows.png
new file mode 100644
index 0000000000..eb56fdf40a
Binary files /dev/null and b/plugins/emoji/public/images/google/twisted_rightwards_arrows.png differ
diff --git a/plugins/emoji/public/images/google/two_hearts.png b/plugins/emoji/public/images/google/two_hearts.png
new file mode 100644
index 0000000000..7b6e0617d2
Binary files /dev/null and b/plugins/emoji/public/images/google/two_hearts.png differ
diff --git a/plugins/emoji/public/images/google/two_men_holding_hands.png b/plugins/emoji/public/images/google/two_men_holding_hands.png
new file mode 100644
index 0000000000..4e6669b2b1
Binary files /dev/null and b/plugins/emoji/public/images/google/two_men_holding_hands.png differ
diff --git a/plugins/emoji/public/images/google/two_women_holding_hands.png b/plugins/emoji/public/images/google/two_women_holding_hands.png
new file mode 100644
index 0000000000..89f2bb8446
Binary files /dev/null and b/plugins/emoji/public/images/google/two_women_holding_hands.png differ
diff --git a/plugins/emoji/public/images/google/u5272.png b/plugins/emoji/public/images/google/u5272.png
new file mode 100644
index 0000000000..257febcf97
Binary files /dev/null and b/plugins/emoji/public/images/google/u5272.png differ
diff --git a/plugins/emoji/public/images/google/u5408.png b/plugins/emoji/public/images/google/u5408.png
new file mode 100644
index 0000000000..b2aed34b1a
Binary files /dev/null and b/plugins/emoji/public/images/google/u5408.png differ
diff --git a/plugins/emoji/public/images/google/u55b6.png b/plugins/emoji/public/images/google/u55b6.png
new file mode 100644
index 0000000000..5b12ce419c
Binary files /dev/null and b/plugins/emoji/public/images/google/u55b6.png differ
diff --git a/plugins/emoji/public/images/google/u6307.png b/plugins/emoji/public/images/google/u6307.png
new file mode 100644
index 0000000000..804c61a828
Binary files /dev/null and b/plugins/emoji/public/images/google/u6307.png differ
diff --git a/plugins/emoji/public/images/google/u6708.png b/plugins/emoji/public/images/google/u6708.png
new file mode 100644
index 0000000000..093c0a9cc6
Binary files /dev/null and b/plugins/emoji/public/images/google/u6708.png differ
diff --git a/plugins/emoji/public/images/google/u6709.png b/plugins/emoji/public/images/google/u6709.png
new file mode 100644
index 0000000000..d0be50dc63
Binary files /dev/null and b/plugins/emoji/public/images/google/u6709.png differ
diff --git a/plugins/emoji/public/images/google/u6e80.png b/plugins/emoji/public/images/google/u6e80.png
new file mode 100644
index 0000000000..5063a7009d
Binary files /dev/null and b/plugins/emoji/public/images/google/u6e80.png differ
diff --git a/plugins/emoji/public/images/google/u7121.png b/plugins/emoji/public/images/google/u7121.png
new file mode 100644
index 0000000000..ddcb6d7e33
Binary files /dev/null and b/plugins/emoji/public/images/google/u7121.png differ
diff --git a/plugins/emoji/public/images/google/u7533.png b/plugins/emoji/public/images/google/u7533.png
new file mode 100644
index 0000000000..7eb5b26e19
Binary files /dev/null and b/plugins/emoji/public/images/google/u7533.png differ
diff --git a/plugins/emoji/public/images/google/u7981.png b/plugins/emoji/public/images/google/u7981.png
new file mode 100644
index 0000000000..2d42de6774
Binary files /dev/null and b/plugins/emoji/public/images/google/u7981.png differ
diff --git a/plugins/emoji/public/images/google/u7a7a.png b/plugins/emoji/public/images/google/u7a7a.png
new file mode 100644
index 0000000000..2588803126
Binary files /dev/null and b/plugins/emoji/public/images/google/u7a7a.png differ
diff --git a/plugins/emoji/public/images/google/uk.png b/plugins/emoji/public/images/google/uk.png
new file mode 100644
index 0000000000..901dc8d30a
Binary files /dev/null and b/plugins/emoji/public/images/google/uk.png differ
diff --git a/plugins/emoji/public/images/google/umbrella.png b/plugins/emoji/public/images/google/umbrella.png
new file mode 100644
index 0000000000..c91a273e5a
Binary files /dev/null and b/plugins/emoji/public/images/google/umbrella.png differ
diff --git a/plugins/emoji/public/images/google/unamused.png b/plugins/emoji/public/images/google/unamused.png
new file mode 100644
index 0000000000..e3c0013484
Binary files /dev/null and b/plugins/emoji/public/images/google/unamused.png differ
diff --git a/plugins/emoji/public/images/google/underage.png b/plugins/emoji/public/images/google/underage.png
new file mode 100644
index 0000000000..28014f7848
Binary files /dev/null and b/plugins/emoji/public/images/google/underage.png differ
diff --git a/plugins/emoji/public/images/google/unlock.png b/plugins/emoji/public/images/google/unlock.png
new file mode 100644
index 0000000000..700d828599
Binary files /dev/null and b/plugins/emoji/public/images/google/unlock.png differ
diff --git a/plugins/emoji/public/images/google/up.png b/plugins/emoji/public/images/google/up.png
new file mode 100644
index 0000000000..720832df8e
Binary files /dev/null and b/plugins/emoji/public/images/google/up.png differ
diff --git a/plugins/emoji/public/images/google/us.png b/plugins/emoji/public/images/google/us.png
new file mode 100644
index 0000000000..ded89d200a
Binary files /dev/null and b/plugins/emoji/public/images/google/us.png differ
diff --git a/plugins/emoji/public/images/google/v.png b/plugins/emoji/public/images/google/v.png
new file mode 100644
index 0000000000..fbf0d5e910
Binary files /dev/null and b/plugins/emoji/public/images/google/v.png differ
diff --git a/plugins/emoji/public/images/google/vertical_traffic_light.png b/plugins/emoji/public/images/google/vertical_traffic_light.png
new file mode 100644
index 0000000000..58608a792e
Binary files /dev/null and b/plugins/emoji/public/images/google/vertical_traffic_light.png differ
diff --git a/plugins/emoji/public/images/google/vhs.png b/plugins/emoji/public/images/google/vhs.png
new file mode 100644
index 0000000000..57f8241b9e
Binary files /dev/null and b/plugins/emoji/public/images/google/vhs.png differ
diff --git a/plugins/emoji/public/images/google/vibration_mode.png b/plugins/emoji/public/images/google/vibration_mode.png
new file mode 100644
index 0000000000..53dd62f3cc
Binary files /dev/null and b/plugins/emoji/public/images/google/vibration_mode.png differ
diff --git a/plugins/emoji/public/images/google/video_camera.png b/plugins/emoji/public/images/google/video_camera.png
new file mode 100644
index 0000000000..e42297585d
Binary files /dev/null and b/plugins/emoji/public/images/google/video_camera.png differ
diff --git a/plugins/emoji/public/images/google/video_game.png b/plugins/emoji/public/images/google/video_game.png
new file mode 100644
index 0000000000..e490827c9c
Binary files /dev/null and b/plugins/emoji/public/images/google/video_game.png differ
diff --git a/plugins/emoji/public/images/google/violin.png b/plugins/emoji/public/images/google/violin.png
new file mode 100644
index 0000000000..a99e4b292a
Binary files /dev/null and b/plugins/emoji/public/images/google/violin.png differ
diff --git a/plugins/emoji/public/images/google/virgo.png b/plugins/emoji/public/images/google/virgo.png
new file mode 100644
index 0000000000..11f434d739
Binary files /dev/null and b/plugins/emoji/public/images/google/virgo.png differ
diff --git a/plugins/emoji/public/images/google/volcano.png b/plugins/emoji/public/images/google/volcano.png
new file mode 100644
index 0000000000..3483012e09
Binary files /dev/null and b/plugins/emoji/public/images/google/volcano.png differ
diff --git a/plugins/emoji/public/images/google/vs.png b/plugins/emoji/public/images/google/vs.png
new file mode 100644
index 0000000000..824beee262
Binary files /dev/null and b/plugins/emoji/public/images/google/vs.png differ
diff --git a/plugins/emoji/public/images/google/walking.png b/plugins/emoji/public/images/google/walking.png
new file mode 100644
index 0000000000..ba6a9b3e0e
Binary files /dev/null and b/plugins/emoji/public/images/google/walking.png differ
diff --git a/plugins/emoji/public/images/google/waning_crescent_moon.png b/plugins/emoji/public/images/google/waning_crescent_moon.png
new file mode 100644
index 0000000000..67fe2c4329
Binary files /dev/null and b/plugins/emoji/public/images/google/waning_crescent_moon.png differ
diff --git a/plugins/emoji/public/images/google/waning_gibbous_moon.png b/plugins/emoji/public/images/google/waning_gibbous_moon.png
new file mode 100644
index 0000000000..bae2f6ede5
Binary files /dev/null and b/plugins/emoji/public/images/google/waning_gibbous_moon.png differ
diff --git a/plugins/emoji/public/images/google/warning.png b/plugins/emoji/public/images/google/warning.png
new file mode 100644
index 0000000000..8668656955
Binary files /dev/null and b/plugins/emoji/public/images/google/warning.png differ
diff --git a/plugins/emoji/public/images/google/watch.png b/plugins/emoji/public/images/google/watch.png
new file mode 100644
index 0000000000..dfd8864dc1
Binary files /dev/null and b/plugins/emoji/public/images/google/watch.png differ
diff --git a/plugins/emoji/public/images/google/water_buffalo.png b/plugins/emoji/public/images/google/water_buffalo.png
new file mode 100644
index 0000000000..3fffeb2d6e
Binary files /dev/null and b/plugins/emoji/public/images/google/water_buffalo.png differ
diff --git a/plugins/emoji/public/images/google/watermelon.png b/plugins/emoji/public/images/google/watermelon.png
new file mode 100644
index 0000000000..082ee39c8e
Binary files /dev/null and b/plugins/emoji/public/images/google/watermelon.png differ
diff --git a/plugins/emoji/public/images/google/wave.png b/plugins/emoji/public/images/google/wave.png
new file mode 100644
index 0000000000..f5646a59b8
Binary files /dev/null and b/plugins/emoji/public/images/google/wave.png differ
diff --git a/plugins/emoji/public/images/google/wavy_dash.png b/plugins/emoji/public/images/google/wavy_dash.png
new file mode 100644
index 0000000000..de8d45d6db
Binary files /dev/null and b/plugins/emoji/public/images/google/wavy_dash.png differ
diff --git a/plugins/emoji/public/images/google/waxing_crescent_moon.png b/plugins/emoji/public/images/google/waxing_crescent_moon.png
new file mode 100644
index 0000000000..f554b1cc3b
Binary files /dev/null and b/plugins/emoji/public/images/google/waxing_crescent_moon.png differ
diff --git a/plugins/emoji/public/images/google/waxing_gibbous_moon.png b/plugins/emoji/public/images/google/waxing_gibbous_moon.png
new file mode 100644
index 0000000000..2d161b9593
Binary files /dev/null and b/plugins/emoji/public/images/google/waxing_gibbous_moon.png differ
diff --git a/plugins/emoji/public/images/google/wc.png b/plugins/emoji/public/images/google/wc.png
new file mode 100644
index 0000000000..e0203419de
Binary files /dev/null and b/plugins/emoji/public/images/google/wc.png differ
diff --git a/plugins/emoji/public/images/google/weary.png b/plugins/emoji/public/images/google/weary.png
new file mode 100644
index 0000000000..eeb1cdb913
Binary files /dev/null and b/plugins/emoji/public/images/google/weary.png differ
diff --git a/plugins/emoji/public/images/google/wedding.png b/plugins/emoji/public/images/google/wedding.png
new file mode 100644
index 0000000000..373fd98041
Binary files /dev/null and b/plugins/emoji/public/images/google/wedding.png differ
diff --git a/plugins/emoji/public/images/google/whale.png b/plugins/emoji/public/images/google/whale.png
new file mode 100644
index 0000000000..334f24cf70
Binary files /dev/null and b/plugins/emoji/public/images/google/whale.png differ
diff --git a/plugins/emoji/public/images/google/whale2.png b/plugins/emoji/public/images/google/whale2.png
new file mode 100644
index 0000000000..1fef20d903
Binary files /dev/null and b/plugins/emoji/public/images/google/whale2.png differ
diff --git a/plugins/emoji/public/images/google/wheelchair.png b/plugins/emoji/public/images/google/wheelchair.png
new file mode 100644
index 0000000000..66e9c2cf78
Binary files /dev/null and b/plugins/emoji/public/images/google/wheelchair.png differ
diff --git a/plugins/emoji/public/images/google/white_check_mark.png b/plugins/emoji/public/images/google/white_check_mark.png
new file mode 100644
index 0000000000..04c6c4c8f7
Binary files /dev/null and b/plugins/emoji/public/images/google/white_check_mark.png differ
diff --git a/plugins/emoji/public/images/google/white_circle.png b/plugins/emoji/public/images/google/white_circle.png
new file mode 100644
index 0000000000..4104a73319
Binary files /dev/null and b/plugins/emoji/public/images/google/white_circle.png differ
diff --git a/plugins/emoji/public/images/google/white_flower.png b/plugins/emoji/public/images/google/white_flower.png
new file mode 100644
index 0000000000..465c1dd40e
Binary files /dev/null and b/plugins/emoji/public/images/google/white_flower.png differ
diff --git a/plugins/emoji/public/images/google/white_large_square.png b/plugins/emoji/public/images/google/white_large_square.png
new file mode 100644
index 0000000000..73b103a9e9
Binary files /dev/null and b/plugins/emoji/public/images/google/white_large_square.png differ
diff --git a/plugins/emoji/public/images/google/white_medium_small_square.png b/plugins/emoji/public/images/google/white_medium_small_square.png
new file mode 100644
index 0000000000..6b9caa0965
Binary files /dev/null and b/plugins/emoji/public/images/google/white_medium_small_square.png differ
diff --git a/plugins/emoji/public/images/google/white_medium_square.png b/plugins/emoji/public/images/google/white_medium_square.png
new file mode 100644
index 0000000000..9c4e84c86e
Binary files /dev/null and b/plugins/emoji/public/images/google/white_medium_square.png differ
diff --git a/plugins/emoji/public/images/google/white_small_square.png b/plugins/emoji/public/images/google/white_small_square.png
new file mode 100644
index 0000000000..3f7126170e
Binary files /dev/null and b/plugins/emoji/public/images/google/white_small_square.png differ
diff --git a/plugins/emoji/public/images/google/white_square_button.png b/plugins/emoji/public/images/google/white_square_button.png
new file mode 100644
index 0000000000..0682c7e8d7
Binary files /dev/null and b/plugins/emoji/public/images/google/white_square_button.png differ
diff --git a/plugins/emoji/public/images/google/wind_chime.png b/plugins/emoji/public/images/google/wind_chime.png
new file mode 100644
index 0000000000..3655d18472
Binary files /dev/null and b/plugins/emoji/public/images/google/wind_chime.png differ
diff --git a/plugins/emoji/public/images/google/wine_glass.png b/plugins/emoji/public/images/google/wine_glass.png
new file mode 100644
index 0000000000..d8acd12a7d
Binary files /dev/null and b/plugins/emoji/public/images/google/wine_glass.png differ
diff --git a/plugins/emoji/public/images/google/wink.png b/plugins/emoji/public/images/google/wink.png
new file mode 100644
index 0000000000..5cce8ee0f1
Binary files /dev/null and b/plugins/emoji/public/images/google/wink.png differ
diff --git a/plugins/emoji/public/images/google/wolf.png b/plugins/emoji/public/images/google/wolf.png
new file mode 100644
index 0000000000..cb3dd99320
Binary files /dev/null and b/plugins/emoji/public/images/google/wolf.png differ
diff --git a/plugins/emoji/public/images/google/woman.png b/plugins/emoji/public/images/google/woman.png
new file mode 100644
index 0000000000..bcbc204e5a
Binary files /dev/null and b/plugins/emoji/public/images/google/woman.png differ
diff --git a/plugins/emoji/public/images/google/womans_clothes.png b/plugins/emoji/public/images/google/womans_clothes.png
new file mode 100644
index 0000000000..3fa87f26dd
Binary files /dev/null and b/plugins/emoji/public/images/google/womans_clothes.png differ
diff --git a/plugins/emoji/public/images/google/womans_hat.png b/plugins/emoji/public/images/google/womans_hat.png
new file mode 100644
index 0000000000..290ff610da
Binary files /dev/null and b/plugins/emoji/public/images/google/womans_hat.png differ
diff --git a/plugins/emoji/public/images/google/womens.png b/plugins/emoji/public/images/google/womens.png
new file mode 100644
index 0000000000..ea67ba2032
Binary files /dev/null and b/plugins/emoji/public/images/google/womens.png differ
diff --git a/plugins/emoji/public/images/google/worried.png b/plugins/emoji/public/images/google/worried.png
new file mode 100644
index 0000000000..22bc0b3138
Binary files /dev/null and b/plugins/emoji/public/images/google/worried.png differ
diff --git a/plugins/emoji/public/images/google/wrench.png b/plugins/emoji/public/images/google/wrench.png
new file mode 100644
index 0000000000..96412fb445
Binary files /dev/null and b/plugins/emoji/public/images/google/wrench.png differ
diff --git a/plugins/emoji/public/images/google/x.png b/plugins/emoji/public/images/google/x.png
new file mode 100644
index 0000000000..4c79219b87
Binary files /dev/null and b/plugins/emoji/public/images/google/x.png differ
diff --git a/plugins/emoji/public/images/google/yellow_heart.png b/plugins/emoji/public/images/google/yellow_heart.png
new file mode 100644
index 0000000000..960667d642
Binary files /dev/null and b/plugins/emoji/public/images/google/yellow_heart.png differ
diff --git a/plugins/emoji/public/images/google/yen.png b/plugins/emoji/public/images/google/yen.png
new file mode 100644
index 0000000000..c2ff865701
Binary files /dev/null and b/plugins/emoji/public/images/google/yen.png differ
diff --git a/plugins/emoji/public/images/google/yum.png b/plugins/emoji/public/images/google/yum.png
new file mode 100644
index 0000000000..342f42a4bc
Binary files /dev/null and b/plugins/emoji/public/images/google/yum.png differ
diff --git a/plugins/emoji/public/images/google/zap.png b/plugins/emoji/public/images/google/zap.png
new file mode 100644
index 0000000000..44d97af48c
Binary files /dev/null and b/plugins/emoji/public/images/google/zap.png differ
diff --git a/plugins/emoji/public/images/google/zzz.png b/plugins/emoji/public/images/google/zzz.png
new file mode 100644
index 0000000000..1f680fef02
Binary files /dev/null and b/plugins/emoji/public/images/google/zzz.png differ
diff --git a/plugins/emoji/public/images/grapes.png b/plugins/emoji/public/images/grapes.png
deleted file mode 120000
index 992b8bedb5..0000000000
--- a/plugins/emoji/public/images/grapes.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f347.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/green_apple.png b/plugins/emoji/public/images/green_apple.png
deleted file mode 120000
index 976a754014..0000000000
--- a/plugins/emoji/public/images/green_apple.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f34f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/green_book.png b/plugins/emoji/public/images/green_book.png
deleted file mode 120000
index 3dc3c270c6..0000000000
--- a/plugins/emoji/public/images/green_book.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/green_heart.png b/plugins/emoji/public/images/green_heart.png
deleted file mode 120000
index 54420ad54e..0000000000
--- a/plugins/emoji/public/images/green_heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f49a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/grey_exclamation.png b/plugins/emoji/public/images/grey_exclamation.png
deleted file mode 120000
index 134a452b40..0000000000
--- a/plugins/emoji/public/images/grey_exclamation.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2755.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/grey_question.png b/plugins/emoji/public/images/grey_question.png
deleted file mode 120000
index 8f0648965e..0000000000
--- a/plugins/emoji/public/images/grey_question.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2754.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/grimacing.png b/plugins/emoji/public/images/grimacing.png
deleted file mode 120000
index b6635d36f5..0000000000
--- a/plugins/emoji/public/images/grimacing.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f62c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/grin.png b/plugins/emoji/public/images/grin.png
deleted file mode 120000
index 143cbebc6d..0000000000
--- a/plugins/emoji/public/images/grin.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f601.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/grinning.png b/plugins/emoji/public/images/grinning.png
deleted file mode 120000
index a993ffd1d3..0000000000
--- a/plugins/emoji/public/images/grinning.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f600.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/guardsman.png b/plugins/emoji/public/images/guardsman.png
deleted file mode 120000
index 1dc9e56f5e..0000000000
--- a/plugins/emoji/public/images/guardsman.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f482.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/guitar.png b/plugins/emoji/public/images/guitar.png
deleted file mode 120000
index b94136ec31..0000000000
--- a/plugins/emoji/public/images/guitar.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/gun.png b/plugins/emoji/public/images/gun.png
deleted file mode 120000
index 6cf88b7ad0..0000000000
--- a/plugins/emoji/public/images/gun.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f52b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/haircut.png b/plugins/emoji/public/images/haircut.png
deleted file mode 120000
index 375fa25db1..0000000000
--- a/plugins/emoji/public/images/haircut.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f487.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hamburger.png b/plugins/emoji/public/images/hamburger.png
deleted file mode 120000
index 362ca334ae..0000000000
--- a/plugins/emoji/public/images/hamburger.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f354.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hammer.png b/plugins/emoji/public/images/hammer.png
deleted file mode 120000
index e6d5825df5..0000000000
--- a/plugins/emoji/public/images/hammer.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f528.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hamster.png b/plugins/emoji/public/images/hamster.png
deleted file mode 120000
index b729566c27..0000000000
--- a/plugins/emoji/public/images/hamster.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f439.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hand.png b/plugins/emoji/public/images/hand.png
deleted file mode 120000
index da39fb0cba..0000000000
--- a/plugins/emoji/public/images/hand.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/270b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/handbag.png b/plugins/emoji/public/images/handbag.png
deleted file mode 120000
index f93a284141..0000000000
--- a/plugins/emoji/public/images/handbag.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f45c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hankey.png b/plugins/emoji/public/images/hankey.png
deleted file mode 120000
index c8c5a772b2..0000000000
--- a/plugins/emoji/public/images/hankey.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hash.png b/plugins/emoji/public/images/hash.png
deleted file mode 120000
index 2cdff46c54..0000000000
--- a/plugins/emoji/public/images/hash.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0023.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hatched_chick.png b/plugins/emoji/public/images/hatched_chick.png
deleted file mode 120000
index e71635571b..0000000000
--- a/plugins/emoji/public/images/hatched_chick.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f425.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hatching_chick.png b/plugins/emoji/public/images/hatching_chick.png
deleted file mode 120000
index 3a72c178b7..0000000000
--- a/plugins/emoji/public/images/hatching_chick.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f423.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/headphones.png b/plugins/emoji/public/images/headphones.png
deleted file mode 120000
index ffbb04629b..0000000000
--- a/plugins/emoji/public/images/headphones.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hear_no_evil.png b/plugins/emoji/public/images/hear_no_evil.png
deleted file mode 120000
index ecb7fa8122..0000000000
--- a/plugins/emoji/public/images/hear_no_evil.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f649.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heart.png b/plugins/emoji/public/images/heart.png
deleted file mode 120000
index 1362baafa4..0000000000
--- a/plugins/emoji/public/images/heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2764.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heart_decoration.png b/plugins/emoji/public/images/heart_decoration.png
deleted file mode 120000
index 88ad0c85ac..0000000000
--- a/plugins/emoji/public/images/heart_decoration.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f49f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heart_eyes.png b/plugins/emoji/public/images/heart_eyes.png
deleted file mode 120000
index 0d0248be5d..0000000000
--- a/plugins/emoji/public/images/heart_eyes.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f60d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heart_eyes_cat.png b/plugins/emoji/public/images/heart_eyes_cat.png
deleted file mode 120000
index 55eca64e11..0000000000
--- a/plugins/emoji/public/images/heart_eyes_cat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f63b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heartbeat.png b/plugins/emoji/public/images/heartbeat.png
deleted file mode 120000
index 85191a0053..0000000000
--- a/plugins/emoji/public/images/heartbeat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f493.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heartpulse.png b/plugins/emoji/public/images/heartpulse.png
deleted file mode 120000
index bd1ca76108..0000000000
--- a/plugins/emoji/public/images/heartpulse.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f497.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hearts.png b/plugins/emoji/public/images/hearts.png
deleted file mode 120000
index f8bb59c1b4..0000000000
--- a/plugins/emoji/public/images/hearts.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2665.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heavy_check_mark.png b/plugins/emoji/public/images/heavy_check_mark.png
deleted file mode 120000
index 30e9f06b7c..0000000000
--- a/plugins/emoji/public/images/heavy_check_mark.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2714.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heavy_division_sign.png b/plugins/emoji/public/images/heavy_division_sign.png
deleted file mode 120000
index 6b593c8c02..0000000000
--- a/plugins/emoji/public/images/heavy_division_sign.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2797.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heavy_dollar_sign.png b/plugins/emoji/public/images/heavy_dollar_sign.png
deleted file mode 120000
index 5cf869bd0e..0000000000
--- a/plugins/emoji/public/images/heavy_dollar_sign.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heavy_exclamation_mark.png b/plugins/emoji/public/images/heavy_exclamation_mark.png
deleted file mode 120000
index f085c97778..0000000000
--- a/plugins/emoji/public/images/heavy_exclamation_mark.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2757.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heavy_minus_sign.png b/plugins/emoji/public/images/heavy_minus_sign.png
deleted file mode 120000
index 8e032c1e20..0000000000
--- a/plugins/emoji/public/images/heavy_minus_sign.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2796.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heavy_multiplication_x.png b/plugins/emoji/public/images/heavy_multiplication_x.png
deleted file mode 120000
index ac6e4c9d81..0000000000
--- a/plugins/emoji/public/images/heavy_multiplication_x.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2716.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/heavy_plus_sign.png b/plugins/emoji/public/images/heavy_plus_sign.png
deleted file mode 120000
index 820107fff6..0000000000
--- a/plugins/emoji/public/images/heavy_plus_sign.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2795.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/helicopter.png b/plugins/emoji/public/images/helicopter.png
deleted file mode 120000
index 6dc29b813b..0000000000
--- a/plugins/emoji/public/images/helicopter.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f681.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/herb.png b/plugins/emoji/public/images/herb.png
deleted file mode 120000
index 5bd41d8d3d..0000000000
--- a/plugins/emoji/public/images/herb.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f33f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hibiscus.png b/plugins/emoji/public/images/hibiscus.png
deleted file mode 120000
index 7297f85ad3..0000000000
--- a/plugins/emoji/public/images/hibiscus.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f33a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/high_brightness.png b/plugins/emoji/public/images/high_brightness.png
deleted file mode 120000
index e9b01dcc74..0000000000
--- a/plugins/emoji/public/images/high_brightness.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f506.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/high_heel.png b/plugins/emoji/public/images/high_heel.png
deleted file mode 120000
index 59ad904176..0000000000
--- a/plugins/emoji/public/images/high_heel.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f460.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hocho.png b/plugins/emoji/public/images/hocho.png
deleted file mode 120000
index fd4eefe131..0000000000
--- a/plugins/emoji/public/images/hocho.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f52a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/honey_pot.png b/plugins/emoji/public/images/honey_pot.png
deleted file mode 120000
index bf38a2598c..0000000000
--- a/plugins/emoji/public/images/honey_pot.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f36f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/honeybee.png b/plugins/emoji/public/images/honeybee.png
deleted file mode 120000
index d1768eca5e..0000000000
--- a/plugins/emoji/public/images/honeybee.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f41d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/horse.png b/plugins/emoji/public/images/horse.png
deleted file mode 120000
index 577f99055f..0000000000
--- a/plugins/emoji/public/images/horse.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f434.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/horse_racing.png b/plugins/emoji/public/images/horse_racing.png
deleted file mode 120000
index 3d98145e4d..0000000000
--- a/plugins/emoji/public/images/horse_racing.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hospital.png b/plugins/emoji/public/images/hospital.png
deleted file mode 120000
index 2efb289a20..0000000000
--- a/plugins/emoji/public/images/hospital.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hotel.png b/plugins/emoji/public/images/hotel.png
deleted file mode 120000
index 4e5aa700ce..0000000000
--- a/plugins/emoji/public/images/hotel.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hotsprings.png b/plugins/emoji/public/images/hotsprings.png
deleted file mode 120000
index b17e6082a8..0000000000
--- a/plugins/emoji/public/images/hotsprings.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2668.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hourglass.png b/plugins/emoji/public/images/hourglass.png
deleted file mode 120000
index 2563dece9a..0000000000
--- a/plugins/emoji/public/images/hourglass.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/231b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hourglass_flowing_sand.png b/plugins/emoji/public/images/hourglass_flowing_sand.png
deleted file mode 120000
index 604e9e0ef2..0000000000
--- a/plugins/emoji/public/images/hourglass_flowing_sand.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/23f3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/house.png b/plugins/emoji/public/images/house.png
deleted file mode 120000
index ff45713ec8..0000000000
--- a/plugins/emoji/public/images/house.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/house_with_garden.png b/plugins/emoji/public/images/house_with_garden.png
deleted file mode 120000
index 8ad8f1dda9..0000000000
--- a/plugins/emoji/public/images/house_with_garden.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/hurtrealbad.png b/plugins/emoji/public/images/hurtrealbad.png
deleted file mode 100755
index 146ef1a6a8..0000000000
Binary files a/plugins/emoji/public/images/hurtrealbad.png and /dev/null differ
diff --git a/plugins/emoji/public/images/hushed.png b/plugins/emoji/public/images/hushed.png
deleted file mode 120000
index ac08f7813a..0000000000
--- a/plugins/emoji/public/images/hushed.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f62f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ice_cream.png b/plugins/emoji/public/images/ice_cream.png
deleted file mode 120000
index bfe0492351..0000000000
--- a/plugins/emoji/public/images/ice_cream.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f368.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/icecream.png b/plugins/emoji/public/images/icecream.png
deleted file mode 120000
index 14a3231fd8..0000000000
--- a/plugins/emoji/public/images/icecream.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f366.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/id.png b/plugins/emoji/public/images/id.png
deleted file mode 120000
index eac174f509..0000000000
--- a/plugins/emoji/public/images/id.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f194.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ideograph_advantage.png b/plugins/emoji/public/images/ideograph_advantage.png
deleted file mode 120000
index 6605a39355..0000000000
--- a/plugins/emoji/public/images/ideograph_advantage.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f250.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/imp.png b/plugins/emoji/public/images/imp.png
deleted file mode 120000
index 0c979fc1c8..0000000000
--- a/plugins/emoji/public/images/imp.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f47f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/inbox_tray.png b/plugins/emoji/public/images/inbox_tray.png
deleted file mode 120000
index 1f6523edcc..0000000000
--- a/plugins/emoji/public/images/inbox_tray.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/incoming_envelope.png b/plugins/emoji/public/images/incoming_envelope.png
deleted file mode 120000
index 8ec90adce6..0000000000
--- a/plugins/emoji/public/images/incoming_envelope.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/information_desk_person.png b/plugins/emoji/public/images/information_desk_person.png
deleted file mode 120000
index 5b7edeb0a7..0000000000
--- a/plugins/emoji/public/images/information_desk_person.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f481.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/information_source.png b/plugins/emoji/public/images/information_source.png
deleted file mode 120000
index b25c3cbd76..0000000000
--- a/plugins/emoji/public/images/information_source.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2139.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/innocent.png b/plugins/emoji/public/images/innocent.png
deleted file mode 120000
index 87c9e8c58f..0000000000
--- a/plugins/emoji/public/images/innocent.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f607.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/interrobang.png b/plugins/emoji/public/images/interrobang.png
deleted file mode 120000
index ac24b74153..0000000000
--- a/plugins/emoji/public/images/interrobang.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2049.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/iphone.png b/plugins/emoji/public/images/iphone.png
deleted file mode 120000
index 30673d2775..0000000000
--- a/plugins/emoji/public/images/iphone.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4f1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/it.png b/plugins/emoji/public/images/it.png
deleted file mode 120000
index 6534d31cd0..0000000000
--- a/plugins/emoji/public/images/it.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1ee-1f1f9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/izakaya_lantern.png b/plugins/emoji/public/images/izakaya_lantern.png
deleted file mode 120000
index a00faa3541..0000000000
--- a/plugins/emoji/public/images/izakaya_lantern.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ee.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/jack_o_lantern.png b/plugins/emoji/public/images/jack_o_lantern.png
deleted file mode 120000
index a457fa6077..0000000000
--- a/plugins/emoji/public/images/jack_o_lantern.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f383.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/japan.png b/plugins/emoji/public/images/japan.png
deleted file mode 120000
index 4587899c6a..0000000000
--- a/plugins/emoji/public/images/japan.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f5fe.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/japanese_castle.png b/plugins/emoji/public/images/japanese_castle.png
deleted file mode 120000
index b6465b5ca1..0000000000
--- a/plugins/emoji/public/images/japanese_castle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ef.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/japanese_goblin.png b/plugins/emoji/public/images/japanese_goblin.png
deleted file mode 120000
index 74c5aaced5..0000000000
--- a/plugins/emoji/public/images/japanese_goblin.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f47a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/japanese_ogre.png b/plugins/emoji/public/images/japanese_ogre.png
deleted file mode 120000
index 1a6082f418..0000000000
--- a/plugins/emoji/public/images/japanese_ogre.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f479.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/jeans.png b/plugins/emoji/public/images/jeans.png
deleted file mode 120000
index cec43bf66b..0000000000
--- a/plugins/emoji/public/images/jeans.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f456.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/joy.png b/plugins/emoji/public/images/joy.png
deleted file mode 120000
index e5a84c0200..0000000000
--- a/plugins/emoji/public/images/joy.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f602.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/joy_cat.png b/plugins/emoji/public/images/joy_cat.png
deleted file mode 120000
index 86a6a3fa47..0000000000
--- a/plugins/emoji/public/images/joy_cat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f639.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/jp.png b/plugins/emoji/public/images/jp.png
deleted file mode 120000
index a006fa1186..0000000000
--- a/plugins/emoji/public/images/jp.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1ef-1f1f5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/key.png b/plugins/emoji/public/images/key.png
deleted file mode 120000
index 8a6eec737e..0000000000
--- a/plugins/emoji/public/images/key.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f511.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/keycap_ten.png b/plugins/emoji/public/images/keycap_ten.png
deleted file mode 120000
index d1ed03a818..0000000000
--- a/plugins/emoji/public/images/keycap_ten.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f51f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/kimono.png b/plugins/emoji/public/images/kimono.png
deleted file mode 120000
index 50261f1f05..0000000000
--- a/plugins/emoji/public/images/kimono.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f458.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/kiss.png b/plugins/emoji/public/images/kiss.png
deleted file mode 120000
index d3b97cba96..0000000000
--- a/plugins/emoji/public/images/kiss.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f48b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/kissing.png b/plugins/emoji/public/images/kissing.png
deleted file mode 120000
index 661f9a2881..0000000000
--- a/plugins/emoji/public/images/kissing.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f617.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/kissing_cat.png b/plugins/emoji/public/images/kissing_cat.png
deleted file mode 120000
index 38f289f1da..0000000000
--- a/plugins/emoji/public/images/kissing_cat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f63d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/kissing_closed_eyes.png b/plugins/emoji/public/images/kissing_closed_eyes.png
deleted file mode 120000
index 18a8bfde3d..0000000000
--- a/plugins/emoji/public/images/kissing_closed_eyes.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f61a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/kissing_heart.png b/plugins/emoji/public/images/kissing_heart.png
deleted file mode 120000
index 3d66dd0904..0000000000
--- a/plugins/emoji/public/images/kissing_heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f618.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/kissing_smiling_eyes.png b/plugins/emoji/public/images/kissing_smiling_eyes.png
deleted file mode 120000
index 5a55bd834e..0000000000
--- a/plugins/emoji/public/images/kissing_smiling_eyes.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f619.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/koala.png b/plugins/emoji/public/images/koala.png
deleted file mode 120000
index 5919ebfcdd..0000000000
--- a/plugins/emoji/public/images/koala.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f428.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/koko.png b/plugins/emoji/public/images/koko.png
deleted file mode 120000
index 4216c07f92..0000000000
--- a/plugins/emoji/public/images/koko.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f201.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/kr.png b/plugins/emoji/public/images/kr.png
deleted file mode 120000
index be8cdb3db3..0000000000
--- a/plugins/emoji/public/images/kr.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1f0-1f1f7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/lantern.png b/plugins/emoji/public/images/lantern.png
deleted file mode 120000
index a00faa3541..0000000000
--- a/plugins/emoji/public/images/lantern.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ee.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/large_blue_circle.png b/plugins/emoji/public/images/large_blue_circle.png
deleted file mode 120000
index d40ba77c02..0000000000
--- a/plugins/emoji/public/images/large_blue_circle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f535.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/large_blue_diamond.png b/plugins/emoji/public/images/large_blue_diamond.png
deleted file mode 120000
index ef7a174ef4..0000000000
--- a/plugins/emoji/public/images/large_blue_diamond.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f537.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/large_orange_diamond.png b/plugins/emoji/public/images/large_orange_diamond.png
deleted file mode 120000
index 199a588f00..0000000000
--- a/plugins/emoji/public/images/large_orange_diamond.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f536.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/last_quarter_moon.png b/plugins/emoji/public/images/last_quarter_moon.png
deleted file mode 120000
index ef89f66032..0000000000
--- a/plugins/emoji/public/images/last_quarter_moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f317.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/last_quarter_moon_with_face.png b/plugins/emoji/public/images/last_quarter_moon_with_face.png
deleted file mode 120000
index e1ef1cf41f..0000000000
--- a/plugins/emoji/public/images/last_quarter_moon_with_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f31c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/laughing.png b/plugins/emoji/public/images/laughing.png
deleted file mode 120000
index 7332e39078..0000000000
--- a/plugins/emoji/public/images/laughing.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f606.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/leaves.png b/plugins/emoji/public/images/leaves.png
deleted file mode 120000
index 19492463bd..0000000000
--- a/plugins/emoji/public/images/leaves.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f343.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ledger.png b/plugins/emoji/public/images/ledger.png
deleted file mode 120000
index 72bd6c33c7..0000000000
--- a/plugins/emoji/public/images/ledger.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/left_luggage.png b/plugins/emoji/public/images/left_luggage.png
deleted file mode 120000
index 7d6ca72d90..0000000000
--- a/plugins/emoji/public/images/left_luggage.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6c5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/left_right_arrow.png b/plugins/emoji/public/images/left_right_arrow.png
deleted file mode 120000
index 70d9adbf1c..0000000000
--- a/plugins/emoji/public/images/left_right_arrow.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2194.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/leftwards_arrow_with_hook.png b/plugins/emoji/public/images/leftwards_arrow_with_hook.png
deleted file mode 120000
index 4bf1b424f1..0000000000
--- a/plugins/emoji/public/images/leftwards_arrow_with_hook.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/21a9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/lemon.png b/plugins/emoji/public/images/lemon.png
deleted file mode 120000
index 8f68b3e048..0000000000
--- a/plugins/emoji/public/images/lemon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f34b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/leo.png b/plugins/emoji/public/images/leo.png
deleted file mode 120000
index f699bf6d3c..0000000000
--- a/plugins/emoji/public/images/leo.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/264c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/leopard.png b/plugins/emoji/public/images/leopard.png
deleted file mode 120000
index 415e3b4d17..0000000000
--- a/plugins/emoji/public/images/leopard.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f406.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/libra.png b/plugins/emoji/public/images/libra.png
deleted file mode 120000
index 04bf667748..0000000000
--- a/plugins/emoji/public/images/libra.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/264e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/light_rail.png b/plugins/emoji/public/images/light_rail.png
deleted file mode 120000
index 448409bc2d..0000000000
--- a/plugins/emoji/public/images/light_rail.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f688.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/link.png b/plugins/emoji/public/images/link.png
deleted file mode 120000
index 4e82b7668c..0000000000
--- a/plugins/emoji/public/images/link.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f517.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/lips.png b/plugins/emoji/public/images/lips.png
deleted file mode 120000
index 7109205352..0000000000
--- a/plugins/emoji/public/images/lips.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f444.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/lipstick.png b/plugins/emoji/public/images/lipstick.png
deleted file mode 120000
index 588bc77901..0000000000
--- a/plugins/emoji/public/images/lipstick.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f484.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/lock.png b/plugins/emoji/public/images/lock.png
deleted file mode 120000
index 6e433a52a4..0000000000
--- a/plugins/emoji/public/images/lock.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f512.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/lock_with_ink_pen.png b/plugins/emoji/public/images/lock_with_ink_pen.png
deleted file mode 120000
index 823ba53a28..0000000000
--- a/plugins/emoji/public/images/lock_with_ink_pen.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f50f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/lollipop.png b/plugins/emoji/public/images/lollipop.png
deleted file mode 120000
index ea983b520c..0000000000
--- a/plugins/emoji/public/images/lollipop.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f36d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/loop.png b/plugins/emoji/public/images/loop.png
deleted file mode 120000
index cb0c2b131e..0000000000
--- a/plugins/emoji/public/images/loop.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/27bf.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/loudspeaker.png b/plugins/emoji/public/images/loudspeaker.png
deleted file mode 120000
index ca5f5232e3..0000000000
--- a/plugins/emoji/public/images/loudspeaker.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/love_hotel.png b/plugins/emoji/public/images/love_hotel.png
deleted file mode 120000
index b608db140d..0000000000
--- a/plugins/emoji/public/images/love_hotel.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/love_letter.png b/plugins/emoji/public/images/love_letter.png
deleted file mode 120000
index bbdee84084..0000000000
--- a/plugins/emoji/public/images/love_letter.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f48c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/low_brightness.png b/plugins/emoji/public/images/low_brightness.png
deleted file mode 120000
index 6a90c2e8ce..0000000000
--- a/plugins/emoji/public/images/low_brightness.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f505.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/m.png b/plugins/emoji/public/images/m.png
deleted file mode 120000
index 1423f80362..0000000000
--- a/plugins/emoji/public/images/m.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/24c2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mag.png b/plugins/emoji/public/images/mag.png
deleted file mode 120000
index 70b0cab887..0000000000
--- a/plugins/emoji/public/images/mag.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f50d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mag_right.png b/plugins/emoji/public/images/mag_right.png
deleted file mode 120000
index 81eb76fb06..0000000000
--- a/plugins/emoji/public/images/mag_right.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f50e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mahjong.png b/plugins/emoji/public/images/mahjong.png
deleted file mode 120000
index 8632fba11c..0000000000
--- a/plugins/emoji/public/images/mahjong.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f004.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mailbox.png b/plugins/emoji/public/images/mailbox.png
deleted file mode 120000
index 7022c84b53..0000000000
--- a/plugins/emoji/public/images/mailbox.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4eb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mailbox_closed.png b/plugins/emoji/public/images/mailbox_closed.png
deleted file mode 120000
index 678bf987f4..0000000000
--- a/plugins/emoji/public/images/mailbox_closed.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ea.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mailbox_with_mail.png b/plugins/emoji/public/images/mailbox_with_mail.png
deleted file mode 120000
index 77ecb292d0..0000000000
--- a/plugins/emoji/public/images/mailbox_with_mail.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ec.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mailbox_with_no_mail.png b/plugins/emoji/public/images/mailbox_with_no_mail.png
deleted file mode 120000
index 4801a95afc..0000000000
--- a/plugins/emoji/public/images/mailbox_with_no_mail.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ed.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/man.png b/plugins/emoji/public/images/man.png
deleted file mode 120000
index 4fca922aa1..0000000000
--- a/plugins/emoji/public/images/man.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f468.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/man_with_gua_pi_mao.png b/plugins/emoji/public/images/man_with_gua_pi_mao.png
deleted file mode 120000
index c98dd580eb..0000000000
--- a/plugins/emoji/public/images/man_with_gua_pi_mao.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f472.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/man_with_turban.png b/plugins/emoji/public/images/man_with_turban.png
deleted file mode 120000
index 3ef16c61fd..0000000000
--- a/plugins/emoji/public/images/man_with_turban.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f473.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mans_shoe.png b/plugins/emoji/public/images/mans_shoe.png
deleted file mode 120000
index cb54be7b1d..0000000000
--- a/plugins/emoji/public/images/mans_shoe.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f45e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/maple_leaf.png b/plugins/emoji/public/images/maple_leaf.png
deleted file mode 120000
index c04325af97..0000000000
--- a/plugins/emoji/public/images/maple_leaf.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f341.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/markov.png b/plugins/emoji/public/images/markov.png
deleted file mode 100644
index d90ff2f3dd..0000000000
Binary files a/plugins/emoji/public/images/markov.png and /dev/null differ
diff --git a/plugins/emoji/public/images/mask.png b/plugins/emoji/public/images/mask.png
deleted file mode 120000
index 9d7051388f..0000000000
--- a/plugins/emoji/public/images/mask.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f637.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/massage.png b/plugins/emoji/public/images/massage.png
deleted file mode 120000
index c312a63477..0000000000
--- a/plugins/emoji/public/images/massage.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f486.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/meat_on_bone.png b/plugins/emoji/public/images/meat_on_bone.png
deleted file mode 120000
index acc34def9a..0000000000
--- a/plugins/emoji/public/images/meat_on_bone.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f356.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mega.png b/plugins/emoji/public/images/mega.png
deleted file mode 120000
index 713cbe57f0..0000000000
--- a/plugins/emoji/public/images/mega.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/melon.png b/plugins/emoji/public/images/melon.png
deleted file mode 120000
index 6682e14e15..0000000000
--- a/plugins/emoji/public/images/melon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f348.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/memo.png b/plugins/emoji/public/images/memo.png
deleted file mode 120000
index 86cf768615..0000000000
--- a/plugins/emoji/public/images/memo.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4dd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mens.png b/plugins/emoji/public/images/mens.png
deleted file mode 120000
index 7d0a3f3913..0000000000
--- a/plugins/emoji/public/images/mens.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/metal.png b/plugins/emoji/public/images/metal.png
deleted file mode 100755
index 94f1fda224..0000000000
Binary files a/plugins/emoji/public/images/metal.png and /dev/null differ
diff --git a/plugins/emoji/public/images/metro.png b/plugins/emoji/public/images/metro.png
deleted file mode 120000
index 6ffc8b5f70..0000000000
--- a/plugins/emoji/public/images/metro.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f687.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/microphone.png b/plugins/emoji/public/images/microphone.png
deleted file mode 120000
index f9f9ee1aef..0000000000
--- a/plugins/emoji/public/images/microphone.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/microscope.png b/plugins/emoji/public/images/microscope.png
deleted file mode 120000
index a41c40cdcb..0000000000
--- a/plugins/emoji/public/images/microscope.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f52c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/milky_way.png b/plugins/emoji/public/images/milky_way.png
deleted file mode 120000
index 4ae45e6713..0000000000
--- a/plugins/emoji/public/images/milky_way.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f30c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/minibus.png b/plugins/emoji/public/images/minibus.png
deleted file mode 120000
index dda7931b80..0000000000
--- a/plugins/emoji/public/images/minibus.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f690.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/minidisc.png b/plugins/emoji/public/images/minidisc.png
deleted file mode 120000
index a09f4f9dde..0000000000
--- a/plugins/emoji/public/images/minidisc.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4bd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mobile_phone_off.png b/plugins/emoji/public/images/mobile_phone_off.png
deleted file mode 120000
index c38b96953e..0000000000
--- a/plugins/emoji/public/images/mobile_phone_off.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4f4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/money_with_wings.png b/plugins/emoji/public/images/money_with_wings.png
deleted file mode 120000
index d1c8c76237..0000000000
--- a/plugins/emoji/public/images/money_with_wings.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/moneybag.png b/plugins/emoji/public/images/moneybag.png
deleted file mode 120000
index 8015c910c2..0000000000
--- a/plugins/emoji/public/images/moneybag.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/monkey.png b/plugins/emoji/public/images/monkey.png
deleted file mode 120000
index 172f99bc7f..0000000000
--- a/plugins/emoji/public/images/monkey.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f412.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/monkey_face.png b/plugins/emoji/public/images/monkey_face.png
deleted file mode 120000
index 6c12bfd986..0000000000
--- a/plugins/emoji/public/images/monkey_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f435.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/monorail.png b/plugins/emoji/public/images/monorail.png
deleted file mode 120000
index af2fababc7..0000000000
--- a/plugins/emoji/public/images/monorail.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f69d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/moon.png b/plugins/emoji/public/images/moon.png
deleted file mode 120000
index 1c589610f6..0000000000
--- a/plugins/emoji/public/images/moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f314.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mortar_board.png b/plugins/emoji/public/images/mortar_board.png
deleted file mode 120000
index 6388096e00..0000000000
--- a/plugins/emoji/public/images/mortar_board.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f393.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mount_fuji.png b/plugins/emoji/public/images/mount_fuji.png
deleted file mode 120000
index e6d48e70e4..0000000000
--- a/plugins/emoji/public/images/mount_fuji.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f5fb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mountain_bicyclist.png b/plugins/emoji/public/images/mountain_bicyclist.png
deleted file mode 120000
index 8ac95b66c5..0000000000
--- a/plugins/emoji/public/images/mountain_bicyclist.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mountain_cableway.png b/plugins/emoji/public/images/mountain_cableway.png
deleted file mode 120000
index fad5d102f5..0000000000
--- a/plugins/emoji/public/images/mountain_cableway.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mountain_railway.png b/plugins/emoji/public/images/mountain_railway.png
deleted file mode 120000
index 9eb2ff6a76..0000000000
--- a/plugins/emoji/public/images/mountain_railway.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f69e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mouse.png b/plugins/emoji/public/images/mouse.png
deleted file mode 120000
index d3fb6ff981..0000000000
--- a/plugins/emoji/public/images/mouse.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f42d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mouse2.png b/plugins/emoji/public/images/mouse2.png
deleted file mode 120000
index 6d0e846938..0000000000
--- a/plugins/emoji/public/images/mouse2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f401.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/movie_camera.png b/plugins/emoji/public/images/movie_camera.png
deleted file mode 120000
index 931edf69fc..0000000000
--- a/plugins/emoji/public/images/movie_camera.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/moyai.png b/plugins/emoji/public/images/moyai.png
deleted file mode 120000
index 0e6686365a..0000000000
--- a/plugins/emoji/public/images/moyai.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f5ff.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/muscle.png b/plugins/emoji/public/images/muscle.png
deleted file mode 120000
index 83a632d4ad..0000000000
--- a/plugins/emoji/public/images/muscle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4aa.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mushroom.png b/plugins/emoji/public/images/mushroom.png
deleted file mode 120000
index cb8f696c7d..0000000000
--- a/plugins/emoji/public/images/mushroom.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f344.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/musical_keyboard.png b/plugins/emoji/public/images/musical_keyboard.png
deleted file mode 120000
index 0607cc6805..0000000000
--- a/plugins/emoji/public/images/musical_keyboard.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/musical_note.png b/plugins/emoji/public/images/musical_note.png
deleted file mode 120000
index 0e3f7e8937..0000000000
--- a/plugins/emoji/public/images/musical_note.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/musical_score.png b/plugins/emoji/public/images/musical_score.png
deleted file mode 120000
index 14e0b39fe2..0000000000
--- a/plugins/emoji/public/images/musical_score.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3bc.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/mute.png b/plugins/emoji/public/images/mute.png
deleted file mode 120000
index 3d6fbe2a36..0000000000
--- a/plugins/emoji/public/images/mute.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f507.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/nail_care.png b/plugins/emoji/public/images/nail_care.png
deleted file mode 120000
index 3616fc5ec3..0000000000
--- a/plugins/emoji/public/images/nail_care.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f485.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/name_badge.png b/plugins/emoji/public/images/name_badge.png
deleted file mode 120000
index a0f9446728..0000000000
--- a/plugins/emoji/public/images/name_badge.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4db.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/neckbeard.png b/plugins/emoji/public/images/neckbeard.png
deleted file mode 100755
index 6158152e1d..0000000000
Binary files a/plugins/emoji/public/images/neckbeard.png and /dev/null differ
diff --git a/plugins/emoji/public/images/necktie.png b/plugins/emoji/public/images/necktie.png
deleted file mode 120000
index 485b2dbe91..0000000000
--- a/plugins/emoji/public/images/necktie.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f454.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/negative_squared_cross_mark.png b/plugins/emoji/public/images/negative_squared_cross_mark.png
deleted file mode 120000
index 584c2abc03..0000000000
--- a/plugins/emoji/public/images/negative_squared_cross_mark.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/274e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/neutral_face.png b/plugins/emoji/public/images/neutral_face.png
deleted file mode 120000
index 0c8163cd5d..0000000000
--- a/plugins/emoji/public/images/neutral_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f610.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/new.png b/plugins/emoji/public/images/new.png
deleted file mode 120000
index 53f7e4db6e..0000000000
--- a/plugins/emoji/public/images/new.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f195.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/new_moon.png b/plugins/emoji/public/images/new_moon.png
deleted file mode 120000
index 3a3fa145d1..0000000000
--- a/plugins/emoji/public/images/new_moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f311.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/new_moon_with_face.png b/plugins/emoji/public/images/new_moon_with_face.png
deleted file mode 120000
index 4cf7b98372..0000000000
--- a/plugins/emoji/public/images/new_moon_with_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f31a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/newspaper.png b/plugins/emoji/public/images/newspaper.png
deleted file mode 120000
index c293be595a..0000000000
--- a/plugins/emoji/public/images/newspaper.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4f0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ng.png b/plugins/emoji/public/images/ng.png
deleted file mode 120000
index a056925356..0000000000
--- a/plugins/emoji/public/images/ng.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f196.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/nine.png b/plugins/emoji/public/images/nine.png
deleted file mode 120000
index 98bd6bcd4f..0000000000
--- a/plugins/emoji/public/images/nine.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0039.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/no_bell.png b/plugins/emoji/public/images/no_bell.png
deleted file mode 120000
index 639986ef4b..0000000000
--- a/plugins/emoji/public/images/no_bell.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f515.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/no_bicycles.png b/plugins/emoji/public/images/no_bicycles.png
deleted file mode 120000
index 2611e3d7c2..0000000000
--- a/plugins/emoji/public/images/no_bicycles.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/no_entry.png b/plugins/emoji/public/images/no_entry.png
deleted file mode 120000
index bd28b894da..0000000000
--- a/plugins/emoji/public/images/no_entry.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26d4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/no_entry_sign.png b/plugins/emoji/public/images/no_entry_sign.png
deleted file mode 120000
index b3d86696ce..0000000000
--- a/plugins/emoji/public/images/no_entry_sign.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6ab.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/no_good.png b/plugins/emoji/public/images/no_good.png
deleted file mode 120000
index 88562a4e52..0000000000
--- a/plugins/emoji/public/images/no_good.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f645.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/no_mobile_phones.png b/plugins/emoji/public/images/no_mobile_phones.png
deleted file mode 120000
index 97d727dab2..0000000000
--- a/plugins/emoji/public/images/no_mobile_phones.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4f5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/no_mouth.png b/plugins/emoji/public/images/no_mouth.png
deleted file mode 120000
index 99800d2db0..0000000000
--- a/plugins/emoji/public/images/no_mouth.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f636.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/no_pedestrians.png b/plugins/emoji/public/images/no_pedestrians.png
deleted file mode 120000
index dd66e6bb70..0000000000
--- a/plugins/emoji/public/images/no_pedestrians.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/no_smoking.png b/plugins/emoji/public/images/no_smoking.png
deleted file mode 120000
index abaee93811..0000000000
--- a/plugins/emoji/public/images/no_smoking.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6ad.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/non-potable_water.png b/plugins/emoji/public/images/non-potable_water.png
deleted file mode 120000
index 5afedf60d4..0000000000
--- a/plugins/emoji/public/images/non-potable_water.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/nose.png b/plugins/emoji/public/images/nose.png
deleted file mode 120000
index cc5a54e20c..0000000000
--- a/plugins/emoji/public/images/nose.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f443.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/notebook.png b/plugins/emoji/public/images/notebook.png
deleted file mode 120000
index 5be93b3e44..0000000000
--- a/plugins/emoji/public/images/notebook.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/notebook_with_decorative_cover.png b/plugins/emoji/public/images/notebook_with_decorative_cover.png
deleted file mode 120000
index 3aac1dd6a3..0000000000
--- a/plugins/emoji/public/images/notebook_with_decorative_cover.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/notes.png b/plugins/emoji/public/images/notes.png
deleted file mode 120000
index 224b64f1bf..0000000000
--- a/plugins/emoji/public/images/notes.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/nut_and_bolt.png b/plugins/emoji/public/images/nut_and_bolt.png
deleted file mode 120000
index 7530f4e231..0000000000
--- a/plugins/emoji/public/images/nut_and_bolt.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f529.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/o.png b/plugins/emoji/public/images/o.png
deleted file mode 120000
index b7a481b329..0000000000
--- a/plugins/emoji/public/images/o.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2b55.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/o2.png b/plugins/emoji/public/images/o2.png
deleted file mode 120000
index abc55e2ba0..0000000000
--- a/plugins/emoji/public/images/o2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f17e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ocean.png b/plugins/emoji/public/images/ocean.png
deleted file mode 120000
index 148f04ea40..0000000000
--- a/plugins/emoji/public/images/ocean.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f30a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/octocat.png b/plugins/emoji/public/images/octocat.png
deleted file mode 100755
index 361f68224d..0000000000
Binary files a/plugins/emoji/public/images/octocat.png and /dev/null differ
diff --git a/plugins/emoji/public/images/octopus.png b/plugins/emoji/public/images/octopus.png
deleted file mode 120000
index 8538bdf06c..0000000000
--- a/plugins/emoji/public/images/octopus.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f419.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/oden.png b/plugins/emoji/public/images/oden.png
deleted file mode 120000
index b661ff2f64..0000000000
--- a/plugins/emoji/public/images/oden.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f362.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/office.png b/plugins/emoji/public/images/office.png
deleted file mode 120000
index 43213334b7..0000000000
--- a/plugins/emoji/public/images/office.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ok.png b/plugins/emoji/public/images/ok.png
deleted file mode 120000
index e44e71a7b9..0000000000
--- a/plugins/emoji/public/images/ok.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f197.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ok_hand.png b/plugins/emoji/public/images/ok_hand.png
deleted file mode 120000
index cbcef36ea1..0000000000
--- a/plugins/emoji/public/images/ok_hand.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f44c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ok_woman.png b/plugins/emoji/public/images/ok_woman.png
deleted file mode 120000
index b17c458a4f..0000000000
--- a/plugins/emoji/public/images/ok_woman.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f646.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/older_man.png b/plugins/emoji/public/images/older_man.png
deleted file mode 120000
index 75f2f552ab..0000000000
--- a/plugins/emoji/public/images/older_man.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f474.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/older_woman.png b/plugins/emoji/public/images/older_woman.png
deleted file mode 120000
index 78ead72191..0000000000
--- a/plugins/emoji/public/images/older_woman.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f475.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/on.png b/plugins/emoji/public/images/on.png
deleted file mode 120000
index f16f702e35..0000000000
--- a/plugins/emoji/public/images/on.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f51b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/oncoming_automobile.png b/plugins/emoji/public/images/oncoming_automobile.png
deleted file mode 120000
index 9c65b63602..0000000000
--- a/plugins/emoji/public/images/oncoming_automobile.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f698.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/oncoming_bus.png b/plugins/emoji/public/images/oncoming_bus.png
deleted file mode 120000
index 6c9981c7fe..0000000000
--- a/plugins/emoji/public/images/oncoming_bus.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f68d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/oncoming_police_car.png b/plugins/emoji/public/images/oncoming_police_car.png
deleted file mode 120000
index 6fbae18580..0000000000
--- a/plugins/emoji/public/images/oncoming_police_car.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f694.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/oncoming_taxi.png b/plugins/emoji/public/images/oncoming_taxi.png
deleted file mode 120000
index d56b95af63..0000000000
--- a/plugins/emoji/public/images/oncoming_taxi.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f696.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/one.png b/plugins/emoji/public/images/one.png
deleted file mode 120000
index a3301c8928..0000000000
--- a/plugins/emoji/public/images/one.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0031.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/open_book.png b/plugins/emoji/public/images/open_book.png
deleted file mode 120000
index c95e97943c..0000000000
--- a/plugins/emoji/public/images/open_book.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/open_file_folder.png b/plugins/emoji/public/images/open_file_folder.png
deleted file mode 120000
index 64c9f9b801..0000000000
--- a/plugins/emoji/public/images/open_file_folder.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/open_hands.png b/plugins/emoji/public/images/open_hands.png
deleted file mode 120000
index dd19ce87a0..0000000000
--- a/plugins/emoji/public/images/open_hands.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f450.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/open_mouth.png b/plugins/emoji/public/images/open_mouth.png
deleted file mode 120000
index faf9722b82..0000000000
--- a/plugins/emoji/public/images/open_mouth.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f62e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ophiuchus.png b/plugins/emoji/public/images/ophiuchus.png
deleted file mode 120000
index 1c080c45ba..0000000000
--- a/plugins/emoji/public/images/ophiuchus.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26ce.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/orange_book.png b/plugins/emoji/public/images/orange_book.png
deleted file mode 120000
index 056958e9a9..0000000000
--- a/plugins/emoji/public/images/orange_book.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/outbox_tray.png b/plugins/emoji/public/images/outbox_tray.png
deleted file mode 120000
index 02e496e900..0000000000
--- a/plugins/emoji/public/images/outbox_tray.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ox.png b/plugins/emoji/public/images/ox.png
deleted file mode 120000
index 51a3aa6662..0000000000
--- a/plugins/emoji/public/images/ox.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f402.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/package.png b/plugins/emoji/public/images/package.png
deleted file mode 120000
index e017037118..0000000000
--- a/plugins/emoji/public/images/package.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/page_facing_up.png b/plugins/emoji/public/images/page_facing_up.png
deleted file mode 120000
index 4163893650..0000000000
--- a/plugins/emoji/public/images/page_facing_up.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/page_with_curl.png b/plugins/emoji/public/images/page_with_curl.png
deleted file mode 120000
index 5ca7256099..0000000000
--- a/plugins/emoji/public/images/page_with_curl.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4c3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pager.png b/plugins/emoji/public/images/pager.png
deleted file mode 120000
index aa013af26c..0000000000
--- a/plugins/emoji/public/images/pager.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4df.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/palm_tree.png b/plugins/emoji/public/images/palm_tree.png
deleted file mode 120000
index 8025f633d0..0000000000
--- a/plugins/emoji/public/images/palm_tree.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f334.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/panda_face.png b/plugins/emoji/public/images/panda_face.png
deleted file mode 120000
index 54581cc7a9..0000000000
--- a/plugins/emoji/public/images/panda_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f43c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/paperclip.png b/plugins/emoji/public/images/paperclip.png
deleted file mode 120000
index c189521a20..0000000000
--- a/plugins/emoji/public/images/paperclip.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ce.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/parking.png b/plugins/emoji/public/images/parking.png
deleted file mode 120000
index beeeaff5df..0000000000
--- a/plugins/emoji/public/images/parking.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f17f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/part_alternation_mark.png b/plugins/emoji/public/images/part_alternation_mark.png
deleted file mode 120000
index 97e7244cd7..0000000000
--- a/plugins/emoji/public/images/part_alternation_mark.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/303d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/partly_sunny.png b/plugins/emoji/public/images/partly_sunny.png
deleted file mode 120000
index aae87e0fb4..0000000000
--- a/plugins/emoji/public/images/partly_sunny.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26c5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/passport_control.png b/plugins/emoji/public/images/passport_control.png
deleted file mode 120000
index c14ffc60ca..0000000000
--- a/plugins/emoji/public/images/passport_control.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6c2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/paw_prints.png b/plugins/emoji/public/images/paw_prints.png
deleted file mode 120000
index bbb76f06be..0000000000
--- a/plugins/emoji/public/images/paw_prints.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f43e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/peach.png b/plugins/emoji/public/images/peach.png
deleted file mode 120000
index c6932993a6..0000000000
--- a/plugins/emoji/public/images/peach.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f351.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pear.png b/plugins/emoji/public/images/pear.png
deleted file mode 120000
index 973048cc6a..0000000000
--- a/plugins/emoji/public/images/pear.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f350.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pencil.png b/plugins/emoji/public/images/pencil.png
deleted file mode 120000
index 86cf768615..0000000000
--- a/plugins/emoji/public/images/pencil.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4dd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pencil2.png b/plugins/emoji/public/images/pencil2.png
deleted file mode 120000
index a32c1634d1..0000000000
--- a/plugins/emoji/public/images/pencil2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/270f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/penguin.png b/plugins/emoji/public/images/penguin.png
deleted file mode 120000
index 1d705fb24d..0000000000
--- a/plugins/emoji/public/images/penguin.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f427.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pensive.png b/plugins/emoji/public/images/pensive.png
deleted file mode 120000
index 65dc755517..0000000000
--- a/plugins/emoji/public/images/pensive.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f614.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/performing_arts.png b/plugins/emoji/public/images/performing_arts.png
deleted file mode 120000
index a1ec9abcfd..0000000000
--- a/plugins/emoji/public/images/performing_arts.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ad.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/persevere.png b/plugins/emoji/public/images/persevere.png
deleted file mode 120000
index ff9960484c..0000000000
--- a/plugins/emoji/public/images/persevere.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f623.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/person_frowning.png b/plugins/emoji/public/images/person_frowning.png
deleted file mode 120000
index dba4617b84..0000000000
--- a/plugins/emoji/public/images/person_frowning.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f64d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/person_with_blond_hair.png b/plugins/emoji/public/images/person_with_blond_hair.png
deleted file mode 120000
index 20d9b2624f..0000000000
--- a/plugins/emoji/public/images/person_with_blond_hair.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f471.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/person_with_pouting_face.png b/plugins/emoji/public/images/person_with_pouting_face.png
deleted file mode 120000
index c59a4b2688..0000000000
--- a/plugins/emoji/public/images/person_with_pouting_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f64e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/phone.png b/plugins/emoji/public/images/phone.png
deleted file mode 120000
index 66f023aaaa..0000000000
--- a/plugins/emoji/public/images/phone.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/260e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pig.png b/plugins/emoji/public/images/pig.png
deleted file mode 120000
index 1168b408d9..0000000000
--- a/plugins/emoji/public/images/pig.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f437.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pig2.png b/plugins/emoji/public/images/pig2.png
deleted file mode 120000
index b8f3054e33..0000000000
--- a/plugins/emoji/public/images/pig2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f416.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pig_nose.png b/plugins/emoji/public/images/pig_nose.png
deleted file mode 120000
index 67a14dd630..0000000000
--- a/plugins/emoji/public/images/pig_nose.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f43d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pill.png b/plugins/emoji/public/images/pill.png
deleted file mode 120000
index 39055ebe57..0000000000
--- a/plugins/emoji/public/images/pill.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f48a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pineapple.png b/plugins/emoji/public/images/pineapple.png
deleted file mode 120000
index b51c51c6c3..0000000000
--- a/plugins/emoji/public/images/pineapple.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f34d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pisces.png b/plugins/emoji/public/images/pisces.png
deleted file mode 120000
index 4f9bcf4f81..0000000000
--- a/plugins/emoji/public/images/pisces.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2653.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pizza.png b/plugins/emoji/public/images/pizza.png
deleted file mode 120000
index 0fc4d8d1a7..0000000000
--- a/plugins/emoji/public/images/pizza.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f355.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/point_down.png b/plugins/emoji/public/images/point_down.png
deleted file mode 120000
index 841155d40c..0000000000
--- a/plugins/emoji/public/images/point_down.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f447.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/point_left.png b/plugins/emoji/public/images/point_left.png
deleted file mode 120000
index 79d5ab40be..0000000000
--- a/plugins/emoji/public/images/point_left.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f448.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/point_right.png b/plugins/emoji/public/images/point_right.png
deleted file mode 120000
index c94f84fe84..0000000000
--- a/plugins/emoji/public/images/point_right.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f449.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/point_up.png b/plugins/emoji/public/images/point_up.png
deleted file mode 120000
index a25e2e1d23..0000000000
--- a/plugins/emoji/public/images/point_up.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/261d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/point_up_2.png b/plugins/emoji/public/images/point_up_2.png
deleted file mode 120000
index c3589e1ed3..0000000000
--- a/plugins/emoji/public/images/point_up_2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f446.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/police_car.png b/plugins/emoji/public/images/police_car.png
deleted file mode 120000
index 6ecd04aa30..0000000000
--- a/plugins/emoji/public/images/police_car.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f693.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/poodle.png b/plugins/emoji/public/images/poodle.png
deleted file mode 120000
index 8bb4520ac0..0000000000
--- a/plugins/emoji/public/images/poodle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f429.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/poop.png b/plugins/emoji/public/images/poop.png
deleted file mode 120000
index c8c5a772b2..0000000000
--- a/plugins/emoji/public/images/poop.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/post_office.png b/plugins/emoji/public/images/post_office.png
deleted file mode 120000
index b4f8f20a75..0000000000
--- a/plugins/emoji/public/images/post_office.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3e3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/postal_horn.png b/plugins/emoji/public/images/postal_horn.png
deleted file mode 120000
index ade3f6cc14..0000000000
--- a/plugins/emoji/public/images/postal_horn.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ef.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/postbox.png b/plugins/emoji/public/images/postbox.png
deleted file mode 120000
index 86bcd458c0..0000000000
--- a/plugins/emoji/public/images/postbox.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ee.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/potable_water.png b/plugins/emoji/public/images/potable_water.png
deleted file mode 120000
index dab0e117fb..0000000000
--- a/plugins/emoji/public/images/potable_water.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pouch.png b/plugins/emoji/public/images/pouch.png
deleted file mode 120000
index 0fdd953a19..0000000000
--- a/plugins/emoji/public/images/pouch.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f45d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/poultry_leg.png b/plugins/emoji/public/images/poultry_leg.png
deleted file mode 120000
index 7e3d37f108..0000000000
--- a/plugins/emoji/public/images/poultry_leg.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f357.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pound.png b/plugins/emoji/public/images/pound.png
deleted file mode 120000
index 74d086bb9d..0000000000
--- a/plugins/emoji/public/images/pound.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pouting_cat.png b/plugins/emoji/public/images/pouting_cat.png
deleted file mode 120000
index 9f7aff80a0..0000000000
--- a/plugins/emoji/public/images/pouting_cat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f63e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pray.png b/plugins/emoji/public/images/pray.png
deleted file mode 120000
index 8147900a9c..0000000000
--- a/plugins/emoji/public/images/pray.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f64f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/princess.png b/plugins/emoji/public/images/princess.png
deleted file mode 120000
index 652d0925fe..0000000000
--- a/plugins/emoji/public/images/princess.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f478.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/punch.png b/plugins/emoji/public/images/punch.png
deleted file mode 120000
index 2423b707f2..0000000000
--- a/plugins/emoji/public/images/punch.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f44a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/purple_heart.png b/plugins/emoji/public/images/purple_heart.png
deleted file mode 120000
index d48fc7f7a3..0000000000
--- a/plugins/emoji/public/images/purple_heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f49c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/purse.png b/plugins/emoji/public/images/purse.png
deleted file mode 120000
index edb70ffc8c..0000000000
--- a/plugins/emoji/public/images/purse.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f45b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/pushpin.png b/plugins/emoji/public/images/pushpin.png
deleted file mode 120000
index 9a99e83c2e..0000000000
--- a/plugins/emoji/public/images/pushpin.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4cc.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/put_litter_in_its_place.png b/plugins/emoji/public/images/put_litter_in_its_place.png
deleted file mode 120000
index 45a9ed4984..0000000000
--- a/plugins/emoji/public/images/put_litter_in_its_place.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6ae.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/question.png b/plugins/emoji/public/images/question.png
deleted file mode 120000
index a88af087b6..0000000000
--- a/plugins/emoji/public/images/question.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2753.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rabbit.png b/plugins/emoji/public/images/rabbit.png
deleted file mode 120000
index 9d6e712c5e..0000000000
--- a/plugins/emoji/public/images/rabbit.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f430.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rabbit2.png b/plugins/emoji/public/images/rabbit2.png
deleted file mode 120000
index 6abf31f2fa..0000000000
--- a/plugins/emoji/public/images/rabbit2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f407.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/racehorse.png b/plugins/emoji/public/images/racehorse.png
deleted file mode 120000
index 4aa454bdc1..0000000000
--- a/plugins/emoji/public/images/racehorse.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f40e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/radio.png b/plugins/emoji/public/images/radio.png
deleted file mode 120000
index 10610ef401..0000000000
--- a/plugins/emoji/public/images/radio.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4fb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/radio_button.png b/plugins/emoji/public/images/radio_button.png
deleted file mode 120000
index fb91e155c5..0000000000
--- a/plugins/emoji/public/images/radio_button.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f518.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rage.png b/plugins/emoji/public/images/rage.png
deleted file mode 120000
index ba281221bd..0000000000
--- a/plugins/emoji/public/images/rage.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f621.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rage1.png b/plugins/emoji/public/images/rage1.png
deleted file mode 100755
index f0c4ece775..0000000000
Binary files a/plugins/emoji/public/images/rage1.png and /dev/null differ
diff --git a/plugins/emoji/public/images/rage2.png b/plugins/emoji/public/images/rage2.png
deleted file mode 100755
index f792e063b4..0000000000
Binary files a/plugins/emoji/public/images/rage2.png and /dev/null differ
diff --git a/plugins/emoji/public/images/rage3.png b/plugins/emoji/public/images/rage3.png
deleted file mode 100755
index 58764cbcb3..0000000000
Binary files a/plugins/emoji/public/images/rage3.png and /dev/null differ
diff --git a/plugins/emoji/public/images/rage4.png b/plugins/emoji/public/images/rage4.png
deleted file mode 100755
index c726c94a29..0000000000
Binary files a/plugins/emoji/public/images/rage4.png and /dev/null differ
diff --git a/plugins/emoji/public/images/railway_car.png b/plugins/emoji/public/images/railway_car.png
deleted file mode 120000
index 856483debc..0000000000
--- a/plugins/emoji/public/images/railway_car.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f683.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rainbow.png b/plugins/emoji/public/images/rainbow.png
deleted file mode 120000
index 1a6b41464a..0000000000
--- a/plugins/emoji/public/images/rainbow.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f308.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/raised_hand.png b/plugins/emoji/public/images/raised_hand.png
deleted file mode 120000
index da39fb0cba..0000000000
--- a/plugins/emoji/public/images/raised_hand.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/270b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/raised_hands.png b/plugins/emoji/public/images/raised_hands.png
deleted file mode 120000
index 3bac5029e8..0000000000
--- a/plugins/emoji/public/images/raised_hands.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f64c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/raising_hand.png b/plugins/emoji/public/images/raising_hand.png
deleted file mode 120000
index 9ec42be095..0000000000
--- a/plugins/emoji/public/images/raising_hand.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f64b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ram.png b/plugins/emoji/public/images/ram.png
deleted file mode 120000
index f1be38c0b3..0000000000
--- a/plugins/emoji/public/images/ram.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f40f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ramen.png b/plugins/emoji/public/images/ramen.png
deleted file mode 120000
index 62e320ac46..0000000000
--- a/plugins/emoji/public/images/ramen.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f35c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rat.png b/plugins/emoji/public/images/rat.png
deleted file mode 120000
index 800b1e0f58..0000000000
--- a/plugins/emoji/public/images/rat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f400.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/recycle.png b/plugins/emoji/public/images/recycle.png
deleted file mode 120000
index 54db0b3cdd..0000000000
--- a/plugins/emoji/public/images/recycle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/267b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/red_car.png b/plugins/emoji/public/images/red_car.png
deleted file mode 120000
index 5c765c0c78..0000000000
--- a/plugins/emoji/public/images/red_car.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f697.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/red_circle.png b/plugins/emoji/public/images/red_circle.png
deleted file mode 120000
index 1d117854ed..0000000000
--- a/plugins/emoji/public/images/red_circle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f534.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/registered.png b/plugins/emoji/public/images/registered.png
deleted file mode 120000
index 572704d8d9..0000000000
--- a/plugins/emoji/public/images/registered.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/00ae.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/relaxed.png b/plugins/emoji/public/images/relaxed.png
deleted file mode 120000
index 0d6faed0cc..0000000000
--- a/plugins/emoji/public/images/relaxed.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/263a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/relieved.png b/plugins/emoji/public/images/relieved.png
deleted file mode 120000
index eff71dca1e..0000000000
--- a/plugins/emoji/public/images/relieved.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f60c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/repeat.png b/plugins/emoji/public/images/repeat.png
deleted file mode 120000
index b27d6969ab..0000000000
--- a/plugins/emoji/public/images/repeat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f501.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/repeat_one.png b/plugins/emoji/public/images/repeat_one.png
deleted file mode 120000
index 22541207a2..0000000000
--- a/plugins/emoji/public/images/repeat_one.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f502.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/restroom.png b/plugins/emoji/public/images/restroom.png
deleted file mode 120000
index d36f59f72d..0000000000
--- a/plugins/emoji/public/images/restroom.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6bb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/revolving_hearts.png b/plugins/emoji/public/images/revolving_hearts.png
deleted file mode 120000
index 081b988d4a..0000000000
--- a/plugins/emoji/public/images/revolving_hearts.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f49e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rewind.png b/plugins/emoji/public/images/rewind.png
deleted file mode 120000
index d6fe513e0c..0000000000
--- a/plugins/emoji/public/images/rewind.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/23ea.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ribbon.png b/plugins/emoji/public/images/ribbon.png
deleted file mode 120000
index 391cb4a4ef..0000000000
--- a/plugins/emoji/public/images/ribbon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f380.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rice.png b/plugins/emoji/public/images/rice.png
deleted file mode 120000
index b780fb5f1f..0000000000
--- a/plugins/emoji/public/images/rice.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f35a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rice_ball.png b/plugins/emoji/public/images/rice_ball.png
deleted file mode 120000
index 2a7653a0d5..0000000000
--- a/plugins/emoji/public/images/rice_ball.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f359.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rice_cracker.png b/plugins/emoji/public/images/rice_cracker.png
deleted file mode 120000
index 0967178292..0000000000
--- a/plugins/emoji/public/images/rice_cracker.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f358.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rice_scene.png b/plugins/emoji/public/images/rice_scene.png
deleted file mode 120000
index 3a4c66d9fc..0000000000
--- a/plugins/emoji/public/images/rice_scene.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f391.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ring.png b/plugins/emoji/public/images/ring.png
deleted file mode 120000
index d7939e188d..0000000000
--- a/plugins/emoji/public/images/ring.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f48d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rocket.png b/plugins/emoji/public/images/rocket.png
deleted file mode 120000
index a00f435375..0000000000
--- a/plugins/emoji/public/images/rocket.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f680.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/roller_coaster.png b/plugins/emoji/public/images/roller_coaster.png
deleted file mode 120000
index 52322e0a85..0000000000
--- a/plugins/emoji/public/images/roller_coaster.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rooster.png b/plugins/emoji/public/images/rooster.png
deleted file mode 120000
index 68d4162887..0000000000
--- a/plugins/emoji/public/images/rooster.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f413.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rose.png b/plugins/emoji/public/images/rose.png
deleted file mode 120000
index a5b12117ac..0000000000
--- a/plugins/emoji/public/images/rose.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f339.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rotating_light.png b/plugins/emoji/public/images/rotating_light.png
deleted file mode 120000
index 3df341839f..0000000000
--- a/plugins/emoji/public/images/rotating_light.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/round_pushpin.png b/plugins/emoji/public/images/round_pushpin.png
deleted file mode 120000
index bf066c15b8..0000000000
--- a/plugins/emoji/public/images/round_pushpin.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4cd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rowboat.png b/plugins/emoji/public/images/rowboat.png
deleted file mode 120000
index 6a1d209ef9..0000000000
--- a/plugins/emoji/public/images/rowboat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ru.png b/plugins/emoji/public/images/ru.png
deleted file mode 120000
index f8127305c8..0000000000
--- a/plugins/emoji/public/images/ru.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1f7-1f1fa.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/rugby_football.png b/plugins/emoji/public/images/rugby_football.png
deleted file mode 120000
index 4036943094..0000000000
--- a/plugins/emoji/public/images/rugby_football.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/runner.png b/plugins/emoji/public/images/runner.png
deleted file mode 120000
index 31876ed57d..0000000000
--- a/plugins/emoji/public/images/runner.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/running.png b/plugins/emoji/public/images/running.png
deleted file mode 120000
index 31876ed57d..0000000000
--- a/plugins/emoji/public/images/running.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/running_shirt_with_sash.png b/plugins/emoji/public/images/running_shirt_with_sash.png
deleted file mode 120000
index ed68ed7fd0..0000000000
--- a/plugins/emoji/public/images/running_shirt_with_sash.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3bd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sa.png b/plugins/emoji/public/images/sa.png
deleted file mode 120000
index 2aea26241a..0000000000
--- a/plugins/emoji/public/images/sa.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f202.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sagittarius.png b/plugins/emoji/public/images/sagittarius.png
deleted file mode 120000
index 32a4664e75..0000000000
--- a/plugins/emoji/public/images/sagittarius.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2650.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sailboat.png b/plugins/emoji/public/images/sailboat.png
deleted file mode 120000
index e134ebd6c2..0000000000
--- a/plugins/emoji/public/images/sailboat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26f5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sake.png b/plugins/emoji/public/images/sake.png
deleted file mode 120000
index b5ecf47b18..0000000000
--- a/plugins/emoji/public/images/sake.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f376.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sandal.png b/plugins/emoji/public/images/sandal.png
deleted file mode 120000
index 055679cd47..0000000000
--- a/plugins/emoji/public/images/sandal.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f461.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/santa.png b/plugins/emoji/public/images/santa.png
deleted file mode 120000
index 46dbff73b6..0000000000
--- a/plugins/emoji/public/images/santa.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f385.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/satellite.png b/plugins/emoji/public/images/satellite.png
deleted file mode 120000
index ac1972e1ed..0000000000
--- a/plugins/emoji/public/images/satellite.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4e1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/satisfied.png b/plugins/emoji/public/images/satisfied.png
deleted file mode 120000
index 7332e39078..0000000000
--- a/plugins/emoji/public/images/satisfied.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f606.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/saxophone.png b/plugins/emoji/public/images/saxophone.png
deleted file mode 120000
index 17e34d3ad9..0000000000
--- a/plugins/emoji/public/images/saxophone.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/school.png b/plugins/emoji/public/images/school.png
deleted file mode 120000
index 2556e5de1a..0000000000
--- a/plugins/emoji/public/images/school.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3eb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/school_satchel.png b/plugins/emoji/public/images/school_satchel.png
deleted file mode 120000
index e759bebaec..0000000000
--- a/plugins/emoji/public/images/school_satchel.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f392.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/scissors.png b/plugins/emoji/public/images/scissors.png
deleted file mode 120000
index d0926ff167..0000000000
--- a/plugins/emoji/public/images/scissors.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2702.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/scorpius.png b/plugins/emoji/public/images/scorpius.png
deleted file mode 120000
index 3bc6ce3d78..0000000000
--- a/plugins/emoji/public/images/scorpius.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/264f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/scream.png b/plugins/emoji/public/images/scream.png
deleted file mode 120000
index f58990499e..0000000000
--- a/plugins/emoji/public/images/scream.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f631.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/scream_cat.png b/plugins/emoji/public/images/scream_cat.png
deleted file mode 120000
index 819f2ccc88..0000000000
--- a/plugins/emoji/public/images/scream_cat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f640.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/scroll.png b/plugins/emoji/public/images/scroll.png
deleted file mode 120000
index 4934e3c551..0000000000
--- a/plugins/emoji/public/images/scroll.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4dc.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/seat.png b/plugins/emoji/public/images/seat.png
deleted file mode 120000
index d3a3691abb..0000000000
--- a/plugins/emoji/public/images/seat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ba.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/secret.png b/plugins/emoji/public/images/secret.png
deleted file mode 120000
index 3d51edf34b..0000000000
--- a/plugins/emoji/public/images/secret.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/3299.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/see_no_evil.png b/plugins/emoji/public/images/see_no_evil.png
deleted file mode 120000
index c26c37613a..0000000000
--- a/plugins/emoji/public/images/see_no_evil.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f648.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/seedling.png b/plugins/emoji/public/images/seedling.png
deleted file mode 120000
index 2f5b12a4dc..0000000000
--- a/plugins/emoji/public/images/seedling.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f331.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/seven.png b/plugins/emoji/public/images/seven.png
deleted file mode 120000
index 05e58f0740..0000000000
--- a/plugins/emoji/public/images/seven.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0037.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/shaved_ice.png b/plugins/emoji/public/images/shaved_ice.png
deleted file mode 120000
index 7821ea98d0..0000000000
--- a/plugins/emoji/public/images/shaved_ice.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f367.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sheep.png b/plugins/emoji/public/images/sheep.png
deleted file mode 120000
index a4b8d9ad0c..0000000000
--- a/plugins/emoji/public/images/sheep.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f411.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/shell.png b/plugins/emoji/public/images/shell.png
deleted file mode 120000
index 4d7bd4d36e..0000000000
--- a/plugins/emoji/public/images/shell.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f41a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ship.png b/plugins/emoji/public/images/ship.png
deleted file mode 120000
index cfc1dabd2c..0000000000
--- a/plugins/emoji/public/images/ship.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/shipit.png b/plugins/emoji/public/images/shipit.png
deleted file mode 100755
index a58a47f62f..0000000000
Binary files a/plugins/emoji/public/images/shipit.png and /dev/null differ
diff --git a/plugins/emoji/public/images/shirt.png b/plugins/emoji/public/images/shirt.png
deleted file mode 120000
index 205cc1b9c1..0000000000
--- a/plugins/emoji/public/images/shirt.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f455.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/shit.png b/plugins/emoji/public/images/shit.png
deleted file mode 120000
index c8c5a772b2..0000000000
--- a/plugins/emoji/public/images/shit.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/shoe.png b/plugins/emoji/public/images/shoe.png
deleted file mode 120000
index cb54be7b1d..0000000000
--- a/plugins/emoji/public/images/shoe.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f45e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/shower.png b/plugins/emoji/public/images/shower.png
deleted file mode 120000
index 0d8bdc0d31..0000000000
--- a/plugins/emoji/public/images/shower.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6bf.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/signal_strength.png b/plugins/emoji/public/images/signal_strength.png
deleted file mode 120000
index 624174c45c..0000000000
--- a/plugins/emoji/public/images/signal_strength.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4f6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/six.png b/plugins/emoji/public/images/six.png
deleted file mode 120000
index cbbfc282d9..0000000000
--- a/plugins/emoji/public/images/six.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0036.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/six_pointed_star.png b/plugins/emoji/public/images/six_pointed_star.png
deleted file mode 120000
index 37915ad505..0000000000
--- a/plugins/emoji/public/images/six_pointed_star.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f52f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ski.png b/plugins/emoji/public/images/ski.png
deleted file mode 120000
index f0c31115ac..0000000000
--- a/plugins/emoji/public/images/ski.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3bf.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/skull.png b/plugins/emoji/public/images/skull.png
deleted file mode 120000
index 86bcc55a69..0000000000
--- a/plugins/emoji/public/images/skull.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f480.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sleeping.png b/plugins/emoji/public/images/sleeping.png
deleted file mode 120000
index afe6ef800a..0000000000
--- a/plugins/emoji/public/images/sleeping.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f634.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sleepy.png b/plugins/emoji/public/images/sleepy.png
deleted file mode 120000
index 4f23760b3b..0000000000
--- a/plugins/emoji/public/images/sleepy.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f62a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/slot_machine.png b/plugins/emoji/public/images/slot_machine.png
deleted file mode 120000
index 24080bb7c0..0000000000
--- a/plugins/emoji/public/images/slot_machine.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3b0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/small_blue_diamond.png b/plugins/emoji/public/images/small_blue_diamond.png
deleted file mode 120000
index 95b4b9fc6d..0000000000
--- a/plugins/emoji/public/images/small_blue_diamond.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f539.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/small_orange_diamond.png b/plugins/emoji/public/images/small_orange_diamond.png
deleted file mode 120000
index e85dbee309..0000000000
--- a/plugins/emoji/public/images/small_orange_diamond.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f538.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/small_red_triangle.png b/plugins/emoji/public/images/small_red_triangle.png
deleted file mode 120000
index 53ab4364fe..0000000000
--- a/plugins/emoji/public/images/small_red_triangle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f53a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/small_red_triangle_down.png b/plugins/emoji/public/images/small_red_triangle_down.png
deleted file mode 120000
index 62231574e0..0000000000
--- a/plugins/emoji/public/images/small_red_triangle_down.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f53b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/smile.png b/plugins/emoji/public/images/smile.png
deleted file mode 120000
index 6e88ed0688..0000000000
--- a/plugins/emoji/public/images/smile.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f604.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/smile_cat.png b/plugins/emoji/public/images/smile_cat.png
deleted file mode 120000
index d0fc083b08..0000000000
--- a/plugins/emoji/public/images/smile_cat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f638.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/smiley.png b/plugins/emoji/public/images/smiley.png
deleted file mode 120000
index cd824362b9..0000000000
--- a/plugins/emoji/public/images/smiley.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f603.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/smiley_cat.png b/plugins/emoji/public/images/smiley_cat.png
deleted file mode 120000
index bbb10516d9..0000000000
--- a/plugins/emoji/public/images/smiley_cat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f63a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/smiling_imp.png b/plugins/emoji/public/images/smiling_imp.png
deleted file mode 120000
index 6327d19dbe..0000000000
--- a/plugins/emoji/public/images/smiling_imp.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f608.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/smirk.png b/plugins/emoji/public/images/smirk.png
deleted file mode 120000
index c8527f9616..0000000000
--- a/plugins/emoji/public/images/smirk.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f60f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/smirk_cat.png b/plugins/emoji/public/images/smirk_cat.png
deleted file mode 120000
index e95f6580d8..0000000000
--- a/plugins/emoji/public/images/smirk_cat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f63c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/smoking.png b/plugins/emoji/public/images/smoking.png
deleted file mode 120000
index 37b8ea6776..0000000000
--- a/plugins/emoji/public/images/smoking.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6ac.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/snail.png b/plugins/emoji/public/images/snail.png
deleted file mode 120000
index a1f472956b..0000000000
--- a/plugins/emoji/public/images/snail.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f40c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/snake.png b/plugins/emoji/public/images/snake.png
deleted file mode 120000
index 5cbb33b8f9..0000000000
--- a/plugins/emoji/public/images/snake.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f40d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/snowboarder.png b/plugins/emoji/public/images/snowboarder.png
deleted file mode 120000
index 6fabb940ea..0000000000
--- a/plugins/emoji/public/images/snowboarder.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c2.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/snowflake.png b/plugins/emoji/public/images/snowflake.png
deleted file mode 120000
index 0bd4292cb2..0000000000
--- a/plugins/emoji/public/images/snowflake.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2744.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/snowman.png b/plugins/emoji/public/images/snowman.png
deleted file mode 120000
index fd41bb720e..0000000000
--- a/plugins/emoji/public/images/snowman.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26c4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sob.png b/plugins/emoji/public/images/sob.png
deleted file mode 120000
index 93cd7336ab..0000000000
--- a/plugins/emoji/public/images/sob.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f62d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/soccer.png b/plugins/emoji/public/images/soccer.png
deleted file mode 120000
index 3912f45b09..0000000000
--- a/plugins/emoji/public/images/soccer.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26bd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/soon.png b/plugins/emoji/public/images/soon.png
deleted file mode 120000
index 1da86c8f67..0000000000
--- a/plugins/emoji/public/images/soon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f51c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sos.png b/plugins/emoji/public/images/sos.png
deleted file mode 120000
index 5b52ee755f..0000000000
--- a/plugins/emoji/public/images/sos.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f198.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sound.png b/plugins/emoji/public/images/sound.png
deleted file mode 120000
index ae84808364..0000000000
--- a/plugins/emoji/public/images/sound.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f509.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/space_invader.png b/plugins/emoji/public/images/space_invader.png
deleted file mode 120000
index 95098aee70..0000000000
--- a/plugins/emoji/public/images/space_invader.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f47e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/spades.png b/plugins/emoji/public/images/spades.png
deleted file mode 120000
index 561cea045e..0000000000
--- a/plugins/emoji/public/images/spades.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2660.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/spaghetti.png b/plugins/emoji/public/images/spaghetti.png
deleted file mode 120000
index 8be51b22e1..0000000000
--- a/plugins/emoji/public/images/spaghetti.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f35d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sparkle.png b/plugins/emoji/public/images/sparkle.png
deleted file mode 120000
index a80be6f2c7..0000000000
--- a/plugins/emoji/public/images/sparkle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2747.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sparkler.png b/plugins/emoji/public/images/sparkler.png
deleted file mode 120000
index d74142a41f..0000000000
--- a/plugins/emoji/public/images/sparkler.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f387.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sparkles.png b/plugins/emoji/public/images/sparkles.png
deleted file mode 120000
index d35a70592b..0000000000
--- a/plugins/emoji/public/images/sparkles.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2728.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sparkling_heart.png b/plugins/emoji/public/images/sparkling_heart.png
deleted file mode 120000
index e9eba4e15d..0000000000
--- a/plugins/emoji/public/images/sparkling_heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f496.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/speak_no_evil.png b/plugins/emoji/public/images/speak_no_evil.png
deleted file mode 120000
index c64efd7fcc..0000000000
--- a/plugins/emoji/public/images/speak_no_evil.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f64a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/speaker.png b/plugins/emoji/public/images/speaker.png
deleted file mode 120000
index 4fc46c2c4a..0000000000
--- a/plugins/emoji/public/images/speaker.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f50a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/speech_balloon.png b/plugins/emoji/public/images/speech_balloon.png
deleted file mode 120000
index 978d8aeaee..0000000000
--- a/plugins/emoji/public/images/speech_balloon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ac.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/speedboat.png b/plugins/emoji/public/images/speedboat.png
deleted file mode 120000
index a96e6aea2e..0000000000
--- a/plugins/emoji/public/images/speedboat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/squirrel.png b/plugins/emoji/public/images/squirrel.png
deleted file mode 100755
index a58a47f62f..0000000000
Binary files a/plugins/emoji/public/images/squirrel.png and /dev/null differ
diff --git a/plugins/emoji/public/images/star.png b/plugins/emoji/public/images/star.png
deleted file mode 120000
index 2e34a9cee6..0000000000
--- a/plugins/emoji/public/images/star.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2b50.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/star2.png b/plugins/emoji/public/images/star2.png
deleted file mode 120000
index 77788513ec..0000000000
--- a/plugins/emoji/public/images/star2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f31f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/stars.png b/plugins/emoji/public/images/stars.png
deleted file mode 120000
index 8a30b37eb4..0000000000
--- a/plugins/emoji/public/images/stars.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f303.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/station.png b/plugins/emoji/public/images/station.png
deleted file mode 120000
index 2d6d3d0f07..0000000000
--- a/plugins/emoji/public/images/station.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f689.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/statue_of_liberty.png b/plugins/emoji/public/images/statue_of_liberty.png
deleted file mode 120000
index 4fe98ac34d..0000000000
--- a/plugins/emoji/public/images/statue_of_liberty.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f5fd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/steam_locomotive.png b/plugins/emoji/public/images/steam_locomotive.png
deleted file mode 120000
index b7e90514fc..0000000000
--- a/plugins/emoji/public/images/steam_locomotive.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f682.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/stew.png b/plugins/emoji/public/images/stew.png
deleted file mode 120000
index ecb6aa2c12..0000000000
--- a/plugins/emoji/public/images/stew.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f372.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/straight_ruler.png b/plugins/emoji/public/images/straight_ruler.png
deleted file mode 120000
index fffdaa0c90..0000000000
--- a/plugins/emoji/public/images/straight_ruler.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4cf.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/strawberry.png b/plugins/emoji/public/images/strawberry.png
deleted file mode 120000
index 3028b59a19..0000000000
--- a/plugins/emoji/public/images/strawberry.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f353.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/stuck_out_tongue.png b/plugins/emoji/public/images/stuck_out_tongue.png
deleted file mode 120000
index f17b1c16bd..0000000000
--- a/plugins/emoji/public/images/stuck_out_tongue.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f61b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/stuck_out_tongue_closed_eyes.png b/plugins/emoji/public/images/stuck_out_tongue_closed_eyes.png
deleted file mode 120000
index 60199fedda..0000000000
--- a/plugins/emoji/public/images/stuck_out_tongue_closed_eyes.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f61d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/stuck_out_tongue_winking_eye.png b/plugins/emoji/public/images/stuck_out_tongue_winking_eye.png
deleted file mode 120000
index 9a51c02b5d..0000000000
--- a/plugins/emoji/public/images/stuck_out_tongue_winking_eye.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f61c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sun_with_face.png b/plugins/emoji/public/images/sun_with_face.png
deleted file mode 120000
index 9f3ca0790b..0000000000
--- a/plugins/emoji/public/images/sun_with_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f31e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sunflower.png b/plugins/emoji/public/images/sunflower.png
deleted file mode 120000
index 0a1bad8a83..0000000000
--- a/plugins/emoji/public/images/sunflower.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f33b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sunglasses.png b/plugins/emoji/public/images/sunglasses.png
deleted file mode 120000
index d5789358c0..0000000000
--- a/plugins/emoji/public/images/sunglasses.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f60e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sunny.png b/plugins/emoji/public/images/sunny.png
deleted file mode 120000
index ec2ee45f2f..0000000000
--- a/plugins/emoji/public/images/sunny.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2600.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sunrise.png b/plugins/emoji/public/images/sunrise.png
deleted file mode 120000
index 400a2bde20..0000000000
--- a/plugins/emoji/public/images/sunrise.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f305.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sunrise_over_mountains.png b/plugins/emoji/public/images/sunrise_over_mountains.png
deleted file mode 120000
index cfd9dc8b47..0000000000
--- a/plugins/emoji/public/images/sunrise_over_mountains.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f304.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/surfer.png b/plugins/emoji/public/images/surfer.png
deleted file mode 120000
index 812296d05d..0000000000
--- a/plugins/emoji/public/images/surfer.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sushi.png b/plugins/emoji/public/images/sushi.png
deleted file mode 120000
index f4a4d994b1..0000000000
--- a/plugins/emoji/public/images/sushi.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f363.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/suspect.png b/plugins/emoji/public/images/suspect.png
deleted file mode 100755
index f9e38afefd..0000000000
Binary files a/plugins/emoji/public/images/suspect.png and /dev/null differ
diff --git a/plugins/emoji/public/images/suspension_railway.png b/plugins/emoji/public/images/suspension_railway.png
deleted file mode 120000
index 6d6b3ea3a6..0000000000
--- a/plugins/emoji/public/images/suspension_railway.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f69f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sweat.png b/plugins/emoji/public/images/sweat.png
deleted file mode 120000
index 16b63a3bd4..0000000000
--- a/plugins/emoji/public/images/sweat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f613.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sweat_drops.png b/plugins/emoji/public/images/sweat_drops.png
deleted file mode 120000
index 0b76ebb734..0000000000
--- a/plugins/emoji/public/images/sweat_drops.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sweat_smile.png b/plugins/emoji/public/images/sweat_smile.png
deleted file mode 120000
index 2999db3563..0000000000
--- a/plugins/emoji/public/images/sweat_smile.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f605.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/sweet_potato.png b/plugins/emoji/public/images/sweet_potato.png
deleted file mode 120000
index 1e62e2d0dc..0000000000
--- a/plugins/emoji/public/images/sweet_potato.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f360.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/swimmer.png b/plugins/emoji/public/images/swimmer.png
deleted file mode 120000
index 430b4820bc..0000000000
--- a/plugins/emoji/public/images/swimmer.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ca.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/symbols.png b/plugins/emoji/public/images/symbols.png
deleted file mode 120000
index c63eb5bb6c..0000000000
--- a/plugins/emoji/public/images/symbols.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f523.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/syringe.png b/plugins/emoji/public/images/syringe.png
deleted file mode 120000
index 5f914ff0c4..0000000000
--- a/plugins/emoji/public/images/syringe.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f489.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tada.png b/plugins/emoji/public/images/tada.png
deleted file mode 120000
index ee2fe8c989..0000000000
--- a/plugins/emoji/public/images/tada.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f389.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tanabata_tree.png b/plugins/emoji/public/images/tanabata_tree.png
deleted file mode 120000
index e4c849b141..0000000000
--- a/plugins/emoji/public/images/tanabata_tree.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f38b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tangerine.png b/plugins/emoji/public/images/tangerine.png
deleted file mode 120000
index de74a4b6c4..0000000000
--- a/plugins/emoji/public/images/tangerine.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f34a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/taurus.png b/plugins/emoji/public/images/taurus.png
deleted file mode 120000
index b8663881c9..0000000000
--- a/plugins/emoji/public/images/taurus.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2649.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/taxi.png b/plugins/emoji/public/images/taxi.png
deleted file mode 120000
index 3bbb53f0f7..0000000000
--- a/plugins/emoji/public/images/taxi.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f695.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tea.png b/plugins/emoji/public/images/tea.png
deleted file mode 120000
index 285c08d139..0000000000
--- a/plugins/emoji/public/images/tea.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f375.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/telephone.png b/plugins/emoji/public/images/telephone.png
deleted file mode 120000
index 66f023aaaa..0000000000
--- a/plugins/emoji/public/images/telephone.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/260e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/telephone_receiver.png b/plugins/emoji/public/images/telephone_receiver.png
deleted file mode 120000
index ad7d836714..0000000000
--- a/plugins/emoji/public/images/telephone_receiver.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4de.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/telescope.png b/plugins/emoji/public/images/telescope.png
deleted file mode 120000
index 504b45368c..0000000000
--- a/plugins/emoji/public/images/telescope.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f52d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tennis.png b/plugins/emoji/public/images/tennis.png
deleted file mode 120000
index 1f23a29e13..0000000000
--- a/plugins/emoji/public/images/tennis.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3be.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tent.png b/plugins/emoji/public/images/tent.png
deleted file mode 120000
index df4f2e38f3..0000000000
--- a/plugins/emoji/public/images/tent.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26fa.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/thought_balloon.png b/plugins/emoji/public/images/thought_balloon.png
deleted file mode 120000
index 7999771a48..0000000000
--- a/plugins/emoji/public/images/thought_balloon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ad.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/three.png b/plugins/emoji/public/images/three.png
deleted file mode 120000
index c2ae234524..0000000000
--- a/plugins/emoji/public/images/three.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0033.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/thumbsdown.png b/plugins/emoji/public/images/thumbsdown.png
deleted file mode 120000
index 5b63ed9312..0000000000
--- a/plugins/emoji/public/images/thumbsdown.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f44e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/thumbsup.png b/plugins/emoji/public/images/thumbsup.png
deleted file mode 120000
index 5db29d6679..0000000000
--- a/plugins/emoji/public/images/thumbsup.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f44d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/ticket.png b/plugins/emoji/public/images/ticket.png
deleted file mode 120000
index 6e58827815..0000000000
--- a/plugins/emoji/public/images/ticket.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ab.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tiger.png b/plugins/emoji/public/images/tiger.png
deleted file mode 120000
index b3b9b348b2..0000000000
--- a/plugins/emoji/public/images/tiger.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f42f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tiger2.png b/plugins/emoji/public/images/tiger2.png
deleted file mode 120000
index 475fc74c42..0000000000
--- a/plugins/emoji/public/images/tiger2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f405.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tired_face.png b/plugins/emoji/public/images/tired_face.png
deleted file mode 120000
index ccc7a1150e..0000000000
--- a/plugins/emoji/public/images/tired_face.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f62b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tm.png b/plugins/emoji/public/images/tm.png
deleted file mode 120000
index 47559a3104..0000000000
--- a/plugins/emoji/public/images/tm.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2122.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/toilet.png b/plugins/emoji/public/images/toilet.png
deleted file mode 120000
index ed1dcb961a..0000000000
--- a/plugins/emoji/public/images/toilet.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6bd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tokyo_tower.png b/plugins/emoji/public/images/tokyo_tower.png
deleted file mode 120000
index c1580aaeb8..0000000000
--- a/plugins/emoji/public/images/tokyo_tower.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f5fc.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tomato.png b/plugins/emoji/public/images/tomato.png
deleted file mode 120000
index 334a0f8a5e..0000000000
--- a/plugins/emoji/public/images/tomato.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f345.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tongue.png b/plugins/emoji/public/images/tongue.png
deleted file mode 120000
index ef62232804..0000000000
--- a/plugins/emoji/public/images/tongue.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f445.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/top.png b/plugins/emoji/public/images/top.png
deleted file mode 120000
index 4a21bd707c..0000000000
--- a/plugins/emoji/public/images/top.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f51d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tophat.png b/plugins/emoji/public/images/tophat.png
deleted file mode 120000
index aea6695749..0000000000
--- a/plugins/emoji/public/images/tophat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3a9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tractor.png b/plugins/emoji/public/images/tractor.png
deleted file mode 120000
index 5ab84e76df..0000000000
--- a/plugins/emoji/public/images/tractor.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f69c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/traffic_light.png b/plugins/emoji/public/images/traffic_light.png
deleted file mode 120000
index 28bd5f4ea3..0000000000
--- a/plugins/emoji/public/images/traffic_light.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a5.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/train.png b/plugins/emoji/public/images/train.png
deleted file mode 120000
index 856483debc..0000000000
--- a/plugins/emoji/public/images/train.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f683.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/train2.png b/plugins/emoji/public/images/train2.png
deleted file mode 120000
index 12438cf504..0000000000
--- a/plugins/emoji/public/images/train2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f686.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tram.png b/plugins/emoji/public/images/tram.png
deleted file mode 120000
index b27dea5daf..0000000000
--- a/plugins/emoji/public/images/tram.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f68a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/triangular_flag_on_post.png b/plugins/emoji/public/images/triangular_flag_on_post.png
deleted file mode 120000
index e73bd8b8d6..0000000000
--- a/plugins/emoji/public/images/triangular_flag_on_post.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/triangular_ruler.png b/plugins/emoji/public/images/triangular_ruler.png
deleted file mode 120000
index 3d9485127a..0000000000
--- a/plugins/emoji/public/images/triangular_ruler.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4d0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/trident.png b/plugins/emoji/public/images/trident.png
deleted file mode 120000
index 13864beaea..0000000000
--- a/plugins/emoji/public/images/trident.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f531.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/triumph.png b/plugins/emoji/public/images/triumph.png
deleted file mode 120000
index 9b8ec14130..0000000000
--- a/plugins/emoji/public/images/triumph.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f624.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/trolleybus.png b/plugins/emoji/public/images/trolleybus.png
deleted file mode 120000
index 7748498e70..0000000000
--- a/plugins/emoji/public/images/trolleybus.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f68e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/trollface.png b/plugins/emoji/public/images/trollface.png
deleted file mode 100755
index 5f54d28ea6..0000000000
Binary files a/plugins/emoji/public/images/trollface.png and /dev/null differ
diff --git a/plugins/emoji/public/images/trophy.png b/plugins/emoji/public/images/trophy.png
deleted file mode 120000
index 67253716de..0000000000
--- a/plugins/emoji/public/images/trophy.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3c6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tropical_drink.png b/plugins/emoji/public/images/tropical_drink.png
deleted file mode 120000
index a15a3cd87f..0000000000
--- a/plugins/emoji/public/images/tropical_drink.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f379.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tropical_fish.png b/plugins/emoji/public/images/tropical_fish.png
deleted file mode 120000
index 87a4c0f59d..0000000000
--- a/plugins/emoji/public/images/tropical_fish.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f420.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/truck.png b/plugins/emoji/public/images/truck.png
deleted file mode 120000
index 0ba116f210..0000000000
--- a/plugins/emoji/public/images/truck.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f69a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/trumpet.png b/plugins/emoji/public/images/trumpet.png
deleted file mode 120000
index ef9af1c260..0000000000
--- a/plugins/emoji/public/images/trumpet.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ba.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tshirt.png b/plugins/emoji/public/images/tshirt.png
deleted file mode 120000
index 205cc1b9c1..0000000000
--- a/plugins/emoji/public/images/tshirt.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f455.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tulip.png b/plugins/emoji/public/images/tulip.png
deleted file mode 120000
index 1cc45dba70..0000000000
--- a/plugins/emoji/public/images/tulip.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f337.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/turtle.png b/plugins/emoji/public/images/turtle.png
deleted file mode 120000
index d1e091a766..0000000000
--- a/plugins/emoji/public/images/turtle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f422.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/tv.png b/plugins/emoji/public/images/tv.png
deleted file mode 120000
index 0da5f83e30..0000000000
--- a/plugins/emoji/public/images/tv.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4fa.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/twisted_rightwards_arrows.png b/plugins/emoji/public/images/twisted_rightwards_arrows.png
deleted file mode 120000
index 87ccda233e..0000000000
--- a/plugins/emoji/public/images/twisted_rightwards_arrows.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f500.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/twitter/+1.png b/plugins/emoji/public/images/twitter/+1.png
new file mode 100644
index 0000000000..f4bafe3cc1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/+1.png differ
diff --git a/plugins/emoji/public/images/twitter/-1.png b/plugins/emoji/public/images/twitter/-1.png
new file mode 100644
index 0000000000..892f5cf1ee
Binary files /dev/null and b/plugins/emoji/public/images/twitter/-1.png differ
diff --git a/plugins/emoji/public/images/twitter/100.png b/plugins/emoji/public/images/twitter/100.png
new file mode 100644
index 0000000000..7a9b91830f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/100.png differ
diff --git a/plugins/emoji/public/images/twitter/1234.png b/plugins/emoji/public/images/twitter/1234.png
new file mode 100644
index 0000000000..e665b02b93
Binary files /dev/null and b/plugins/emoji/public/images/twitter/1234.png differ
diff --git a/plugins/emoji/public/images/twitter/8ball.png b/plugins/emoji/public/images/twitter/8ball.png
new file mode 100644
index 0000000000..8f53cd375e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/8ball.png differ
diff --git a/plugins/emoji/public/images/twitter/a.png b/plugins/emoji/public/images/twitter/a.png
new file mode 100644
index 0000000000..4910a18289
Binary files /dev/null and b/plugins/emoji/public/images/twitter/a.png differ
diff --git a/plugins/emoji/public/images/twitter/ab.png b/plugins/emoji/public/images/twitter/ab.png
new file mode 100644
index 0000000000..629ccf6410
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ab.png differ
diff --git a/plugins/emoji/public/images/twitter/abc.png b/plugins/emoji/public/images/twitter/abc.png
new file mode 100644
index 0000000000..54907e5029
Binary files /dev/null and b/plugins/emoji/public/images/twitter/abc.png differ
diff --git a/plugins/emoji/public/images/twitter/abcd.png b/plugins/emoji/public/images/twitter/abcd.png
new file mode 100644
index 0000000000..58e95a17a2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/abcd.png differ
diff --git a/plugins/emoji/public/images/twitter/accept.png b/plugins/emoji/public/images/twitter/accept.png
new file mode 100644
index 0000000000..9e01a97e93
Binary files /dev/null and b/plugins/emoji/public/images/twitter/accept.png differ
diff --git a/plugins/emoji/public/images/twitter/aerial_tramway.png b/plugins/emoji/public/images/twitter/aerial_tramway.png
new file mode 100644
index 0000000000..40d2b1c91f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/aerial_tramway.png differ
diff --git a/plugins/emoji/public/images/twitter/airplane.png b/plugins/emoji/public/images/twitter/airplane.png
new file mode 100644
index 0000000000..c92c48a32c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/airplane.png differ
diff --git a/plugins/emoji/public/images/twitter/alarm_clock.png b/plugins/emoji/public/images/twitter/alarm_clock.png
new file mode 100644
index 0000000000..fb459854d3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/alarm_clock.png differ
diff --git a/plugins/emoji/public/images/twitter/alien.png b/plugins/emoji/public/images/twitter/alien.png
new file mode 100644
index 0000000000..caf546c5cc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/alien.png differ
diff --git a/plugins/emoji/public/images/twitter/ambulance.png b/plugins/emoji/public/images/twitter/ambulance.png
new file mode 100644
index 0000000000..158348c5e5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ambulance.png differ
diff --git a/plugins/emoji/public/images/twitter/anchor.png b/plugins/emoji/public/images/twitter/anchor.png
new file mode 100644
index 0000000000..a64e24ed27
Binary files /dev/null and b/plugins/emoji/public/images/twitter/anchor.png differ
diff --git a/plugins/emoji/public/images/twitter/angel.png b/plugins/emoji/public/images/twitter/angel.png
new file mode 100644
index 0000000000..cdcec5f51a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/angel.png differ
diff --git a/plugins/emoji/public/images/twitter/anger.png b/plugins/emoji/public/images/twitter/anger.png
new file mode 100644
index 0000000000..5f9a1b3e90
Binary files /dev/null and b/plugins/emoji/public/images/twitter/anger.png differ
diff --git a/plugins/emoji/public/images/twitter/angry.png b/plugins/emoji/public/images/twitter/angry.png
new file mode 100644
index 0000000000..6c69d9b0d1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/angry.png differ
diff --git a/plugins/emoji/public/images/twitter/anguished.png b/plugins/emoji/public/images/twitter/anguished.png
new file mode 100644
index 0000000000..70219ed597
Binary files /dev/null and b/plugins/emoji/public/images/twitter/anguished.png differ
diff --git a/plugins/emoji/public/images/twitter/ant.png b/plugins/emoji/public/images/twitter/ant.png
new file mode 100644
index 0000000000..74c43359fe
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ant.png differ
diff --git a/plugins/emoji/public/images/twitter/apple.png b/plugins/emoji/public/images/twitter/apple.png
new file mode 100644
index 0000000000..e8762fbbbe
Binary files /dev/null and b/plugins/emoji/public/images/twitter/apple.png differ
diff --git a/plugins/emoji/public/images/twitter/aquarius.png b/plugins/emoji/public/images/twitter/aquarius.png
new file mode 100644
index 0000000000..76dd286989
Binary files /dev/null and b/plugins/emoji/public/images/twitter/aquarius.png differ
diff --git a/plugins/emoji/public/images/twitter/aries.png b/plugins/emoji/public/images/twitter/aries.png
new file mode 100644
index 0000000000..18474da18c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/aries.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_backward.png b/plugins/emoji/public/images/twitter/arrow_backward.png
new file mode 100644
index 0000000000..bd104c1761
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_backward.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_double_down.png b/plugins/emoji/public/images/twitter/arrow_double_down.png
new file mode 100644
index 0000000000..a206660489
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_double_down.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_double_up.png b/plugins/emoji/public/images/twitter/arrow_double_up.png
new file mode 100644
index 0000000000..776af08f0a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_double_up.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_down.png b/plugins/emoji/public/images/twitter/arrow_down.png
new file mode 100644
index 0000000000..c8fce77f66
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_down.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_down_small.png b/plugins/emoji/public/images/twitter/arrow_down_small.png
new file mode 100644
index 0000000000..7ba4118c18
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_down_small.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_forward.png b/plugins/emoji/public/images/twitter/arrow_forward.png
new file mode 100644
index 0000000000..318fc58f36
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_forward.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_heading_down.png b/plugins/emoji/public/images/twitter/arrow_heading_down.png
new file mode 100644
index 0000000000..b905586fbf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_heading_down.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_heading_up.png b/plugins/emoji/public/images/twitter/arrow_heading_up.png
new file mode 100644
index 0000000000..1980877413
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_heading_up.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_left.png b/plugins/emoji/public/images/twitter/arrow_left.png
new file mode 100644
index 0000000000..26e5a6012b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_left.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_lower_left.png b/plugins/emoji/public/images/twitter/arrow_lower_left.png
new file mode 100644
index 0000000000..30b784363d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_lower_left.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_lower_right.png b/plugins/emoji/public/images/twitter/arrow_lower_right.png
new file mode 100644
index 0000000000..75d2b8ef92
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_lower_right.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_right.png b/plugins/emoji/public/images/twitter/arrow_right.png
new file mode 100644
index 0000000000..4a6e73a1cb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_right.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_right_hook.png b/plugins/emoji/public/images/twitter/arrow_right_hook.png
new file mode 100644
index 0000000000..e052225f9a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_right_hook.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_up.png b/plugins/emoji/public/images/twitter/arrow_up.png
new file mode 100644
index 0000000000..17f066f22d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_up.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_up_down.png b/plugins/emoji/public/images/twitter/arrow_up_down.png
new file mode 100644
index 0000000000..8111c96387
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_up_down.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_up_small.png b/plugins/emoji/public/images/twitter/arrow_up_small.png
new file mode 100644
index 0000000000..878ffcfc22
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_up_small.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_upper_left.png b/plugins/emoji/public/images/twitter/arrow_upper_left.png
new file mode 100644
index 0000000000..88a8c8c65c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_upper_left.png differ
diff --git a/plugins/emoji/public/images/twitter/arrow_upper_right.png b/plugins/emoji/public/images/twitter/arrow_upper_right.png
new file mode 100644
index 0000000000..422fe6c47c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrow_upper_right.png differ
diff --git a/plugins/emoji/public/images/twitter/arrows_clockwise.png b/plugins/emoji/public/images/twitter/arrows_clockwise.png
new file mode 100644
index 0000000000..54c975a0db
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrows_clockwise.png differ
diff --git a/plugins/emoji/public/images/twitter/arrows_counterclockwise.png b/plugins/emoji/public/images/twitter/arrows_counterclockwise.png
new file mode 100644
index 0000000000..4ab0b2602d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/arrows_counterclockwise.png differ
diff --git a/plugins/emoji/public/images/twitter/art.png b/plugins/emoji/public/images/twitter/art.png
new file mode 100644
index 0000000000..36d308d30a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/art.png differ
diff --git a/plugins/emoji/public/images/twitter/articulated_lorry.png b/plugins/emoji/public/images/twitter/articulated_lorry.png
new file mode 100644
index 0000000000..4e5308ca13
Binary files /dev/null and b/plugins/emoji/public/images/twitter/articulated_lorry.png differ
diff --git a/plugins/emoji/public/images/twitter/astonished.png b/plugins/emoji/public/images/twitter/astonished.png
new file mode 100644
index 0000000000..273454344c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/astonished.png differ
diff --git a/plugins/emoji/public/images/twitter/athletic_shoe.png b/plugins/emoji/public/images/twitter/athletic_shoe.png
new file mode 100644
index 0000000000..761b61b044
Binary files /dev/null and b/plugins/emoji/public/images/twitter/athletic_shoe.png differ
diff --git a/plugins/emoji/public/images/twitter/atm.png b/plugins/emoji/public/images/twitter/atm.png
new file mode 100644
index 0000000000..02517ef06c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/atm.png differ
diff --git a/plugins/emoji/public/images/twitter/b.png b/plugins/emoji/public/images/twitter/b.png
new file mode 100644
index 0000000000..93cd257d6f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/b.png differ
diff --git a/plugins/emoji/public/images/twitter/baby.png b/plugins/emoji/public/images/twitter/baby.png
new file mode 100644
index 0000000000..14a55ed914
Binary files /dev/null and b/plugins/emoji/public/images/twitter/baby.png differ
diff --git a/plugins/emoji/public/images/twitter/baby_bottle.png b/plugins/emoji/public/images/twitter/baby_bottle.png
new file mode 100644
index 0000000000..f5ba9e8210
Binary files /dev/null and b/plugins/emoji/public/images/twitter/baby_bottle.png differ
diff --git a/plugins/emoji/public/images/twitter/baby_chick.png b/plugins/emoji/public/images/twitter/baby_chick.png
new file mode 100644
index 0000000000..4e27df5424
Binary files /dev/null and b/plugins/emoji/public/images/twitter/baby_chick.png differ
diff --git a/plugins/emoji/public/images/twitter/baby_symbol.png b/plugins/emoji/public/images/twitter/baby_symbol.png
new file mode 100644
index 0000000000..75f9ca19db
Binary files /dev/null and b/plugins/emoji/public/images/twitter/baby_symbol.png differ
diff --git a/plugins/emoji/public/images/twitter/back.png b/plugins/emoji/public/images/twitter/back.png
new file mode 100644
index 0000000000..c87ac05289
Binary files /dev/null and b/plugins/emoji/public/images/twitter/back.png differ
diff --git a/plugins/emoji/public/images/twitter/baggage_claim.png b/plugins/emoji/public/images/twitter/baggage_claim.png
new file mode 100644
index 0000000000..362b71b3f0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/baggage_claim.png differ
diff --git a/plugins/emoji/public/images/twitter/balloon.png b/plugins/emoji/public/images/twitter/balloon.png
new file mode 100644
index 0000000000..bb152dc6d7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/balloon.png differ
diff --git a/plugins/emoji/public/images/twitter/ballot_box_with_check.png b/plugins/emoji/public/images/twitter/ballot_box_with_check.png
new file mode 100644
index 0000000000..202beb96e1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ballot_box_with_check.png differ
diff --git a/plugins/emoji/public/images/twitter/bamboo.png b/plugins/emoji/public/images/twitter/bamboo.png
new file mode 100644
index 0000000000..75711eb85d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bamboo.png differ
diff --git a/plugins/emoji/public/images/twitter/banana.png b/plugins/emoji/public/images/twitter/banana.png
new file mode 100644
index 0000000000..6284e50ef1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/banana.png differ
diff --git a/plugins/emoji/public/images/twitter/bangbang.png b/plugins/emoji/public/images/twitter/bangbang.png
new file mode 100644
index 0000000000..b7c7c51827
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bangbang.png differ
diff --git a/plugins/emoji/public/images/twitter/bank.png b/plugins/emoji/public/images/twitter/bank.png
new file mode 100644
index 0000000000..6bc054d19b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bank.png differ
diff --git a/plugins/emoji/public/images/twitter/bar_chart.png b/plugins/emoji/public/images/twitter/bar_chart.png
new file mode 100644
index 0000000000..335ba0f3c5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bar_chart.png differ
diff --git a/plugins/emoji/public/images/twitter/barber.png b/plugins/emoji/public/images/twitter/barber.png
new file mode 100644
index 0000000000..19f432af95
Binary files /dev/null and b/plugins/emoji/public/images/twitter/barber.png differ
diff --git a/plugins/emoji/public/images/twitter/baseball.png b/plugins/emoji/public/images/twitter/baseball.png
new file mode 100644
index 0000000000..939880d413
Binary files /dev/null and b/plugins/emoji/public/images/twitter/baseball.png differ
diff --git a/plugins/emoji/public/images/twitter/basketball.png b/plugins/emoji/public/images/twitter/basketball.png
new file mode 100644
index 0000000000..20e25daebf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/basketball.png differ
diff --git a/plugins/emoji/public/images/twitter/bath.png b/plugins/emoji/public/images/twitter/bath.png
new file mode 100644
index 0000000000..a7dc17b723
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bath.png differ
diff --git a/plugins/emoji/public/images/twitter/bathtub.png b/plugins/emoji/public/images/twitter/bathtub.png
new file mode 100644
index 0000000000..0580a6d24b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bathtub.png differ
diff --git a/plugins/emoji/public/images/twitter/battery.png b/plugins/emoji/public/images/twitter/battery.png
new file mode 100644
index 0000000000..4baada5260
Binary files /dev/null and b/plugins/emoji/public/images/twitter/battery.png differ
diff --git a/plugins/emoji/public/images/twitter/bear.png b/plugins/emoji/public/images/twitter/bear.png
new file mode 100644
index 0000000000..9bbe0cd5d6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bear.png differ
diff --git a/plugins/emoji/public/images/twitter/bee.png b/plugins/emoji/public/images/twitter/bee.png
new file mode 100644
index 0000000000..fa066a08d2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bee.png differ
diff --git a/plugins/emoji/public/images/twitter/beer.png b/plugins/emoji/public/images/twitter/beer.png
new file mode 100644
index 0000000000..05f15a4fcf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/beer.png differ
diff --git a/plugins/emoji/public/images/twitter/beers.png b/plugins/emoji/public/images/twitter/beers.png
new file mode 100644
index 0000000000..723b1cc5c6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/beers.png differ
diff --git a/plugins/emoji/public/images/twitter/beetle.png b/plugins/emoji/public/images/twitter/beetle.png
new file mode 100644
index 0000000000..1d5968d36d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/beetle.png differ
diff --git a/plugins/emoji/public/images/twitter/beginner.png b/plugins/emoji/public/images/twitter/beginner.png
new file mode 100644
index 0000000000..412af52ada
Binary files /dev/null and b/plugins/emoji/public/images/twitter/beginner.png differ
diff --git a/plugins/emoji/public/images/twitter/bell.png b/plugins/emoji/public/images/twitter/bell.png
new file mode 100644
index 0000000000..6db53f6d6b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bell.png differ
diff --git a/plugins/emoji/public/images/twitter/bento.png b/plugins/emoji/public/images/twitter/bento.png
new file mode 100644
index 0000000000..ca410af8d0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bento.png differ
diff --git a/plugins/emoji/public/images/twitter/bicyclist.png b/plugins/emoji/public/images/twitter/bicyclist.png
new file mode 100644
index 0000000000..80800d3da6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bicyclist.png differ
diff --git a/plugins/emoji/public/images/twitter/bike.png b/plugins/emoji/public/images/twitter/bike.png
new file mode 100644
index 0000000000..fed19d7019
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bike.png differ
diff --git a/plugins/emoji/public/images/twitter/bikini.png b/plugins/emoji/public/images/twitter/bikini.png
new file mode 100644
index 0000000000..1ad9143a5c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bikini.png differ
diff --git a/plugins/emoji/public/images/twitter/bird.png b/plugins/emoji/public/images/twitter/bird.png
new file mode 100644
index 0000000000..19c7c575f8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bird.png differ
diff --git a/plugins/emoji/public/images/twitter/birthday.png b/plugins/emoji/public/images/twitter/birthday.png
new file mode 100644
index 0000000000..8372fc70b2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/birthday.png differ
diff --git a/plugins/emoji/public/images/twitter/black_circle.png b/plugins/emoji/public/images/twitter/black_circle.png
new file mode 100644
index 0000000000..c763980938
Binary files /dev/null and b/plugins/emoji/public/images/twitter/black_circle.png differ
diff --git a/plugins/emoji/public/images/twitter/black_joker.png b/plugins/emoji/public/images/twitter/black_joker.png
new file mode 100644
index 0000000000..57c236aa49
Binary files /dev/null and b/plugins/emoji/public/images/twitter/black_joker.png differ
diff --git a/plugins/emoji/public/images/twitter/black_large_square.png b/plugins/emoji/public/images/twitter/black_large_square.png
new file mode 100644
index 0000000000..6465bde614
Binary files /dev/null and b/plugins/emoji/public/images/twitter/black_large_square.png differ
diff --git a/plugins/emoji/public/images/twitter/black_medium_small_square.png b/plugins/emoji/public/images/twitter/black_medium_small_square.png
new file mode 100644
index 0000000000..0955daf448
Binary files /dev/null and b/plugins/emoji/public/images/twitter/black_medium_small_square.png differ
diff --git a/plugins/emoji/public/images/twitter/black_medium_square.png b/plugins/emoji/public/images/twitter/black_medium_square.png
new file mode 100644
index 0000000000..5ce46828ec
Binary files /dev/null and b/plugins/emoji/public/images/twitter/black_medium_square.png differ
diff --git a/plugins/emoji/public/images/twitter/black_nib.png b/plugins/emoji/public/images/twitter/black_nib.png
new file mode 100644
index 0000000000..f01c38830c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/black_nib.png differ
diff --git a/plugins/emoji/public/images/twitter/black_small_square.png b/plugins/emoji/public/images/twitter/black_small_square.png
new file mode 100644
index 0000000000..203ce77c1a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/black_small_square.png differ
diff --git a/plugins/emoji/public/images/twitter/black_square_button.png b/plugins/emoji/public/images/twitter/black_square_button.png
new file mode 100644
index 0000000000..0e7f6888ea
Binary files /dev/null and b/plugins/emoji/public/images/twitter/black_square_button.png differ
diff --git a/plugins/emoji/public/images/twitter/blossom.png b/plugins/emoji/public/images/twitter/blossom.png
new file mode 100644
index 0000000000..5f964e1609
Binary files /dev/null and b/plugins/emoji/public/images/twitter/blossom.png differ
diff --git a/plugins/emoji/public/images/twitter/blowfish.png b/plugins/emoji/public/images/twitter/blowfish.png
new file mode 100644
index 0000000000..d9286fd0b3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/blowfish.png differ
diff --git a/plugins/emoji/public/images/twitter/blue_book.png b/plugins/emoji/public/images/twitter/blue_book.png
new file mode 100644
index 0000000000..367697f718
Binary files /dev/null and b/plugins/emoji/public/images/twitter/blue_book.png differ
diff --git a/plugins/emoji/public/images/twitter/blue_car.png b/plugins/emoji/public/images/twitter/blue_car.png
new file mode 100644
index 0000000000..f8320178a1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/blue_car.png differ
diff --git a/plugins/emoji/public/images/twitter/blue_heart.png b/plugins/emoji/public/images/twitter/blue_heart.png
new file mode 100644
index 0000000000..0dc574b9c4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/blue_heart.png differ
diff --git a/plugins/emoji/public/images/twitter/blush.png b/plugins/emoji/public/images/twitter/blush.png
new file mode 100644
index 0000000000..48bd35e5b7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/blush.png differ
diff --git a/plugins/emoji/public/images/twitter/boar.png b/plugins/emoji/public/images/twitter/boar.png
new file mode 100644
index 0000000000..fe9ceb0a62
Binary files /dev/null and b/plugins/emoji/public/images/twitter/boar.png differ
diff --git a/plugins/emoji/public/images/twitter/boat.png b/plugins/emoji/public/images/twitter/boat.png
new file mode 100644
index 0000000000..7b4a289ed2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/boat.png differ
diff --git a/plugins/emoji/public/images/twitter/bomb.png b/plugins/emoji/public/images/twitter/bomb.png
new file mode 100644
index 0000000000..4c833e9753
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bomb.png differ
diff --git a/plugins/emoji/public/images/twitter/book.png b/plugins/emoji/public/images/twitter/book.png
new file mode 100644
index 0000000000..882f9f89e5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/book.png differ
diff --git a/plugins/emoji/public/images/twitter/bookmark.png b/plugins/emoji/public/images/twitter/bookmark.png
new file mode 100644
index 0000000000..19a9fff2e6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bookmark.png differ
diff --git a/plugins/emoji/public/images/twitter/bookmark_tabs.png b/plugins/emoji/public/images/twitter/bookmark_tabs.png
new file mode 100644
index 0000000000..10f2068839
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bookmark_tabs.png differ
diff --git a/plugins/emoji/public/images/twitter/books.png b/plugins/emoji/public/images/twitter/books.png
new file mode 100644
index 0000000000..d987bf6f87
Binary files /dev/null and b/plugins/emoji/public/images/twitter/books.png differ
diff --git a/plugins/emoji/public/images/twitter/boom.png b/plugins/emoji/public/images/twitter/boom.png
new file mode 100644
index 0000000000..46b5085624
Binary files /dev/null and b/plugins/emoji/public/images/twitter/boom.png differ
diff --git a/plugins/emoji/public/images/twitter/boot.png b/plugins/emoji/public/images/twitter/boot.png
new file mode 100644
index 0000000000..d691adbf94
Binary files /dev/null and b/plugins/emoji/public/images/twitter/boot.png differ
diff --git a/plugins/emoji/public/images/twitter/bouquet.png b/plugins/emoji/public/images/twitter/bouquet.png
new file mode 100644
index 0000000000..6a1bcc48f7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bouquet.png differ
diff --git a/plugins/emoji/public/images/twitter/bow.png b/plugins/emoji/public/images/twitter/bow.png
new file mode 100644
index 0000000000..44739d36b1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bow.png differ
diff --git a/plugins/emoji/public/images/twitter/bowling.png b/plugins/emoji/public/images/twitter/bowling.png
new file mode 100644
index 0000000000..19e52cf0db
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bowling.png differ
diff --git a/plugins/emoji/public/images/twitter/boy.png b/plugins/emoji/public/images/twitter/boy.png
new file mode 100644
index 0000000000..8f2c37252c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/boy.png differ
diff --git a/plugins/emoji/public/images/twitter/bread.png b/plugins/emoji/public/images/twitter/bread.png
new file mode 100644
index 0000000000..c0ccb07322
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bread.png differ
diff --git a/plugins/emoji/public/images/twitter/bride_with_veil.png b/plugins/emoji/public/images/twitter/bride_with_veil.png
new file mode 100644
index 0000000000..cf753cdb8a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bride_with_veil.png differ
diff --git a/plugins/emoji/public/images/twitter/bridge_at_night.png b/plugins/emoji/public/images/twitter/bridge_at_night.png
new file mode 100644
index 0000000000..48fc34293f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bridge_at_night.png differ
diff --git a/plugins/emoji/public/images/twitter/briefcase.png b/plugins/emoji/public/images/twitter/briefcase.png
new file mode 100644
index 0000000000..be6b0777a0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/briefcase.png differ
diff --git a/plugins/emoji/public/images/twitter/broken_heart.png b/plugins/emoji/public/images/twitter/broken_heart.png
new file mode 100644
index 0000000000..9666f04844
Binary files /dev/null and b/plugins/emoji/public/images/twitter/broken_heart.png differ
diff --git a/plugins/emoji/public/images/twitter/bug.png b/plugins/emoji/public/images/twitter/bug.png
new file mode 100644
index 0000000000..446ea41db6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bug.png differ
diff --git a/plugins/emoji/public/images/twitter/bulb.png b/plugins/emoji/public/images/twitter/bulb.png
new file mode 100644
index 0000000000..408e0fef43
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bulb.png differ
diff --git a/plugins/emoji/public/images/twitter/bullettrain_front.png b/plugins/emoji/public/images/twitter/bullettrain_front.png
new file mode 100644
index 0000000000..0ddc6ac8bc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bullettrain_front.png differ
diff --git a/plugins/emoji/public/images/twitter/bullettrain_side.png b/plugins/emoji/public/images/twitter/bullettrain_side.png
new file mode 100644
index 0000000000..6b8be83f3d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bullettrain_side.png differ
diff --git a/plugins/emoji/public/images/twitter/bus.png b/plugins/emoji/public/images/twitter/bus.png
new file mode 100644
index 0000000000..49789c073e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bus.png differ
diff --git a/plugins/emoji/public/images/twitter/busstop.png b/plugins/emoji/public/images/twitter/busstop.png
new file mode 100644
index 0000000000..6bc1f9fd94
Binary files /dev/null and b/plugins/emoji/public/images/twitter/busstop.png differ
diff --git a/plugins/emoji/public/images/twitter/bust_in_silhouette.png b/plugins/emoji/public/images/twitter/bust_in_silhouette.png
new file mode 100644
index 0000000000..07d1fb4eef
Binary files /dev/null and b/plugins/emoji/public/images/twitter/bust_in_silhouette.png differ
diff --git a/plugins/emoji/public/images/twitter/busts_in_silhouette.png b/plugins/emoji/public/images/twitter/busts_in_silhouette.png
new file mode 100644
index 0000000000..15f824b9ec
Binary files /dev/null and b/plugins/emoji/public/images/twitter/busts_in_silhouette.png differ
diff --git a/plugins/emoji/public/images/twitter/cactus.png b/plugins/emoji/public/images/twitter/cactus.png
new file mode 100644
index 0000000000..370a7ec4a1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cactus.png differ
diff --git a/plugins/emoji/public/images/twitter/cake.png b/plugins/emoji/public/images/twitter/cake.png
new file mode 100644
index 0000000000..d81f9abb5a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cake.png differ
diff --git a/plugins/emoji/public/images/twitter/calendar.png b/plugins/emoji/public/images/twitter/calendar.png
new file mode 100644
index 0000000000..ce06af7c01
Binary files /dev/null and b/plugins/emoji/public/images/twitter/calendar.png differ
diff --git a/plugins/emoji/public/images/twitter/calling.png b/plugins/emoji/public/images/twitter/calling.png
new file mode 100644
index 0000000000..625f2b81aa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/calling.png differ
diff --git a/plugins/emoji/public/images/twitter/camel.png b/plugins/emoji/public/images/twitter/camel.png
new file mode 100644
index 0000000000..44e2122d6c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/camel.png differ
diff --git a/plugins/emoji/public/images/twitter/camera.png b/plugins/emoji/public/images/twitter/camera.png
new file mode 100644
index 0000000000..4cf79f3090
Binary files /dev/null and b/plugins/emoji/public/images/twitter/camera.png differ
diff --git a/plugins/emoji/public/images/twitter/cancer.png b/plugins/emoji/public/images/twitter/cancer.png
new file mode 100644
index 0000000000..3d1420a398
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cancer.png differ
diff --git a/plugins/emoji/public/images/twitter/candy.png b/plugins/emoji/public/images/twitter/candy.png
new file mode 100644
index 0000000000..b165940a18
Binary files /dev/null and b/plugins/emoji/public/images/twitter/candy.png differ
diff --git a/plugins/emoji/public/images/twitter/capital_abcd.png b/plugins/emoji/public/images/twitter/capital_abcd.png
new file mode 100644
index 0000000000..d5e843d70c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/capital_abcd.png differ
diff --git a/plugins/emoji/public/images/twitter/capricorn.png b/plugins/emoji/public/images/twitter/capricorn.png
new file mode 100644
index 0000000000..e4c8e6191a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/capricorn.png differ
diff --git a/plugins/emoji/public/images/twitter/car.png b/plugins/emoji/public/images/twitter/car.png
new file mode 100644
index 0000000000..93610d2c43
Binary files /dev/null and b/plugins/emoji/public/images/twitter/car.png differ
diff --git a/plugins/emoji/public/images/twitter/card_index.png b/plugins/emoji/public/images/twitter/card_index.png
new file mode 100644
index 0000000000..6621717911
Binary files /dev/null and b/plugins/emoji/public/images/twitter/card_index.png differ
diff --git a/plugins/emoji/public/images/twitter/carousel_horse.png b/plugins/emoji/public/images/twitter/carousel_horse.png
new file mode 100644
index 0000000000..df4c93d9b8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/carousel_horse.png differ
diff --git a/plugins/emoji/public/images/twitter/cat.png b/plugins/emoji/public/images/twitter/cat.png
new file mode 100644
index 0000000000..0c41468365
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cat.png differ
diff --git a/plugins/emoji/public/images/twitter/cat2.png b/plugins/emoji/public/images/twitter/cat2.png
new file mode 100644
index 0000000000..e3f4a0d449
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cat2.png differ
diff --git a/plugins/emoji/public/images/twitter/cd.png b/plugins/emoji/public/images/twitter/cd.png
new file mode 100644
index 0000000000..a4ef3b92ec
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cd.png differ
diff --git a/plugins/emoji/public/images/twitter/chart.png b/plugins/emoji/public/images/twitter/chart.png
new file mode 100644
index 0000000000..d45ccad87d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/chart.png differ
diff --git a/plugins/emoji/public/images/twitter/chart_with_downwards_trend.png b/plugins/emoji/public/images/twitter/chart_with_downwards_trend.png
new file mode 100644
index 0000000000..bd1923b296
Binary files /dev/null and b/plugins/emoji/public/images/twitter/chart_with_downwards_trend.png differ
diff --git a/plugins/emoji/public/images/twitter/chart_with_upwards_trend.png b/plugins/emoji/public/images/twitter/chart_with_upwards_trend.png
new file mode 100644
index 0000000000..ccca3006d7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/chart_with_upwards_trend.png differ
diff --git a/plugins/emoji/public/images/twitter/checkered_flag.png b/plugins/emoji/public/images/twitter/checkered_flag.png
new file mode 100644
index 0000000000..e9f90e3ffd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/checkered_flag.png differ
diff --git a/plugins/emoji/public/images/twitter/cherries.png b/plugins/emoji/public/images/twitter/cherries.png
new file mode 100644
index 0000000000..fc18daad76
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cherries.png differ
diff --git a/plugins/emoji/public/images/twitter/cherry_blossom.png b/plugins/emoji/public/images/twitter/cherry_blossom.png
new file mode 100644
index 0000000000..423f93d75c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cherry_blossom.png differ
diff --git a/plugins/emoji/public/images/twitter/chestnut.png b/plugins/emoji/public/images/twitter/chestnut.png
new file mode 100644
index 0000000000..bd8408e75d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/chestnut.png differ
diff --git a/plugins/emoji/public/images/twitter/chicken.png b/plugins/emoji/public/images/twitter/chicken.png
new file mode 100644
index 0000000000..dc0ac7361e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/chicken.png differ
diff --git a/plugins/emoji/public/images/twitter/children_crossing.png b/plugins/emoji/public/images/twitter/children_crossing.png
new file mode 100644
index 0000000000..585f42852e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/children_crossing.png differ
diff --git a/plugins/emoji/public/images/twitter/chocolate_bar.png b/plugins/emoji/public/images/twitter/chocolate_bar.png
new file mode 100644
index 0000000000..85a38fdd5a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/chocolate_bar.png differ
diff --git a/plugins/emoji/public/images/twitter/christmas_tree.png b/plugins/emoji/public/images/twitter/christmas_tree.png
new file mode 100644
index 0000000000..18ef3d56db
Binary files /dev/null and b/plugins/emoji/public/images/twitter/christmas_tree.png differ
diff --git a/plugins/emoji/public/images/twitter/church.png b/plugins/emoji/public/images/twitter/church.png
new file mode 100644
index 0000000000..89cbc84b25
Binary files /dev/null and b/plugins/emoji/public/images/twitter/church.png differ
diff --git a/plugins/emoji/public/images/twitter/cinema.png b/plugins/emoji/public/images/twitter/cinema.png
new file mode 100644
index 0000000000..3717699a9d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cinema.png differ
diff --git a/plugins/emoji/public/images/twitter/circus_tent.png b/plugins/emoji/public/images/twitter/circus_tent.png
new file mode 100644
index 0000000000..c3a291e65c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/circus_tent.png differ
diff --git a/plugins/emoji/public/images/twitter/city_sunrise.png b/plugins/emoji/public/images/twitter/city_sunrise.png
new file mode 100644
index 0000000000..5b08985969
Binary files /dev/null and b/plugins/emoji/public/images/twitter/city_sunrise.png differ
diff --git a/plugins/emoji/public/images/twitter/city_sunset.png b/plugins/emoji/public/images/twitter/city_sunset.png
new file mode 100644
index 0000000000..087f9b4eec
Binary files /dev/null and b/plugins/emoji/public/images/twitter/city_sunset.png differ
diff --git a/plugins/emoji/public/images/twitter/cl.png b/plugins/emoji/public/images/twitter/cl.png
new file mode 100644
index 0000000000..c80ff2c21b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cl.png differ
diff --git a/plugins/emoji/public/images/twitter/clap.png b/plugins/emoji/public/images/twitter/clap.png
new file mode 100644
index 0000000000..5683995f1b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clap.png differ
diff --git a/plugins/emoji/public/images/twitter/clapper.png b/plugins/emoji/public/images/twitter/clapper.png
new file mode 100644
index 0000000000..68b61925a6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clapper.png differ
diff --git a/plugins/emoji/public/images/twitter/clipboard.png b/plugins/emoji/public/images/twitter/clipboard.png
new file mode 100644
index 0000000000..b04e37a5f2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clipboard.png differ
diff --git a/plugins/emoji/public/images/twitter/clock1.png b/plugins/emoji/public/images/twitter/clock1.png
new file mode 100644
index 0000000000..766f09a00f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock1.png differ
diff --git a/plugins/emoji/public/images/twitter/clock10.png b/plugins/emoji/public/images/twitter/clock10.png
new file mode 100644
index 0000000000..a1be1e33a4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock10.png differ
diff --git a/plugins/emoji/public/images/twitter/clock1030.png b/plugins/emoji/public/images/twitter/clock1030.png
new file mode 100644
index 0000000000..4eb6425abf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock1030.png differ
diff --git a/plugins/emoji/public/images/twitter/clock11.png b/plugins/emoji/public/images/twitter/clock11.png
new file mode 100644
index 0000000000..eb17f8ceb7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock11.png differ
diff --git a/plugins/emoji/public/images/twitter/clock1130.png b/plugins/emoji/public/images/twitter/clock1130.png
new file mode 100644
index 0000000000..946959ae5a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock1130.png differ
diff --git a/plugins/emoji/public/images/twitter/clock12.png b/plugins/emoji/public/images/twitter/clock12.png
new file mode 100644
index 0000000000..7d5caa5f62
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock12.png differ
diff --git a/plugins/emoji/public/images/twitter/clock1230.png b/plugins/emoji/public/images/twitter/clock1230.png
new file mode 100644
index 0000000000..f6ddb3add0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock1230.png differ
diff --git a/plugins/emoji/public/images/twitter/clock130.png b/plugins/emoji/public/images/twitter/clock130.png
new file mode 100644
index 0000000000..5fda442fc3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock130.png differ
diff --git a/plugins/emoji/public/images/twitter/clock2.png b/plugins/emoji/public/images/twitter/clock2.png
new file mode 100644
index 0000000000..28b580392b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock2.png differ
diff --git a/plugins/emoji/public/images/twitter/clock230.png b/plugins/emoji/public/images/twitter/clock230.png
new file mode 100644
index 0000000000..c476e45488
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock230.png differ
diff --git a/plugins/emoji/public/images/twitter/clock3.png b/plugins/emoji/public/images/twitter/clock3.png
new file mode 100644
index 0000000000..b6838e5d9a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock3.png differ
diff --git a/plugins/emoji/public/images/twitter/clock330.png b/plugins/emoji/public/images/twitter/clock330.png
new file mode 100644
index 0000000000..5dd7454268
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock330.png differ
diff --git a/plugins/emoji/public/images/twitter/clock4.png b/plugins/emoji/public/images/twitter/clock4.png
new file mode 100644
index 0000000000..40acf8c04d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock4.png differ
diff --git a/plugins/emoji/public/images/twitter/clock430.png b/plugins/emoji/public/images/twitter/clock430.png
new file mode 100644
index 0000000000..db6765d4bc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock430.png differ
diff --git a/plugins/emoji/public/images/twitter/clock5.png b/plugins/emoji/public/images/twitter/clock5.png
new file mode 100644
index 0000000000..43b9718de0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock5.png differ
diff --git a/plugins/emoji/public/images/twitter/clock530.png b/plugins/emoji/public/images/twitter/clock530.png
new file mode 100644
index 0000000000..f7a5b76d3a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock530.png differ
diff --git a/plugins/emoji/public/images/twitter/clock6.png b/plugins/emoji/public/images/twitter/clock6.png
new file mode 100644
index 0000000000..c3c1fa85ba
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock6.png differ
diff --git a/plugins/emoji/public/images/twitter/clock630.png b/plugins/emoji/public/images/twitter/clock630.png
new file mode 100644
index 0000000000..48c5d0a3c8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock630.png differ
diff --git a/plugins/emoji/public/images/twitter/clock7.png b/plugins/emoji/public/images/twitter/clock7.png
new file mode 100644
index 0000000000..5f04fcda12
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock7.png differ
diff --git a/plugins/emoji/public/images/twitter/clock730.png b/plugins/emoji/public/images/twitter/clock730.png
new file mode 100644
index 0000000000..dad3fd39c8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock730.png differ
diff --git a/plugins/emoji/public/images/twitter/clock8.png b/plugins/emoji/public/images/twitter/clock8.png
new file mode 100644
index 0000000000..446da51fc9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock8.png differ
diff --git a/plugins/emoji/public/images/twitter/clock830.png b/plugins/emoji/public/images/twitter/clock830.png
new file mode 100644
index 0000000000..5ae1273f3c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock830.png differ
diff --git a/plugins/emoji/public/images/twitter/clock9.png b/plugins/emoji/public/images/twitter/clock9.png
new file mode 100644
index 0000000000..c5ff5261ec
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock9.png differ
diff --git a/plugins/emoji/public/images/twitter/clock930.png b/plugins/emoji/public/images/twitter/clock930.png
new file mode 100644
index 0000000000..2c726282a2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clock930.png differ
diff --git a/plugins/emoji/public/images/twitter/closed_book.png b/plugins/emoji/public/images/twitter/closed_book.png
new file mode 100644
index 0000000000..8436c5ff83
Binary files /dev/null and b/plugins/emoji/public/images/twitter/closed_book.png differ
diff --git a/plugins/emoji/public/images/twitter/closed_lock_with_key.png b/plugins/emoji/public/images/twitter/closed_lock_with_key.png
new file mode 100644
index 0000000000..5bd299e00e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/closed_lock_with_key.png differ
diff --git a/plugins/emoji/public/images/twitter/closed_umbrella.png b/plugins/emoji/public/images/twitter/closed_umbrella.png
new file mode 100644
index 0000000000..6baf7e2199
Binary files /dev/null and b/plugins/emoji/public/images/twitter/closed_umbrella.png differ
diff --git a/plugins/emoji/public/images/twitter/cloud.png b/plugins/emoji/public/images/twitter/cloud.png
new file mode 100644
index 0000000000..8cd5827eb4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cloud.png differ
diff --git a/plugins/emoji/public/images/twitter/clubs.png b/plugins/emoji/public/images/twitter/clubs.png
new file mode 100644
index 0000000000..a6ca677262
Binary files /dev/null and b/plugins/emoji/public/images/twitter/clubs.png differ
diff --git a/plugins/emoji/public/images/twitter/cn.png b/plugins/emoji/public/images/twitter/cn.png
new file mode 100644
index 0000000000..de68ae2a23
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cn.png differ
diff --git a/plugins/emoji/public/images/twitter/cocktail.png b/plugins/emoji/public/images/twitter/cocktail.png
new file mode 100644
index 0000000000..6cd28f2e6f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cocktail.png differ
diff --git a/plugins/emoji/public/images/twitter/coffee.png b/plugins/emoji/public/images/twitter/coffee.png
new file mode 100644
index 0000000000..5339934806
Binary files /dev/null and b/plugins/emoji/public/images/twitter/coffee.png differ
diff --git a/plugins/emoji/public/images/twitter/cold_sweat.png b/plugins/emoji/public/images/twitter/cold_sweat.png
new file mode 100644
index 0000000000..a4c2cb964a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cold_sweat.png differ
diff --git a/plugins/emoji/public/images/twitter/collision.png b/plugins/emoji/public/images/twitter/collision.png
new file mode 100644
index 0000000000..46b5085624
Binary files /dev/null and b/plugins/emoji/public/images/twitter/collision.png differ
diff --git a/plugins/emoji/public/images/twitter/computer.png b/plugins/emoji/public/images/twitter/computer.png
new file mode 100644
index 0000000000..5f1241a227
Binary files /dev/null and b/plugins/emoji/public/images/twitter/computer.png differ
diff --git a/plugins/emoji/public/images/twitter/confetti_ball.png b/plugins/emoji/public/images/twitter/confetti_ball.png
new file mode 100644
index 0000000000..6216875367
Binary files /dev/null and b/plugins/emoji/public/images/twitter/confetti_ball.png differ
diff --git a/plugins/emoji/public/images/twitter/confounded.png b/plugins/emoji/public/images/twitter/confounded.png
new file mode 100644
index 0000000000..a986720448
Binary files /dev/null and b/plugins/emoji/public/images/twitter/confounded.png differ
diff --git a/plugins/emoji/public/images/twitter/confused.png b/plugins/emoji/public/images/twitter/confused.png
new file mode 100644
index 0000000000..b5c5b0752c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/confused.png differ
diff --git a/plugins/emoji/public/images/twitter/congratulations.png b/plugins/emoji/public/images/twitter/congratulations.png
new file mode 100644
index 0000000000..43941cf960
Binary files /dev/null and b/plugins/emoji/public/images/twitter/congratulations.png differ
diff --git a/plugins/emoji/public/images/twitter/construction.png b/plugins/emoji/public/images/twitter/construction.png
new file mode 100644
index 0000000000..9ad7eb0803
Binary files /dev/null and b/plugins/emoji/public/images/twitter/construction.png differ
diff --git a/plugins/emoji/public/images/twitter/construction_worker.png b/plugins/emoji/public/images/twitter/construction_worker.png
new file mode 100644
index 0000000000..9275fc2556
Binary files /dev/null and b/plugins/emoji/public/images/twitter/construction_worker.png differ
diff --git a/plugins/emoji/public/images/twitter/convenience_store.png b/plugins/emoji/public/images/twitter/convenience_store.png
new file mode 100644
index 0000000000..561b43724b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/convenience_store.png differ
diff --git a/plugins/emoji/public/images/twitter/cookie.png b/plugins/emoji/public/images/twitter/cookie.png
new file mode 100644
index 0000000000..f558874b02
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cookie.png differ
diff --git a/plugins/emoji/public/images/twitter/cool.png b/plugins/emoji/public/images/twitter/cool.png
new file mode 100644
index 0000000000..34d4f8ffdc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cool.png differ
diff --git a/plugins/emoji/public/images/twitter/cop.png b/plugins/emoji/public/images/twitter/cop.png
new file mode 100644
index 0000000000..96c89792ef
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cop.png differ
diff --git a/plugins/emoji/public/images/twitter/copyright.png b/plugins/emoji/public/images/twitter/copyright.png
new file mode 100644
index 0000000000..48699b6e46
Binary files /dev/null and b/plugins/emoji/public/images/twitter/copyright.png differ
diff --git a/plugins/emoji/public/images/twitter/corn.png b/plugins/emoji/public/images/twitter/corn.png
new file mode 100644
index 0000000000..e545e39abe
Binary files /dev/null and b/plugins/emoji/public/images/twitter/corn.png differ
diff --git a/plugins/emoji/public/images/twitter/couple.png b/plugins/emoji/public/images/twitter/couple.png
new file mode 100644
index 0000000000..098447327f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/couple.png differ
diff --git a/plugins/emoji/public/images/twitter/couple_with_heart.png b/plugins/emoji/public/images/twitter/couple_with_heart.png
new file mode 100644
index 0000000000..d8a2a1f947
Binary files /dev/null and b/plugins/emoji/public/images/twitter/couple_with_heart.png differ
diff --git a/plugins/emoji/public/images/twitter/couplekiss.png b/plugins/emoji/public/images/twitter/couplekiss.png
new file mode 100644
index 0000000000..df1bb27bf2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/couplekiss.png differ
diff --git a/plugins/emoji/public/images/twitter/cow.png b/plugins/emoji/public/images/twitter/cow.png
new file mode 100644
index 0000000000..498220c09f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cow.png differ
diff --git a/plugins/emoji/public/images/twitter/cow2.png b/plugins/emoji/public/images/twitter/cow2.png
new file mode 100644
index 0000000000..f28d3159b4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cow2.png differ
diff --git a/plugins/emoji/public/images/twitter/credit_card.png b/plugins/emoji/public/images/twitter/credit_card.png
new file mode 100644
index 0000000000..80e559e311
Binary files /dev/null and b/plugins/emoji/public/images/twitter/credit_card.png differ
diff --git a/plugins/emoji/public/images/twitter/crescent_moon.png b/plugins/emoji/public/images/twitter/crescent_moon.png
new file mode 100644
index 0000000000..8985c1ab51
Binary files /dev/null and b/plugins/emoji/public/images/twitter/crescent_moon.png differ
diff --git a/plugins/emoji/public/images/twitter/crocodile.png b/plugins/emoji/public/images/twitter/crocodile.png
new file mode 100644
index 0000000000..101758591d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/crocodile.png differ
diff --git a/plugins/emoji/public/images/twitter/crossed_flags.png b/plugins/emoji/public/images/twitter/crossed_flags.png
new file mode 100644
index 0000000000..c96898fa68
Binary files /dev/null and b/plugins/emoji/public/images/twitter/crossed_flags.png differ
diff --git a/plugins/emoji/public/images/twitter/crown.png b/plugins/emoji/public/images/twitter/crown.png
new file mode 100644
index 0000000000..6fc5359bfe
Binary files /dev/null and b/plugins/emoji/public/images/twitter/crown.png differ
diff --git a/plugins/emoji/public/images/twitter/cry.png b/plugins/emoji/public/images/twitter/cry.png
new file mode 100644
index 0000000000..5f1690d336
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cry.png differ
diff --git a/plugins/emoji/public/images/twitter/crying_cat_face.png b/plugins/emoji/public/images/twitter/crying_cat_face.png
new file mode 100644
index 0000000000..112d9b08d9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/crying_cat_face.png differ
diff --git a/plugins/emoji/public/images/twitter/crystal_ball.png b/plugins/emoji/public/images/twitter/crystal_ball.png
new file mode 100644
index 0000000000..bc73165e37
Binary files /dev/null and b/plugins/emoji/public/images/twitter/crystal_ball.png differ
diff --git a/plugins/emoji/public/images/twitter/cupid.png b/plugins/emoji/public/images/twitter/cupid.png
new file mode 100644
index 0000000000..4b13493537
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cupid.png differ
diff --git a/plugins/emoji/public/images/twitter/curly_loop.png b/plugins/emoji/public/images/twitter/curly_loop.png
new file mode 100644
index 0000000000..dfd006b6ba
Binary files /dev/null and b/plugins/emoji/public/images/twitter/curly_loop.png differ
diff --git a/plugins/emoji/public/images/twitter/currency_exchange.png b/plugins/emoji/public/images/twitter/currency_exchange.png
new file mode 100644
index 0000000000..a6a295083f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/currency_exchange.png differ
diff --git a/plugins/emoji/public/images/twitter/curry.png b/plugins/emoji/public/images/twitter/curry.png
new file mode 100644
index 0000000000..bf134b82c3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/curry.png differ
diff --git a/plugins/emoji/public/images/twitter/custard.png b/plugins/emoji/public/images/twitter/custard.png
new file mode 100644
index 0000000000..52f6a536c3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/custard.png differ
diff --git a/plugins/emoji/public/images/twitter/customs.png b/plugins/emoji/public/images/twitter/customs.png
new file mode 100644
index 0000000000..7f51eac1fa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/customs.png differ
diff --git a/plugins/emoji/public/images/twitter/cyclone.png b/plugins/emoji/public/images/twitter/cyclone.png
new file mode 100644
index 0000000000..b825f6efc9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/cyclone.png differ
diff --git a/plugins/emoji/public/images/twitter/dancer.png b/plugins/emoji/public/images/twitter/dancer.png
new file mode 100644
index 0000000000..1503fa6080
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dancer.png differ
diff --git a/plugins/emoji/public/images/twitter/dancers.png b/plugins/emoji/public/images/twitter/dancers.png
new file mode 100644
index 0000000000..eb0fa94aeb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dancers.png differ
diff --git a/plugins/emoji/public/images/twitter/dango.png b/plugins/emoji/public/images/twitter/dango.png
new file mode 100644
index 0000000000..8567a28537
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dango.png differ
diff --git a/plugins/emoji/public/images/twitter/dart.png b/plugins/emoji/public/images/twitter/dart.png
new file mode 100644
index 0000000000..274d4a5732
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dart.png differ
diff --git a/plugins/emoji/public/images/twitter/dash.png b/plugins/emoji/public/images/twitter/dash.png
new file mode 100644
index 0000000000..b041244a2b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dash.png differ
diff --git a/plugins/emoji/public/images/twitter/date.png b/plugins/emoji/public/images/twitter/date.png
new file mode 100644
index 0000000000..97d03284f7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/date.png differ
diff --git a/plugins/emoji/public/images/twitter/de.png b/plugins/emoji/public/images/twitter/de.png
new file mode 100644
index 0000000000..521142393d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/de.png differ
diff --git a/plugins/emoji/public/images/twitter/deciduous_tree.png b/plugins/emoji/public/images/twitter/deciduous_tree.png
new file mode 100644
index 0000000000..2883766124
Binary files /dev/null and b/plugins/emoji/public/images/twitter/deciduous_tree.png differ
diff --git a/plugins/emoji/public/images/twitter/department_store.png b/plugins/emoji/public/images/twitter/department_store.png
new file mode 100644
index 0000000000..473ac9921e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/department_store.png differ
diff --git a/plugins/emoji/public/images/twitter/diamond_shape_with_a_dot_inside.png b/plugins/emoji/public/images/twitter/diamond_shape_with_a_dot_inside.png
new file mode 100644
index 0000000000..662d3b53ae
Binary files /dev/null and b/plugins/emoji/public/images/twitter/diamond_shape_with_a_dot_inside.png differ
diff --git a/plugins/emoji/public/images/twitter/diamonds.png b/plugins/emoji/public/images/twitter/diamonds.png
new file mode 100644
index 0000000000..b9f3ca876a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/diamonds.png differ
diff --git a/plugins/emoji/public/images/twitter/disappointed.png b/plugins/emoji/public/images/twitter/disappointed.png
new file mode 100644
index 0000000000..22bf80de00
Binary files /dev/null and b/plugins/emoji/public/images/twitter/disappointed.png differ
diff --git a/plugins/emoji/public/images/twitter/disappointed_relieved.png b/plugins/emoji/public/images/twitter/disappointed_relieved.png
new file mode 100644
index 0000000000..d73d8a31f7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/disappointed_relieved.png differ
diff --git a/plugins/emoji/public/images/twitter/dizzy.png b/plugins/emoji/public/images/twitter/dizzy.png
new file mode 100644
index 0000000000..f98f72b7fd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dizzy.png differ
diff --git a/plugins/emoji/public/images/twitter/dizzy_face.png b/plugins/emoji/public/images/twitter/dizzy_face.png
new file mode 100644
index 0000000000..45d3443efc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dizzy_face.png differ
diff --git a/plugins/emoji/public/images/twitter/do_not_litter.png b/plugins/emoji/public/images/twitter/do_not_litter.png
new file mode 100644
index 0000000000..235ceccc5c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/do_not_litter.png differ
diff --git a/plugins/emoji/public/images/twitter/dog.png b/plugins/emoji/public/images/twitter/dog.png
new file mode 100644
index 0000000000..cb5afae151
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dog.png differ
diff --git a/plugins/emoji/public/images/twitter/dog2.png b/plugins/emoji/public/images/twitter/dog2.png
new file mode 100644
index 0000000000..544b06c57e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dog2.png differ
diff --git a/plugins/emoji/public/images/twitter/dollar.png b/plugins/emoji/public/images/twitter/dollar.png
new file mode 100644
index 0000000000..a6fc28564c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dollar.png differ
diff --git a/plugins/emoji/public/images/twitter/dolls.png b/plugins/emoji/public/images/twitter/dolls.png
new file mode 100644
index 0000000000..bdd1516f43
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dolls.png differ
diff --git a/plugins/emoji/public/images/twitter/dolphin.png b/plugins/emoji/public/images/twitter/dolphin.png
new file mode 100644
index 0000000000..295cdfc4eb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dolphin.png differ
diff --git a/plugins/emoji/public/images/twitter/door.png b/plugins/emoji/public/images/twitter/door.png
new file mode 100644
index 0000000000..b812516a8e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/door.png differ
diff --git a/plugins/emoji/public/images/twitter/doughnut.png b/plugins/emoji/public/images/twitter/doughnut.png
new file mode 100644
index 0000000000..369cb4529f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/doughnut.png differ
diff --git a/plugins/emoji/public/images/twitter/dragon.png b/plugins/emoji/public/images/twitter/dragon.png
new file mode 100644
index 0000000000..60b19a49d7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dragon.png differ
diff --git a/plugins/emoji/public/images/twitter/dragon_face.png b/plugins/emoji/public/images/twitter/dragon_face.png
new file mode 100644
index 0000000000..a082fc5984
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dragon_face.png differ
diff --git a/plugins/emoji/public/images/twitter/dress.png b/plugins/emoji/public/images/twitter/dress.png
new file mode 100644
index 0000000000..f8506d3764
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dress.png differ
diff --git a/plugins/emoji/public/images/twitter/dromedary_camel.png b/plugins/emoji/public/images/twitter/dromedary_camel.png
new file mode 100644
index 0000000000..59b26340bf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dromedary_camel.png differ
diff --git a/plugins/emoji/public/images/twitter/droplet.png b/plugins/emoji/public/images/twitter/droplet.png
new file mode 100644
index 0000000000..c880318b29
Binary files /dev/null and b/plugins/emoji/public/images/twitter/droplet.png differ
diff --git a/plugins/emoji/public/images/twitter/dvd.png b/plugins/emoji/public/images/twitter/dvd.png
new file mode 100644
index 0000000000..aa957ef7f6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/dvd.png differ
diff --git a/plugins/emoji/public/images/twitter/e-mail.png b/plugins/emoji/public/images/twitter/e-mail.png
new file mode 100644
index 0000000000..7b759b705d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/e-mail.png differ
diff --git a/plugins/emoji/public/images/twitter/ear.png b/plugins/emoji/public/images/twitter/ear.png
new file mode 100644
index 0000000000..a195fa5f33
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ear.png differ
diff --git a/plugins/emoji/public/images/twitter/ear_of_rice.png b/plugins/emoji/public/images/twitter/ear_of_rice.png
new file mode 100644
index 0000000000..1d1bc615b6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ear_of_rice.png differ
diff --git a/plugins/emoji/public/images/twitter/earth_africa.png b/plugins/emoji/public/images/twitter/earth_africa.png
new file mode 100644
index 0000000000..9da4b501bd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/earth_africa.png differ
diff --git a/plugins/emoji/public/images/twitter/earth_americas.png b/plugins/emoji/public/images/twitter/earth_americas.png
new file mode 100644
index 0000000000..e3adea7945
Binary files /dev/null and b/plugins/emoji/public/images/twitter/earth_americas.png differ
diff --git a/plugins/emoji/public/images/twitter/earth_asia.png b/plugins/emoji/public/images/twitter/earth_asia.png
new file mode 100644
index 0000000000..6475988021
Binary files /dev/null and b/plugins/emoji/public/images/twitter/earth_asia.png differ
diff --git a/plugins/emoji/public/images/twitter/egg.png b/plugins/emoji/public/images/twitter/egg.png
new file mode 100644
index 0000000000..05d55c3970
Binary files /dev/null and b/plugins/emoji/public/images/twitter/egg.png differ
diff --git a/plugins/emoji/public/images/twitter/eggplant.png b/plugins/emoji/public/images/twitter/eggplant.png
new file mode 100644
index 0000000000..df1dd1a0f1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/eggplant.png differ
diff --git a/plugins/emoji/public/images/twitter/eight.png b/plugins/emoji/public/images/twitter/eight.png
new file mode 100644
index 0000000000..15543e8658
Binary files /dev/null and b/plugins/emoji/public/images/twitter/eight.png differ
diff --git a/plugins/emoji/public/images/twitter/eight_pointed_black_star.png b/plugins/emoji/public/images/twitter/eight_pointed_black_star.png
new file mode 100644
index 0000000000..d377d9dc42
Binary files /dev/null and b/plugins/emoji/public/images/twitter/eight_pointed_black_star.png differ
diff --git a/plugins/emoji/public/images/twitter/eight_spoked_asterisk.png b/plugins/emoji/public/images/twitter/eight_spoked_asterisk.png
new file mode 100644
index 0000000000..e946641cd6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/eight_spoked_asterisk.png differ
diff --git a/plugins/emoji/public/images/twitter/electric_plug.png b/plugins/emoji/public/images/twitter/electric_plug.png
new file mode 100644
index 0000000000..f86e9df0c5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/electric_plug.png differ
diff --git a/plugins/emoji/public/images/twitter/elephant.png b/plugins/emoji/public/images/twitter/elephant.png
new file mode 100644
index 0000000000..4a3a075729
Binary files /dev/null and b/plugins/emoji/public/images/twitter/elephant.png differ
diff --git a/plugins/emoji/public/images/twitter/email.png b/plugins/emoji/public/images/twitter/email.png
new file mode 100644
index 0000000000..48f5f907fa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/email.png differ
diff --git a/plugins/emoji/public/images/twitter/end.png b/plugins/emoji/public/images/twitter/end.png
new file mode 100644
index 0000000000..6f31c3698b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/end.png differ
diff --git a/plugins/emoji/public/images/twitter/envelope.png b/plugins/emoji/public/images/twitter/envelope.png
new file mode 100644
index 0000000000..48f5f907fa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/envelope.png differ
diff --git a/plugins/emoji/public/images/twitter/envelope_with_arrow.png b/plugins/emoji/public/images/twitter/envelope_with_arrow.png
new file mode 100644
index 0000000000..437f2bacfe
Binary files /dev/null and b/plugins/emoji/public/images/twitter/envelope_with_arrow.png differ
diff --git a/plugins/emoji/public/images/twitter/es.png b/plugins/emoji/public/images/twitter/es.png
new file mode 100644
index 0000000000..f1c9ca864a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/es.png differ
diff --git a/plugins/emoji/public/images/twitter/euro.png b/plugins/emoji/public/images/twitter/euro.png
new file mode 100644
index 0000000000..34b3fdca17
Binary files /dev/null and b/plugins/emoji/public/images/twitter/euro.png differ
diff --git a/plugins/emoji/public/images/twitter/european_castle.png b/plugins/emoji/public/images/twitter/european_castle.png
new file mode 100644
index 0000000000..3746920b65
Binary files /dev/null and b/plugins/emoji/public/images/twitter/european_castle.png differ
diff --git a/plugins/emoji/public/images/twitter/european_post_office.png b/plugins/emoji/public/images/twitter/european_post_office.png
new file mode 100644
index 0000000000..1b264d0b65
Binary files /dev/null and b/plugins/emoji/public/images/twitter/european_post_office.png differ
diff --git a/plugins/emoji/public/images/twitter/evergreen_tree.png b/plugins/emoji/public/images/twitter/evergreen_tree.png
new file mode 100644
index 0000000000..eace4a2f80
Binary files /dev/null and b/plugins/emoji/public/images/twitter/evergreen_tree.png differ
diff --git a/plugins/emoji/public/images/twitter/exclamation.png b/plugins/emoji/public/images/twitter/exclamation.png
new file mode 100644
index 0000000000..9fdca664aa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/exclamation.png differ
diff --git a/plugins/emoji/public/images/twitter/expressionless.png b/plugins/emoji/public/images/twitter/expressionless.png
new file mode 100644
index 0000000000..b18262c97a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/expressionless.png differ
diff --git a/plugins/emoji/public/images/twitter/eyeglasses.png b/plugins/emoji/public/images/twitter/eyeglasses.png
new file mode 100644
index 0000000000..56843572e4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/eyeglasses.png differ
diff --git a/plugins/emoji/public/images/twitter/eyes.png b/plugins/emoji/public/images/twitter/eyes.png
new file mode 100644
index 0000000000..543cd83089
Binary files /dev/null and b/plugins/emoji/public/images/twitter/eyes.png differ
diff --git a/plugins/emoji/public/images/twitter/facepunch.png b/plugins/emoji/public/images/twitter/facepunch.png
new file mode 100644
index 0000000000..697997a833
Binary files /dev/null and b/plugins/emoji/public/images/twitter/facepunch.png differ
diff --git a/plugins/emoji/public/images/twitter/factory.png b/plugins/emoji/public/images/twitter/factory.png
new file mode 100644
index 0000000000..ae843aa1fd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/factory.png differ
diff --git a/plugins/emoji/public/images/twitter/fallen_leaf.png b/plugins/emoji/public/images/twitter/fallen_leaf.png
new file mode 100644
index 0000000000..1efff7e2bc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fallen_leaf.png differ
diff --git a/plugins/emoji/public/images/twitter/family.png b/plugins/emoji/public/images/twitter/family.png
new file mode 100644
index 0000000000..c51b9c5349
Binary files /dev/null and b/plugins/emoji/public/images/twitter/family.png differ
diff --git a/plugins/emoji/public/images/twitter/fast_forward.png b/plugins/emoji/public/images/twitter/fast_forward.png
new file mode 100644
index 0000000000..5e5bf418ce
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fast_forward.png differ
diff --git a/plugins/emoji/public/images/twitter/fax.png b/plugins/emoji/public/images/twitter/fax.png
new file mode 100644
index 0000000000..6432b4898e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fax.png differ
diff --git a/plugins/emoji/public/images/twitter/fearful.png b/plugins/emoji/public/images/twitter/fearful.png
new file mode 100644
index 0000000000..1fafb0178c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fearful.png differ
diff --git a/plugins/emoji/public/images/twitter/feet.png b/plugins/emoji/public/images/twitter/feet.png
new file mode 100644
index 0000000000..94deaa1e55
Binary files /dev/null and b/plugins/emoji/public/images/twitter/feet.png differ
diff --git a/plugins/emoji/public/images/twitter/ferris_wheel.png b/plugins/emoji/public/images/twitter/ferris_wheel.png
new file mode 100644
index 0000000000..f1fdeeda81
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ferris_wheel.png differ
diff --git a/plugins/emoji/public/images/twitter/file_folder.png b/plugins/emoji/public/images/twitter/file_folder.png
new file mode 100644
index 0000000000..d35190876c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/file_folder.png differ
diff --git a/plugins/emoji/public/images/twitter/fire.png b/plugins/emoji/public/images/twitter/fire.png
new file mode 100644
index 0000000000..6b794c4fcf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fire.png differ
diff --git a/plugins/emoji/public/images/twitter/fire_engine.png b/plugins/emoji/public/images/twitter/fire_engine.png
new file mode 100644
index 0000000000..74b21fafd1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fire_engine.png differ
diff --git a/plugins/emoji/public/images/twitter/fireworks.png b/plugins/emoji/public/images/twitter/fireworks.png
new file mode 100644
index 0000000000..fbfe37a540
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fireworks.png differ
diff --git a/plugins/emoji/public/images/twitter/first_quarter_moon.png b/plugins/emoji/public/images/twitter/first_quarter_moon.png
new file mode 100644
index 0000000000..e1d010914e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/first_quarter_moon.png differ
diff --git a/plugins/emoji/public/images/twitter/first_quarter_moon_with_face.png b/plugins/emoji/public/images/twitter/first_quarter_moon_with_face.png
new file mode 100644
index 0000000000..3324846ee2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/first_quarter_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/twitter/fish.png b/plugins/emoji/public/images/twitter/fish.png
new file mode 100644
index 0000000000..8da218c4aa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fish.png differ
diff --git a/plugins/emoji/public/images/twitter/fish_cake.png b/plugins/emoji/public/images/twitter/fish_cake.png
new file mode 100644
index 0000000000..7943ce384f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fish_cake.png differ
diff --git a/plugins/emoji/public/images/twitter/fishing_pole_and_fish.png b/plugins/emoji/public/images/twitter/fishing_pole_and_fish.png
new file mode 100644
index 0000000000..eee0257faf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fishing_pole_and_fish.png differ
diff --git a/plugins/emoji/public/images/twitter/fist.png b/plugins/emoji/public/images/twitter/fist.png
new file mode 100644
index 0000000000..2374784cae
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fist.png differ
diff --git a/plugins/emoji/public/images/twitter/five.png b/plugins/emoji/public/images/twitter/five.png
new file mode 100644
index 0000000000..77034136a3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/five.png differ
diff --git a/plugins/emoji/public/images/twitter/flags.png b/plugins/emoji/public/images/twitter/flags.png
new file mode 100644
index 0000000000..f3a2f3b0e3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/flags.png differ
diff --git a/plugins/emoji/public/images/twitter/flashlight.png b/plugins/emoji/public/images/twitter/flashlight.png
new file mode 100644
index 0000000000..de62c7f5f5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/flashlight.png differ
diff --git a/plugins/emoji/public/images/twitter/flipper.png b/plugins/emoji/public/images/twitter/flipper.png
new file mode 100644
index 0000000000..295cdfc4eb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/flipper.png differ
diff --git a/plugins/emoji/public/images/twitter/floppy_disk.png b/plugins/emoji/public/images/twitter/floppy_disk.png
new file mode 100644
index 0000000000..8c93824ee8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/floppy_disk.png differ
diff --git a/plugins/emoji/public/images/twitter/flower_playing_cards.png b/plugins/emoji/public/images/twitter/flower_playing_cards.png
new file mode 100644
index 0000000000..1b18a7d025
Binary files /dev/null and b/plugins/emoji/public/images/twitter/flower_playing_cards.png differ
diff --git a/plugins/emoji/public/images/twitter/flushed.png b/plugins/emoji/public/images/twitter/flushed.png
new file mode 100644
index 0000000000..c973f63a2c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/flushed.png differ
diff --git a/plugins/emoji/public/images/twitter/foggy.png b/plugins/emoji/public/images/twitter/foggy.png
new file mode 100644
index 0000000000..24d3ad909a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/foggy.png differ
diff --git a/plugins/emoji/public/images/twitter/football.png b/plugins/emoji/public/images/twitter/football.png
new file mode 100644
index 0000000000..84f8327a13
Binary files /dev/null and b/plugins/emoji/public/images/twitter/football.png differ
diff --git a/plugins/emoji/public/images/twitter/footprints.png b/plugins/emoji/public/images/twitter/footprints.png
new file mode 100644
index 0000000000..e5db6271ed
Binary files /dev/null and b/plugins/emoji/public/images/twitter/footprints.png differ
diff --git a/plugins/emoji/public/images/twitter/fork_and_knife.png b/plugins/emoji/public/images/twitter/fork_and_knife.png
new file mode 100644
index 0000000000..c13653732d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fork_and_knife.png differ
diff --git a/plugins/emoji/public/images/twitter/fountain.png b/plugins/emoji/public/images/twitter/fountain.png
new file mode 100644
index 0000000000..10c404ca08
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fountain.png differ
diff --git a/plugins/emoji/public/images/twitter/four.png b/plugins/emoji/public/images/twitter/four.png
new file mode 100644
index 0000000000..a6debcffc1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/four.png differ
diff --git a/plugins/emoji/public/images/twitter/four_leaf_clover.png b/plugins/emoji/public/images/twitter/four_leaf_clover.png
new file mode 100644
index 0000000000..0339897b72
Binary files /dev/null and b/plugins/emoji/public/images/twitter/four_leaf_clover.png differ
diff --git a/plugins/emoji/public/images/twitter/fr.png b/plugins/emoji/public/images/twitter/fr.png
new file mode 100644
index 0000000000..5db0326127
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fr.png differ
diff --git a/plugins/emoji/public/images/twitter/free.png b/plugins/emoji/public/images/twitter/free.png
new file mode 100644
index 0000000000..28803e044f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/free.png differ
diff --git a/plugins/emoji/public/images/twitter/fried_shrimp.png b/plugins/emoji/public/images/twitter/fried_shrimp.png
new file mode 100644
index 0000000000..16726fb6ca
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fried_shrimp.png differ
diff --git a/plugins/emoji/public/images/twitter/fries.png b/plugins/emoji/public/images/twitter/fries.png
new file mode 100644
index 0000000000..1b551196cb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fries.png differ
diff --git a/plugins/emoji/public/images/twitter/frog.png b/plugins/emoji/public/images/twitter/frog.png
new file mode 100644
index 0000000000..cc3d02784f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/frog.png differ
diff --git a/plugins/emoji/public/images/twitter/frowning.png b/plugins/emoji/public/images/twitter/frowning.png
new file mode 100644
index 0000000000..03a57244ca
Binary files /dev/null and b/plugins/emoji/public/images/twitter/frowning.png differ
diff --git a/plugins/emoji/public/images/twitter/fuelpump.png b/plugins/emoji/public/images/twitter/fuelpump.png
new file mode 100644
index 0000000000..29e2970484
Binary files /dev/null and b/plugins/emoji/public/images/twitter/fuelpump.png differ
diff --git a/plugins/emoji/public/images/twitter/full_moon.png b/plugins/emoji/public/images/twitter/full_moon.png
new file mode 100644
index 0000000000..0b53a6eb37
Binary files /dev/null and b/plugins/emoji/public/images/twitter/full_moon.png differ
diff --git a/plugins/emoji/public/images/twitter/full_moon_with_face.png b/plugins/emoji/public/images/twitter/full_moon_with_face.png
new file mode 100644
index 0000000000..9728421723
Binary files /dev/null and b/plugins/emoji/public/images/twitter/full_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/twitter/game_die.png b/plugins/emoji/public/images/twitter/game_die.png
new file mode 100644
index 0000000000..5c0cf0ebcc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/game_die.png differ
diff --git a/plugins/emoji/public/images/twitter/gb.png b/plugins/emoji/public/images/twitter/gb.png
new file mode 100644
index 0000000000..3ad16324d3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/gb.png differ
diff --git a/plugins/emoji/public/images/twitter/gem.png b/plugins/emoji/public/images/twitter/gem.png
new file mode 100644
index 0000000000..13cb2b28e7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/gem.png differ
diff --git a/plugins/emoji/public/images/twitter/gemini.png b/plugins/emoji/public/images/twitter/gemini.png
new file mode 100644
index 0000000000..bb1fde5cd7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/gemini.png differ
diff --git a/plugins/emoji/public/images/twitter/ghost.png b/plugins/emoji/public/images/twitter/ghost.png
new file mode 100644
index 0000000000..b764d11384
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ghost.png differ
diff --git a/plugins/emoji/public/images/twitter/gift.png b/plugins/emoji/public/images/twitter/gift.png
new file mode 100644
index 0000000000..054ceb609d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/gift.png differ
diff --git a/plugins/emoji/public/images/twitter/gift_heart.png b/plugins/emoji/public/images/twitter/gift_heart.png
new file mode 100644
index 0000000000..9370396f84
Binary files /dev/null and b/plugins/emoji/public/images/twitter/gift_heart.png differ
diff --git a/plugins/emoji/public/images/twitter/girl.png b/plugins/emoji/public/images/twitter/girl.png
new file mode 100644
index 0000000000..1c31255e4f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/girl.png differ
diff --git a/plugins/emoji/public/images/twitter/globe_with_meridians.png b/plugins/emoji/public/images/twitter/globe_with_meridians.png
new file mode 100644
index 0000000000..7875096c3c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/globe_with_meridians.png differ
diff --git a/plugins/emoji/public/images/twitter/goat.png b/plugins/emoji/public/images/twitter/goat.png
new file mode 100644
index 0000000000..a6f5479a8d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/goat.png differ
diff --git a/plugins/emoji/public/images/twitter/golf.png b/plugins/emoji/public/images/twitter/golf.png
new file mode 100644
index 0000000000..cf27469ca3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/golf.png differ
diff --git a/plugins/emoji/public/images/twitter/grapes.png b/plugins/emoji/public/images/twitter/grapes.png
new file mode 100644
index 0000000000..e874a577e6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/grapes.png differ
diff --git a/plugins/emoji/public/images/twitter/green_apple.png b/plugins/emoji/public/images/twitter/green_apple.png
new file mode 100644
index 0000000000..37a3a771d2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/green_apple.png differ
diff --git a/plugins/emoji/public/images/twitter/green_book.png b/plugins/emoji/public/images/twitter/green_book.png
new file mode 100644
index 0000000000..3b642510e1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/green_book.png differ
diff --git a/plugins/emoji/public/images/twitter/green_heart.png b/plugins/emoji/public/images/twitter/green_heart.png
new file mode 100644
index 0000000000..6db7f0dff9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/green_heart.png differ
diff --git a/plugins/emoji/public/images/twitter/grey_exclamation.png b/plugins/emoji/public/images/twitter/grey_exclamation.png
new file mode 100644
index 0000000000..938a03f1f5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/grey_exclamation.png differ
diff --git a/plugins/emoji/public/images/twitter/grey_question.png b/plugins/emoji/public/images/twitter/grey_question.png
new file mode 100644
index 0000000000..f315475e0e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/grey_question.png differ
diff --git a/plugins/emoji/public/images/twitter/grimacing.png b/plugins/emoji/public/images/twitter/grimacing.png
new file mode 100644
index 0000000000..3819f5fdaa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/grimacing.png differ
diff --git a/plugins/emoji/public/images/twitter/grin.png b/plugins/emoji/public/images/twitter/grin.png
new file mode 100644
index 0000000000..394fcef2a3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/grin.png differ
diff --git a/plugins/emoji/public/images/twitter/grinning.png b/plugins/emoji/public/images/twitter/grinning.png
new file mode 100644
index 0000000000..34ac223f39
Binary files /dev/null and b/plugins/emoji/public/images/twitter/grinning.png differ
diff --git a/plugins/emoji/public/images/twitter/guardsman.png b/plugins/emoji/public/images/twitter/guardsman.png
new file mode 100644
index 0000000000..5d512e174e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/guardsman.png differ
diff --git a/plugins/emoji/public/images/twitter/guitar.png b/plugins/emoji/public/images/twitter/guitar.png
new file mode 100644
index 0000000000..9c7624f017
Binary files /dev/null and b/plugins/emoji/public/images/twitter/guitar.png differ
diff --git a/plugins/emoji/public/images/twitter/gun.png b/plugins/emoji/public/images/twitter/gun.png
new file mode 100644
index 0000000000..7f72b35146
Binary files /dev/null and b/plugins/emoji/public/images/twitter/gun.png differ
diff --git a/plugins/emoji/public/images/twitter/haircut.png b/plugins/emoji/public/images/twitter/haircut.png
new file mode 100644
index 0000000000..042cdf54da
Binary files /dev/null and b/plugins/emoji/public/images/twitter/haircut.png differ
diff --git a/plugins/emoji/public/images/twitter/hamburger.png b/plugins/emoji/public/images/twitter/hamburger.png
new file mode 100644
index 0000000000..d720c57208
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hamburger.png differ
diff --git a/plugins/emoji/public/images/twitter/hammer.png b/plugins/emoji/public/images/twitter/hammer.png
new file mode 100644
index 0000000000..e0c8dddcb0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hammer.png differ
diff --git a/plugins/emoji/public/images/twitter/hamster.png b/plugins/emoji/public/images/twitter/hamster.png
new file mode 100644
index 0000000000..f8de04aa91
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hamster.png differ
diff --git a/plugins/emoji/public/images/twitter/hand.png b/plugins/emoji/public/images/twitter/hand.png
new file mode 100644
index 0000000000..f7edfd6c3d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hand.png differ
diff --git a/plugins/emoji/public/images/twitter/handbag.png b/plugins/emoji/public/images/twitter/handbag.png
new file mode 100644
index 0000000000..c369a29a58
Binary files /dev/null and b/plugins/emoji/public/images/twitter/handbag.png differ
diff --git a/plugins/emoji/public/images/twitter/hankey.png b/plugins/emoji/public/images/twitter/hankey.png
new file mode 100644
index 0000000000..604d2a2d0a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hankey.png differ
diff --git a/plugins/emoji/public/images/twitter/hash.png b/plugins/emoji/public/images/twitter/hash.png
new file mode 100644
index 0000000000..367c84217f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hash.png differ
diff --git a/plugins/emoji/public/images/twitter/hatched_chick.png b/plugins/emoji/public/images/twitter/hatched_chick.png
new file mode 100644
index 0000000000..2593d560f6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hatched_chick.png differ
diff --git a/plugins/emoji/public/images/twitter/hatching_chick.png b/plugins/emoji/public/images/twitter/hatching_chick.png
new file mode 100644
index 0000000000..e471ba2cec
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hatching_chick.png differ
diff --git a/plugins/emoji/public/images/twitter/headphones.png b/plugins/emoji/public/images/twitter/headphones.png
new file mode 100644
index 0000000000..58c3aabcdc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/headphones.png differ
diff --git a/plugins/emoji/public/images/twitter/hear_no_evil.png b/plugins/emoji/public/images/twitter/hear_no_evil.png
new file mode 100644
index 0000000000..dc5c4b2a34
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hear_no_evil.png differ
diff --git a/plugins/emoji/public/images/twitter/heart.png b/plugins/emoji/public/images/twitter/heart.png
new file mode 100644
index 0000000000..add7a5de00
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heart.png differ
diff --git a/plugins/emoji/public/images/twitter/heart_decoration.png b/plugins/emoji/public/images/twitter/heart_decoration.png
new file mode 100644
index 0000000000..ca45712fa8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heart_decoration.png differ
diff --git a/plugins/emoji/public/images/twitter/heart_eyes.png b/plugins/emoji/public/images/twitter/heart_eyes.png
new file mode 100644
index 0000000000..857e1be059
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heart_eyes.png differ
diff --git a/plugins/emoji/public/images/twitter/heart_eyes_cat.png b/plugins/emoji/public/images/twitter/heart_eyes_cat.png
new file mode 100644
index 0000000000..7fcb09e564
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heart_eyes_cat.png differ
diff --git a/plugins/emoji/public/images/twitter/heartbeat.png b/plugins/emoji/public/images/twitter/heartbeat.png
new file mode 100644
index 0000000000..95416c6f11
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heartbeat.png differ
diff --git a/plugins/emoji/public/images/twitter/heartpulse.png b/plugins/emoji/public/images/twitter/heartpulse.png
new file mode 100644
index 0000000000..e6256db2d1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heartpulse.png differ
diff --git a/plugins/emoji/public/images/twitter/hearts.png b/plugins/emoji/public/images/twitter/hearts.png
new file mode 100644
index 0000000000..3e56fe0cbf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hearts.png differ
diff --git a/plugins/emoji/public/images/twitter/heavy_check_mark.png b/plugins/emoji/public/images/twitter/heavy_check_mark.png
new file mode 100644
index 0000000000..41a80f3f6e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heavy_check_mark.png differ
diff --git a/plugins/emoji/public/images/twitter/heavy_division_sign.png b/plugins/emoji/public/images/twitter/heavy_division_sign.png
new file mode 100644
index 0000000000..5a780b11a9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heavy_division_sign.png differ
diff --git a/plugins/emoji/public/images/twitter/heavy_dollar_sign.png b/plugins/emoji/public/images/twitter/heavy_dollar_sign.png
new file mode 100644
index 0000000000..849fbbef5d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heavy_dollar_sign.png differ
diff --git a/plugins/emoji/public/images/twitter/heavy_exclamation_mark.png b/plugins/emoji/public/images/twitter/heavy_exclamation_mark.png
new file mode 100644
index 0000000000..9fdca664aa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heavy_exclamation_mark.png differ
diff --git a/plugins/emoji/public/images/twitter/heavy_minus_sign.png b/plugins/emoji/public/images/twitter/heavy_minus_sign.png
new file mode 100644
index 0000000000..91e1e27e7a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heavy_minus_sign.png differ
diff --git a/plugins/emoji/public/images/twitter/heavy_multiplication_x.png b/plugins/emoji/public/images/twitter/heavy_multiplication_x.png
new file mode 100644
index 0000000000..f497148921
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heavy_multiplication_x.png differ
diff --git a/plugins/emoji/public/images/twitter/heavy_plus_sign.png b/plugins/emoji/public/images/twitter/heavy_plus_sign.png
new file mode 100644
index 0000000000..245b120410
Binary files /dev/null and b/plugins/emoji/public/images/twitter/heavy_plus_sign.png differ
diff --git a/plugins/emoji/public/images/twitter/helicopter.png b/plugins/emoji/public/images/twitter/helicopter.png
new file mode 100644
index 0000000000..cfa64f4672
Binary files /dev/null and b/plugins/emoji/public/images/twitter/helicopter.png differ
diff --git a/plugins/emoji/public/images/twitter/herb.png b/plugins/emoji/public/images/twitter/herb.png
new file mode 100644
index 0000000000..8613193fc9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/herb.png differ
diff --git a/plugins/emoji/public/images/twitter/hibiscus.png b/plugins/emoji/public/images/twitter/hibiscus.png
new file mode 100644
index 0000000000..07e5fb0a36
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hibiscus.png differ
diff --git a/plugins/emoji/public/images/twitter/high_brightness.png b/plugins/emoji/public/images/twitter/high_brightness.png
new file mode 100644
index 0000000000..7ef73ec902
Binary files /dev/null and b/plugins/emoji/public/images/twitter/high_brightness.png differ
diff --git a/plugins/emoji/public/images/twitter/high_heel.png b/plugins/emoji/public/images/twitter/high_heel.png
new file mode 100644
index 0000000000..ef4e937073
Binary files /dev/null and b/plugins/emoji/public/images/twitter/high_heel.png differ
diff --git a/plugins/emoji/public/images/twitter/hocho.png b/plugins/emoji/public/images/twitter/hocho.png
new file mode 100644
index 0000000000..8c09593b14
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hocho.png differ
diff --git a/plugins/emoji/public/images/twitter/honey_pot.png b/plugins/emoji/public/images/twitter/honey_pot.png
new file mode 100644
index 0000000000..c2d08d1174
Binary files /dev/null and b/plugins/emoji/public/images/twitter/honey_pot.png differ
diff --git a/plugins/emoji/public/images/twitter/honeybee.png b/plugins/emoji/public/images/twitter/honeybee.png
new file mode 100644
index 0000000000..fa066a08d2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/honeybee.png differ
diff --git a/plugins/emoji/public/images/twitter/horse.png b/plugins/emoji/public/images/twitter/horse.png
new file mode 100644
index 0000000000..f7d143166c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/horse.png differ
diff --git a/plugins/emoji/public/images/twitter/horse_racing.png b/plugins/emoji/public/images/twitter/horse_racing.png
new file mode 100644
index 0000000000..026f9db33f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/horse_racing.png differ
diff --git a/plugins/emoji/public/images/twitter/hospital.png b/plugins/emoji/public/images/twitter/hospital.png
new file mode 100644
index 0000000000..6fce5dd0b2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hospital.png differ
diff --git a/plugins/emoji/public/images/twitter/hotel.png b/plugins/emoji/public/images/twitter/hotel.png
new file mode 100644
index 0000000000..63f5c5b1f3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hotel.png differ
diff --git a/plugins/emoji/public/images/twitter/hotsprings.png b/plugins/emoji/public/images/twitter/hotsprings.png
new file mode 100644
index 0000000000..e88aa44b31
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hotsprings.png differ
diff --git a/plugins/emoji/public/images/twitter/hourglass.png b/plugins/emoji/public/images/twitter/hourglass.png
new file mode 100644
index 0000000000..55d822d0a1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hourglass.png differ
diff --git a/plugins/emoji/public/images/twitter/hourglass_flowing_sand.png b/plugins/emoji/public/images/twitter/hourglass_flowing_sand.png
new file mode 100644
index 0000000000..8f87e0ae73
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hourglass_flowing_sand.png differ
diff --git a/plugins/emoji/public/images/twitter/house.png b/plugins/emoji/public/images/twitter/house.png
new file mode 100644
index 0000000000..ed85df5dc9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/house.png differ
diff --git a/plugins/emoji/public/images/twitter/house_with_garden.png b/plugins/emoji/public/images/twitter/house_with_garden.png
new file mode 100644
index 0000000000..460aa6ce65
Binary files /dev/null and b/plugins/emoji/public/images/twitter/house_with_garden.png differ
diff --git a/plugins/emoji/public/images/twitter/hushed.png b/plugins/emoji/public/images/twitter/hushed.png
new file mode 100644
index 0000000000..7df7660877
Binary files /dev/null and b/plugins/emoji/public/images/twitter/hushed.png differ
diff --git a/plugins/emoji/public/images/twitter/ice_cream.png b/plugins/emoji/public/images/twitter/ice_cream.png
new file mode 100644
index 0000000000..93123a28a5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ice_cream.png differ
diff --git a/plugins/emoji/public/images/twitter/icecream.png b/plugins/emoji/public/images/twitter/icecream.png
new file mode 100644
index 0000000000..97a9e2ff70
Binary files /dev/null and b/plugins/emoji/public/images/twitter/icecream.png differ
diff --git a/plugins/emoji/public/images/twitter/id.png b/plugins/emoji/public/images/twitter/id.png
new file mode 100644
index 0000000000..b16bb031fa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/id.png differ
diff --git a/plugins/emoji/public/images/twitter/ideograph_advantage.png b/plugins/emoji/public/images/twitter/ideograph_advantage.png
new file mode 100644
index 0000000000..b29464fc21
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ideograph_advantage.png differ
diff --git a/plugins/emoji/public/images/twitter/imp.png b/plugins/emoji/public/images/twitter/imp.png
new file mode 100644
index 0000000000..682809ce1a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/imp.png differ
diff --git a/plugins/emoji/public/images/twitter/inbox_tray.png b/plugins/emoji/public/images/twitter/inbox_tray.png
new file mode 100644
index 0000000000..0f7d7a4d3b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/inbox_tray.png differ
diff --git a/plugins/emoji/public/images/twitter/incoming_envelope.png b/plugins/emoji/public/images/twitter/incoming_envelope.png
new file mode 100644
index 0000000000..92c390aff8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/incoming_envelope.png differ
diff --git a/plugins/emoji/public/images/twitter/information_desk_person.png b/plugins/emoji/public/images/twitter/information_desk_person.png
new file mode 100644
index 0000000000..16ccab1769
Binary files /dev/null and b/plugins/emoji/public/images/twitter/information_desk_person.png differ
diff --git a/plugins/emoji/public/images/twitter/information_source.png b/plugins/emoji/public/images/twitter/information_source.png
new file mode 100644
index 0000000000..18df7aa44e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/information_source.png differ
diff --git a/plugins/emoji/public/images/twitter/innocent.png b/plugins/emoji/public/images/twitter/innocent.png
new file mode 100644
index 0000000000..5a51477c4d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/innocent.png differ
diff --git a/plugins/emoji/public/images/twitter/interrobang.png b/plugins/emoji/public/images/twitter/interrobang.png
new file mode 100644
index 0000000000..99a7e68bc6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/interrobang.png differ
diff --git a/plugins/emoji/public/images/twitter/iphone.png b/plugins/emoji/public/images/twitter/iphone.png
new file mode 100644
index 0000000000..9e04b16d9c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/iphone.png differ
diff --git a/plugins/emoji/public/images/twitter/it.png b/plugins/emoji/public/images/twitter/it.png
new file mode 100644
index 0000000000..fc876eb18f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/it.png differ
diff --git a/plugins/emoji/public/images/twitter/izakaya_lantern.png b/plugins/emoji/public/images/twitter/izakaya_lantern.png
new file mode 100644
index 0000000000..b0db1cbed6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/izakaya_lantern.png differ
diff --git a/plugins/emoji/public/images/twitter/jack_o_lantern.png b/plugins/emoji/public/images/twitter/jack_o_lantern.png
new file mode 100644
index 0000000000..2dbbe437ba
Binary files /dev/null and b/plugins/emoji/public/images/twitter/jack_o_lantern.png differ
diff --git a/plugins/emoji/public/images/twitter/japan.png b/plugins/emoji/public/images/twitter/japan.png
new file mode 100644
index 0000000000..2e99c83c40
Binary files /dev/null and b/plugins/emoji/public/images/twitter/japan.png differ
diff --git a/plugins/emoji/public/images/twitter/japanese_castle.png b/plugins/emoji/public/images/twitter/japanese_castle.png
new file mode 100644
index 0000000000..597bd22440
Binary files /dev/null and b/plugins/emoji/public/images/twitter/japanese_castle.png differ
diff --git a/plugins/emoji/public/images/twitter/japanese_goblin.png b/plugins/emoji/public/images/twitter/japanese_goblin.png
new file mode 100644
index 0000000000..714349f7ff
Binary files /dev/null and b/plugins/emoji/public/images/twitter/japanese_goblin.png differ
diff --git a/plugins/emoji/public/images/twitter/japanese_ogre.png b/plugins/emoji/public/images/twitter/japanese_ogre.png
new file mode 100644
index 0000000000..177fdf4c4d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/japanese_ogre.png differ
diff --git a/plugins/emoji/public/images/twitter/jeans.png b/plugins/emoji/public/images/twitter/jeans.png
new file mode 100644
index 0000000000..72be73c8b5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/jeans.png differ
diff --git a/plugins/emoji/public/images/twitter/joy.png b/plugins/emoji/public/images/twitter/joy.png
new file mode 100644
index 0000000000..b2a2037a0e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/joy.png differ
diff --git a/plugins/emoji/public/images/twitter/joy_cat.png b/plugins/emoji/public/images/twitter/joy_cat.png
new file mode 100644
index 0000000000..dbd4f34b75
Binary files /dev/null and b/plugins/emoji/public/images/twitter/joy_cat.png differ
diff --git a/plugins/emoji/public/images/twitter/jp.png b/plugins/emoji/public/images/twitter/jp.png
new file mode 100644
index 0000000000..64967f96ca
Binary files /dev/null and b/plugins/emoji/public/images/twitter/jp.png differ
diff --git a/plugins/emoji/public/images/twitter/key.png b/plugins/emoji/public/images/twitter/key.png
new file mode 100644
index 0000000000..161224953d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/key.png differ
diff --git a/plugins/emoji/public/images/twitter/keycap_ten.png b/plugins/emoji/public/images/twitter/keycap_ten.png
new file mode 100644
index 0000000000..a37076824d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/keycap_ten.png differ
diff --git a/plugins/emoji/public/images/twitter/kimono.png b/plugins/emoji/public/images/twitter/kimono.png
new file mode 100644
index 0000000000..ccb6d6817b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/kimono.png differ
diff --git a/plugins/emoji/public/images/twitter/kiss.png b/plugins/emoji/public/images/twitter/kiss.png
new file mode 100644
index 0000000000..aff0652a00
Binary files /dev/null and b/plugins/emoji/public/images/twitter/kiss.png differ
diff --git a/plugins/emoji/public/images/twitter/kissing.png b/plugins/emoji/public/images/twitter/kissing.png
new file mode 100644
index 0000000000..12d18f7c0b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/kissing.png differ
diff --git a/plugins/emoji/public/images/twitter/kissing_cat.png b/plugins/emoji/public/images/twitter/kissing_cat.png
new file mode 100644
index 0000000000..b454c649af
Binary files /dev/null and b/plugins/emoji/public/images/twitter/kissing_cat.png differ
diff --git a/plugins/emoji/public/images/twitter/kissing_closed_eyes.png b/plugins/emoji/public/images/twitter/kissing_closed_eyes.png
new file mode 100644
index 0000000000..b22b35c5af
Binary files /dev/null and b/plugins/emoji/public/images/twitter/kissing_closed_eyes.png differ
diff --git a/plugins/emoji/public/images/twitter/kissing_heart.png b/plugins/emoji/public/images/twitter/kissing_heart.png
new file mode 100644
index 0000000000..f85e7ba396
Binary files /dev/null and b/plugins/emoji/public/images/twitter/kissing_heart.png differ
diff --git a/plugins/emoji/public/images/twitter/kissing_smiling_eyes.png b/plugins/emoji/public/images/twitter/kissing_smiling_eyes.png
new file mode 100644
index 0000000000..871680f68a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/kissing_smiling_eyes.png differ
diff --git a/plugins/emoji/public/images/twitter/knife.png b/plugins/emoji/public/images/twitter/knife.png
new file mode 100644
index 0000000000..8c09593b14
Binary files /dev/null and b/plugins/emoji/public/images/twitter/knife.png differ
diff --git a/plugins/emoji/public/images/twitter/koala.png b/plugins/emoji/public/images/twitter/koala.png
new file mode 100644
index 0000000000..7dc6ffc0d8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/koala.png differ
diff --git a/plugins/emoji/public/images/twitter/koko.png b/plugins/emoji/public/images/twitter/koko.png
new file mode 100644
index 0000000000..cdfe2da910
Binary files /dev/null and b/plugins/emoji/public/images/twitter/koko.png differ
diff --git a/plugins/emoji/public/images/twitter/kr.png b/plugins/emoji/public/images/twitter/kr.png
new file mode 100644
index 0000000000..e3f5499c6f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/kr.png differ
diff --git a/plugins/emoji/public/images/twitter/lantern.png b/plugins/emoji/public/images/twitter/lantern.png
new file mode 100644
index 0000000000..b0db1cbed6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/lantern.png differ
diff --git a/plugins/emoji/public/images/twitter/large_blue_circle.png b/plugins/emoji/public/images/twitter/large_blue_circle.png
new file mode 100644
index 0000000000..c88d962c76
Binary files /dev/null and b/plugins/emoji/public/images/twitter/large_blue_circle.png differ
diff --git a/plugins/emoji/public/images/twitter/large_blue_diamond.png b/plugins/emoji/public/images/twitter/large_blue_diamond.png
new file mode 100644
index 0000000000..6132b0ae5e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/large_blue_diamond.png differ
diff --git a/plugins/emoji/public/images/twitter/large_orange_diamond.png b/plugins/emoji/public/images/twitter/large_orange_diamond.png
new file mode 100644
index 0000000000..fe248ded8b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/large_orange_diamond.png differ
diff --git a/plugins/emoji/public/images/twitter/last_quarter_moon.png b/plugins/emoji/public/images/twitter/last_quarter_moon.png
new file mode 100644
index 0000000000..768f9a1a0f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/last_quarter_moon.png differ
diff --git a/plugins/emoji/public/images/twitter/last_quarter_moon_with_face.png b/plugins/emoji/public/images/twitter/last_quarter_moon_with_face.png
new file mode 100644
index 0000000000..ac37bf6a32
Binary files /dev/null and b/plugins/emoji/public/images/twitter/last_quarter_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/twitter/laughing.png b/plugins/emoji/public/images/twitter/laughing.png
new file mode 100644
index 0000000000..a0f1a824ed
Binary files /dev/null and b/plugins/emoji/public/images/twitter/laughing.png differ
diff --git a/plugins/emoji/public/images/twitter/leaves.png b/plugins/emoji/public/images/twitter/leaves.png
new file mode 100644
index 0000000000..17f047a526
Binary files /dev/null and b/plugins/emoji/public/images/twitter/leaves.png differ
diff --git a/plugins/emoji/public/images/twitter/ledger.png b/plugins/emoji/public/images/twitter/ledger.png
new file mode 100644
index 0000000000..065fd009a2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ledger.png differ
diff --git a/plugins/emoji/public/images/twitter/left_luggage.png b/plugins/emoji/public/images/twitter/left_luggage.png
new file mode 100644
index 0000000000..ea5be868ca
Binary files /dev/null and b/plugins/emoji/public/images/twitter/left_luggage.png differ
diff --git a/plugins/emoji/public/images/twitter/left_right_arrow.png b/plugins/emoji/public/images/twitter/left_right_arrow.png
new file mode 100644
index 0000000000..189d061eb2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/left_right_arrow.png differ
diff --git a/plugins/emoji/public/images/twitter/leftwards_arrow_with_hook.png b/plugins/emoji/public/images/twitter/leftwards_arrow_with_hook.png
new file mode 100644
index 0000000000..2335c39859
Binary files /dev/null and b/plugins/emoji/public/images/twitter/leftwards_arrow_with_hook.png differ
diff --git a/plugins/emoji/public/images/twitter/lemon.png b/plugins/emoji/public/images/twitter/lemon.png
new file mode 100644
index 0000000000..e36b801191
Binary files /dev/null and b/plugins/emoji/public/images/twitter/lemon.png differ
diff --git a/plugins/emoji/public/images/twitter/leo.png b/plugins/emoji/public/images/twitter/leo.png
new file mode 100644
index 0000000000..d2d00b2f6c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/leo.png differ
diff --git a/plugins/emoji/public/images/twitter/leopard.png b/plugins/emoji/public/images/twitter/leopard.png
new file mode 100644
index 0000000000..0088e88ea8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/leopard.png differ
diff --git a/plugins/emoji/public/images/twitter/libra.png b/plugins/emoji/public/images/twitter/libra.png
new file mode 100644
index 0000000000..8033638220
Binary files /dev/null and b/plugins/emoji/public/images/twitter/libra.png differ
diff --git a/plugins/emoji/public/images/twitter/light_rail.png b/plugins/emoji/public/images/twitter/light_rail.png
new file mode 100644
index 0000000000..9644a1448e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/light_rail.png differ
diff --git a/plugins/emoji/public/images/twitter/link.png b/plugins/emoji/public/images/twitter/link.png
new file mode 100644
index 0000000000..57b60862dc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/link.png differ
diff --git a/plugins/emoji/public/images/twitter/lips.png b/plugins/emoji/public/images/twitter/lips.png
new file mode 100644
index 0000000000..6cbd8bef1a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/lips.png differ
diff --git a/plugins/emoji/public/images/twitter/lipstick.png b/plugins/emoji/public/images/twitter/lipstick.png
new file mode 100644
index 0000000000..cd66dc73d4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/lipstick.png differ
diff --git a/plugins/emoji/public/images/twitter/lock.png b/plugins/emoji/public/images/twitter/lock.png
new file mode 100644
index 0000000000..0ca7847e76
Binary files /dev/null and b/plugins/emoji/public/images/twitter/lock.png differ
diff --git a/plugins/emoji/public/images/twitter/lock_with_ink_pen.png b/plugins/emoji/public/images/twitter/lock_with_ink_pen.png
new file mode 100644
index 0000000000..d15fc2c084
Binary files /dev/null and b/plugins/emoji/public/images/twitter/lock_with_ink_pen.png differ
diff --git a/plugins/emoji/public/images/twitter/lollipop.png b/plugins/emoji/public/images/twitter/lollipop.png
new file mode 100644
index 0000000000..e1b5e20806
Binary files /dev/null and b/plugins/emoji/public/images/twitter/lollipop.png differ
diff --git a/plugins/emoji/public/images/twitter/loop.png b/plugins/emoji/public/images/twitter/loop.png
new file mode 100644
index 0000000000..84531b512e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/loop.png differ
diff --git a/plugins/emoji/public/images/twitter/loud_sound.png b/plugins/emoji/public/images/twitter/loud_sound.png
new file mode 100644
index 0000000000..5223a4fdf0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/loud_sound.png differ
diff --git a/plugins/emoji/public/images/twitter/loudspeaker.png b/plugins/emoji/public/images/twitter/loudspeaker.png
new file mode 100644
index 0000000000..07a48a075b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/loudspeaker.png differ
diff --git a/plugins/emoji/public/images/twitter/love_hotel.png b/plugins/emoji/public/images/twitter/love_hotel.png
new file mode 100644
index 0000000000..361bd8b90a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/love_hotel.png differ
diff --git a/plugins/emoji/public/images/twitter/love_letter.png b/plugins/emoji/public/images/twitter/love_letter.png
new file mode 100644
index 0000000000..f21cb7ce09
Binary files /dev/null and b/plugins/emoji/public/images/twitter/love_letter.png differ
diff --git a/plugins/emoji/public/images/twitter/low_brightness.png b/plugins/emoji/public/images/twitter/low_brightness.png
new file mode 100644
index 0000000000..3793de1799
Binary files /dev/null and b/plugins/emoji/public/images/twitter/low_brightness.png differ
diff --git a/plugins/emoji/public/images/twitter/m.png b/plugins/emoji/public/images/twitter/m.png
new file mode 100644
index 0000000000..196a585126
Binary files /dev/null and b/plugins/emoji/public/images/twitter/m.png differ
diff --git a/plugins/emoji/public/images/twitter/mag.png b/plugins/emoji/public/images/twitter/mag.png
new file mode 100644
index 0000000000..7b0029e578
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mag.png differ
diff --git a/plugins/emoji/public/images/twitter/mag_right.png b/plugins/emoji/public/images/twitter/mag_right.png
new file mode 100644
index 0000000000..768ea43482
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mag_right.png differ
diff --git a/plugins/emoji/public/images/twitter/mahjong.png b/plugins/emoji/public/images/twitter/mahjong.png
new file mode 100644
index 0000000000..ff28ce732d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mahjong.png differ
diff --git a/plugins/emoji/public/images/twitter/mailbox.png b/plugins/emoji/public/images/twitter/mailbox.png
new file mode 100644
index 0000000000..a4971adecb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mailbox.png differ
diff --git a/plugins/emoji/public/images/twitter/mailbox_closed.png b/plugins/emoji/public/images/twitter/mailbox_closed.png
new file mode 100644
index 0000000000..2619758adc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mailbox_closed.png differ
diff --git a/plugins/emoji/public/images/twitter/mailbox_with_mail.png b/plugins/emoji/public/images/twitter/mailbox_with_mail.png
new file mode 100644
index 0000000000..e2d7887c7f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mailbox_with_mail.png differ
diff --git a/plugins/emoji/public/images/twitter/mailbox_with_no_mail.png b/plugins/emoji/public/images/twitter/mailbox_with_no_mail.png
new file mode 100644
index 0000000000..9fa2c61b61
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mailbox_with_no_mail.png differ
diff --git a/plugins/emoji/public/images/twitter/man.png b/plugins/emoji/public/images/twitter/man.png
new file mode 100644
index 0000000000..2db9bd311b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/man.png differ
diff --git a/plugins/emoji/public/images/twitter/man_with_gua_pi_mao.png b/plugins/emoji/public/images/twitter/man_with_gua_pi_mao.png
new file mode 100644
index 0000000000..fc3a90d2de
Binary files /dev/null and b/plugins/emoji/public/images/twitter/man_with_gua_pi_mao.png differ
diff --git a/plugins/emoji/public/images/twitter/man_with_turban.png b/plugins/emoji/public/images/twitter/man_with_turban.png
new file mode 100644
index 0000000000..22d5ac6b44
Binary files /dev/null and b/plugins/emoji/public/images/twitter/man_with_turban.png differ
diff --git a/plugins/emoji/public/images/twitter/mans_shoe.png b/plugins/emoji/public/images/twitter/mans_shoe.png
new file mode 100644
index 0000000000..71d4be2c33
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mans_shoe.png differ
diff --git a/plugins/emoji/public/images/twitter/maple_leaf.png b/plugins/emoji/public/images/twitter/maple_leaf.png
new file mode 100644
index 0000000000..97faddd01c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/maple_leaf.png differ
diff --git a/plugins/emoji/public/images/twitter/mask.png b/plugins/emoji/public/images/twitter/mask.png
new file mode 100644
index 0000000000..f329141d5e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mask.png differ
diff --git a/plugins/emoji/public/images/twitter/massage.png b/plugins/emoji/public/images/twitter/massage.png
new file mode 100644
index 0000000000..fe19362f30
Binary files /dev/null and b/plugins/emoji/public/images/twitter/massage.png differ
diff --git a/plugins/emoji/public/images/twitter/meat_on_bone.png b/plugins/emoji/public/images/twitter/meat_on_bone.png
new file mode 100644
index 0000000000..8823c3350a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/meat_on_bone.png differ
diff --git a/plugins/emoji/public/images/twitter/mega.png b/plugins/emoji/public/images/twitter/mega.png
new file mode 100644
index 0000000000..d77e10cc9f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mega.png differ
diff --git a/plugins/emoji/public/images/twitter/melon.png b/plugins/emoji/public/images/twitter/melon.png
new file mode 100644
index 0000000000..d5243e0c9e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/melon.png differ
diff --git a/plugins/emoji/public/images/twitter/memo.png b/plugins/emoji/public/images/twitter/memo.png
new file mode 100644
index 0000000000..9bbc624eb0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/memo.png differ
diff --git a/plugins/emoji/public/images/twitter/mens.png b/plugins/emoji/public/images/twitter/mens.png
new file mode 100644
index 0000000000..3b84cf01cb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mens.png differ
diff --git a/plugins/emoji/public/images/twitter/metro.png b/plugins/emoji/public/images/twitter/metro.png
new file mode 100644
index 0000000000..319b6428d2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/metro.png differ
diff --git a/plugins/emoji/public/images/twitter/microphone.png b/plugins/emoji/public/images/twitter/microphone.png
new file mode 100644
index 0000000000..3e909125b1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/microphone.png differ
diff --git a/plugins/emoji/public/images/twitter/microscope.png b/plugins/emoji/public/images/twitter/microscope.png
new file mode 100644
index 0000000000..d06f145d9f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/microscope.png differ
diff --git a/plugins/emoji/public/images/twitter/milky_way.png b/plugins/emoji/public/images/twitter/milky_way.png
new file mode 100644
index 0000000000..da046e957c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/milky_way.png differ
diff --git a/plugins/emoji/public/images/twitter/minibus.png b/plugins/emoji/public/images/twitter/minibus.png
new file mode 100644
index 0000000000..592058cd58
Binary files /dev/null and b/plugins/emoji/public/images/twitter/minibus.png differ
diff --git a/plugins/emoji/public/images/twitter/minidisc.png b/plugins/emoji/public/images/twitter/minidisc.png
new file mode 100644
index 0000000000..d7e1bea69a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/minidisc.png differ
diff --git a/plugins/emoji/public/images/twitter/mobile_phone_off.png b/plugins/emoji/public/images/twitter/mobile_phone_off.png
new file mode 100644
index 0000000000..ae6eddf731
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mobile_phone_off.png differ
diff --git a/plugins/emoji/public/images/twitter/money_with_wings.png b/plugins/emoji/public/images/twitter/money_with_wings.png
new file mode 100644
index 0000000000..7cd9b86ce0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/money_with_wings.png differ
diff --git a/plugins/emoji/public/images/twitter/moneybag.png b/plugins/emoji/public/images/twitter/moneybag.png
new file mode 100644
index 0000000000..00952b3b1b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/moneybag.png differ
diff --git a/plugins/emoji/public/images/twitter/monkey.png b/plugins/emoji/public/images/twitter/monkey.png
new file mode 100644
index 0000000000..f71be14fe2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/monkey.png differ
diff --git a/plugins/emoji/public/images/twitter/monkey_face.png b/plugins/emoji/public/images/twitter/monkey_face.png
new file mode 100644
index 0000000000..a37355267c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/monkey_face.png differ
diff --git a/plugins/emoji/public/images/twitter/monorail.png b/plugins/emoji/public/images/twitter/monorail.png
new file mode 100644
index 0000000000..1887dd9e7d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/monorail.png differ
diff --git a/plugins/emoji/public/images/twitter/moon.png b/plugins/emoji/public/images/twitter/moon.png
new file mode 100644
index 0000000000..3d96314452
Binary files /dev/null and b/plugins/emoji/public/images/twitter/moon.png differ
diff --git a/plugins/emoji/public/images/twitter/mortar_board.png b/plugins/emoji/public/images/twitter/mortar_board.png
new file mode 100644
index 0000000000..f50bb04119
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mortar_board.png differ
diff --git a/plugins/emoji/public/images/twitter/mount_fuji.png b/plugins/emoji/public/images/twitter/mount_fuji.png
new file mode 100644
index 0000000000..6ad36240c1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mount_fuji.png differ
diff --git a/plugins/emoji/public/images/twitter/mountain_bicyclist.png b/plugins/emoji/public/images/twitter/mountain_bicyclist.png
new file mode 100644
index 0000000000..d9bc79c759
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mountain_bicyclist.png differ
diff --git a/plugins/emoji/public/images/twitter/mountain_cableway.png b/plugins/emoji/public/images/twitter/mountain_cableway.png
new file mode 100644
index 0000000000..0d5fb274c7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mountain_cableway.png differ
diff --git a/plugins/emoji/public/images/twitter/mountain_railway.png b/plugins/emoji/public/images/twitter/mountain_railway.png
new file mode 100644
index 0000000000..1b3d6b8593
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mountain_railway.png differ
diff --git a/plugins/emoji/public/images/twitter/mouse.png b/plugins/emoji/public/images/twitter/mouse.png
new file mode 100644
index 0000000000..e8f2fe5c95
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mouse.png differ
diff --git a/plugins/emoji/public/images/twitter/mouse2.png b/plugins/emoji/public/images/twitter/mouse2.png
new file mode 100644
index 0000000000..0f91255e3f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mouse2.png differ
diff --git a/plugins/emoji/public/images/twitter/movie_camera.png b/plugins/emoji/public/images/twitter/movie_camera.png
new file mode 100644
index 0000000000..084e37772e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/movie_camera.png differ
diff --git a/plugins/emoji/public/images/twitter/moyai.png b/plugins/emoji/public/images/twitter/moyai.png
new file mode 100644
index 0000000000..749aa224f5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/moyai.png differ
diff --git a/plugins/emoji/public/images/twitter/muscle.png b/plugins/emoji/public/images/twitter/muscle.png
new file mode 100644
index 0000000000..34fa6c5538
Binary files /dev/null and b/plugins/emoji/public/images/twitter/muscle.png differ
diff --git a/plugins/emoji/public/images/twitter/mushroom.png b/plugins/emoji/public/images/twitter/mushroom.png
new file mode 100644
index 0000000000..7a3b4d2637
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mushroom.png differ
diff --git a/plugins/emoji/public/images/twitter/musical_keyboard.png b/plugins/emoji/public/images/twitter/musical_keyboard.png
new file mode 100644
index 0000000000..2c579cef7b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/musical_keyboard.png differ
diff --git a/plugins/emoji/public/images/twitter/musical_note.png b/plugins/emoji/public/images/twitter/musical_note.png
new file mode 100644
index 0000000000..16ebcca7d6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/musical_note.png differ
diff --git a/plugins/emoji/public/images/twitter/musical_score.png b/plugins/emoji/public/images/twitter/musical_score.png
new file mode 100644
index 0000000000..a381d646a2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/musical_score.png differ
diff --git a/plugins/emoji/public/images/twitter/mute.png b/plugins/emoji/public/images/twitter/mute.png
new file mode 100644
index 0000000000..37c90f4ac1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/mute.png differ
diff --git a/plugins/emoji/public/images/twitter/nail_care.png b/plugins/emoji/public/images/twitter/nail_care.png
new file mode 100644
index 0000000000..26218548ab
Binary files /dev/null and b/plugins/emoji/public/images/twitter/nail_care.png differ
diff --git a/plugins/emoji/public/images/twitter/name_badge.png b/plugins/emoji/public/images/twitter/name_badge.png
new file mode 100644
index 0000000000..d2f06bdfc9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/name_badge.png differ
diff --git a/plugins/emoji/public/images/twitter/necktie.png b/plugins/emoji/public/images/twitter/necktie.png
new file mode 100644
index 0000000000..d3f5208bc4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/necktie.png differ
diff --git a/plugins/emoji/public/images/twitter/negative_squared_cross_mark.png b/plugins/emoji/public/images/twitter/negative_squared_cross_mark.png
new file mode 100644
index 0000000000..f3ec5a681b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/negative_squared_cross_mark.png differ
diff --git a/plugins/emoji/public/images/twitter/neutral_face.png b/plugins/emoji/public/images/twitter/neutral_face.png
new file mode 100644
index 0000000000..2cfa8c444f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/neutral_face.png differ
diff --git a/plugins/emoji/public/images/twitter/new.png b/plugins/emoji/public/images/twitter/new.png
new file mode 100644
index 0000000000..276537a398
Binary files /dev/null and b/plugins/emoji/public/images/twitter/new.png differ
diff --git a/plugins/emoji/public/images/twitter/new_moon.png b/plugins/emoji/public/images/twitter/new_moon.png
new file mode 100644
index 0000000000..6d497dc114
Binary files /dev/null and b/plugins/emoji/public/images/twitter/new_moon.png differ
diff --git a/plugins/emoji/public/images/twitter/new_moon_with_face.png b/plugins/emoji/public/images/twitter/new_moon_with_face.png
new file mode 100644
index 0000000000..ebceb6b1cc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/new_moon_with_face.png differ
diff --git a/plugins/emoji/public/images/twitter/newspaper.png b/plugins/emoji/public/images/twitter/newspaper.png
new file mode 100644
index 0000000000..e123697495
Binary files /dev/null and b/plugins/emoji/public/images/twitter/newspaper.png differ
diff --git a/plugins/emoji/public/images/twitter/ng.png b/plugins/emoji/public/images/twitter/ng.png
new file mode 100644
index 0000000000..bcaa52aad0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ng.png differ
diff --git a/plugins/emoji/public/images/twitter/night_with_stars.png b/plugins/emoji/public/images/twitter/night_with_stars.png
new file mode 100644
index 0000000000..ab7af4317f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/night_with_stars.png differ
diff --git a/plugins/emoji/public/images/twitter/nine.png b/plugins/emoji/public/images/twitter/nine.png
new file mode 100644
index 0000000000..ba757742cb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/nine.png differ
diff --git a/plugins/emoji/public/images/twitter/no_bell.png b/plugins/emoji/public/images/twitter/no_bell.png
new file mode 100644
index 0000000000..fdb2c84b64
Binary files /dev/null and b/plugins/emoji/public/images/twitter/no_bell.png differ
diff --git a/plugins/emoji/public/images/twitter/no_bicycles.png b/plugins/emoji/public/images/twitter/no_bicycles.png
new file mode 100644
index 0000000000..84f5ef0d2c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/no_bicycles.png differ
diff --git a/plugins/emoji/public/images/twitter/no_entry.png b/plugins/emoji/public/images/twitter/no_entry.png
new file mode 100644
index 0000000000..2f119b691a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/no_entry.png differ
diff --git a/plugins/emoji/public/images/twitter/no_entry_sign.png b/plugins/emoji/public/images/twitter/no_entry_sign.png
new file mode 100644
index 0000000000..191214f6c8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/no_entry_sign.png differ
diff --git a/plugins/emoji/public/images/twitter/no_good.png b/plugins/emoji/public/images/twitter/no_good.png
new file mode 100644
index 0000000000..120adca580
Binary files /dev/null and b/plugins/emoji/public/images/twitter/no_good.png differ
diff --git a/plugins/emoji/public/images/twitter/no_mobile_phones.png b/plugins/emoji/public/images/twitter/no_mobile_phones.png
new file mode 100644
index 0000000000..d9f18020d0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/no_mobile_phones.png differ
diff --git a/plugins/emoji/public/images/twitter/no_mouth.png b/plugins/emoji/public/images/twitter/no_mouth.png
new file mode 100644
index 0000000000..1ce9b90a8b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/no_mouth.png differ
diff --git a/plugins/emoji/public/images/twitter/no_pedestrians.png b/plugins/emoji/public/images/twitter/no_pedestrians.png
new file mode 100644
index 0000000000..a5b334b508
Binary files /dev/null and b/plugins/emoji/public/images/twitter/no_pedestrians.png differ
diff --git a/plugins/emoji/public/images/twitter/no_smoking.png b/plugins/emoji/public/images/twitter/no_smoking.png
new file mode 100644
index 0000000000..44deedbac9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/no_smoking.png differ
diff --git a/plugins/emoji/public/images/twitter/non-potable_water.png b/plugins/emoji/public/images/twitter/non-potable_water.png
new file mode 100644
index 0000000000..7073d006ee
Binary files /dev/null and b/plugins/emoji/public/images/twitter/non-potable_water.png differ
diff --git a/plugins/emoji/public/images/twitter/nose.png b/plugins/emoji/public/images/twitter/nose.png
new file mode 100644
index 0000000000..997dca6c43
Binary files /dev/null and b/plugins/emoji/public/images/twitter/nose.png differ
diff --git a/plugins/emoji/public/images/twitter/notebook.png b/plugins/emoji/public/images/twitter/notebook.png
new file mode 100644
index 0000000000..77e107453a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/notebook.png differ
diff --git a/plugins/emoji/public/images/twitter/notebook_with_decorative_cover.png b/plugins/emoji/public/images/twitter/notebook_with_decorative_cover.png
new file mode 100644
index 0000000000..7f5715a5e2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/notebook_with_decorative_cover.png differ
diff --git a/plugins/emoji/public/images/twitter/notes.png b/plugins/emoji/public/images/twitter/notes.png
new file mode 100644
index 0000000000..0486948fe0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/notes.png differ
diff --git a/plugins/emoji/public/images/twitter/nut_and_bolt.png b/plugins/emoji/public/images/twitter/nut_and_bolt.png
new file mode 100644
index 0000000000..18e6093344
Binary files /dev/null and b/plugins/emoji/public/images/twitter/nut_and_bolt.png differ
diff --git a/plugins/emoji/public/images/twitter/o.png b/plugins/emoji/public/images/twitter/o.png
new file mode 100644
index 0000000000..fc938e887e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/o.png differ
diff --git a/plugins/emoji/public/images/twitter/o2.png b/plugins/emoji/public/images/twitter/o2.png
new file mode 100644
index 0000000000..9d601e39da
Binary files /dev/null and b/plugins/emoji/public/images/twitter/o2.png differ
diff --git a/plugins/emoji/public/images/twitter/ocean.png b/plugins/emoji/public/images/twitter/ocean.png
new file mode 100644
index 0000000000..8da365de18
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ocean.png differ
diff --git a/plugins/emoji/public/images/twitter/octopus.png b/plugins/emoji/public/images/twitter/octopus.png
new file mode 100644
index 0000000000..63c9a13563
Binary files /dev/null and b/plugins/emoji/public/images/twitter/octopus.png differ
diff --git a/plugins/emoji/public/images/twitter/oden.png b/plugins/emoji/public/images/twitter/oden.png
new file mode 100644
index 0000000000..2859686c06
Binary files /dev/null and b/plugins/emoji/public/images/twitter/oden.png differ
diff --git a/plugins/emoji/public/images/twitter/office.png b/plugins/emoji/public/images/twitter/office.png
new file mode 100644
index 0000000000..b991af54dd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/office.png differ
diff --git a/plugins/emoji/public/images/twitter/ok.png b/plugins/emoji/public/images/twitter/ok.png
new file mode 100644
index 0000000000..9b998a47d8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ok.png differ
diff --git a/plugins/emoji/public/images/twitter/ok_hand.png b/plugins/emoji/public/images/twitter/ok_hand.png
new file mode 100644
index 0000000000..e93bb1b1d6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ok_hand.png differ
diff --git a/plugins/emoji/public/images/twitter/ok_woman.png b/plugins/emoji/public/images/twitter/ok_woman.png
new file mode 100644
index 0000000000..78d65bcbf9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ok_woman.png differ
diff --git a/plugins/emoji/public/images/twitter/older_man.png b/plugins/emoji/public/images/twitter/older_man.png
new file mode 100644
index 0000000000..7abce22c61
Binary files /dev/null and b/plugins/emoji/public/images/twitter/older_man.png differ
diff --git a/plugins/emoji/public/images/twitter/older_woman.png b/plugins/emoji/public/images/twitter/older_woman.png
new file mode 100644
index 0000000000..2b2c9f47d3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/older_woman.png differ
diff --git a/plugins/emoji/public/images/twitter/on.png b/plugins/emoji/public/images/twitter/on.png
new file mode 100644
index 0000000000..1e1645555d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/on.png differ
diff --git a/plugins/emoji/public/images/twitter/oncoming_automobile.png b/plugins/emoji/public/images/twitter/oncoming_automobile.png
new file mode 100644
index 0000000000..97443523b5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/oncoming_automobile.png differ
diff --git a/plugins/emoji/public/images/twitter/oncoming_bus.png b/plugins/emoji/public/images/twitter/oncoming_bus.png
new file mode 100644
index 0000000000..6a83467842
Binary files /dev/null and b/plugins/emoji/public/images/twitter/oncoming_bus.png differ
diff --git a/plugins/emoji/public/images/twitter/oncoming_police_car.png b/plugins/emoji/public/images/twitter/oncoming_police_car.png
new file mode 100644
index 0000000000..82eadd9f12
Binary files /dev/null and b/plugins/emoji/public/images/twitter/oncoming_police_car.png differ
diff --git a/plugins/emoji/public/images/twitter/oncoming_taxi.png b/plugins/emoji/public/images/twitter/oncoming_taxi.png
new file mode 100644
index 0000000000..acb9814692
Binary files /dev/null and b/plugins/emoji/public/images/twitter/oncoming_taxi.png differ
diff --git a/plugins/emoji/public/images/twitter/one.png b/plugins/emoji/public/images/twitter/one.png
new file mode 100644
index 0000000000..1155e53a51
Binary files /dev/null and b/plugins/emoji/public/images/twitter/one.png differ
diff --git a/plugins/emoji/public/images/twitter/open_book.png b/plugins/emoji/public/images/twitter/open_book.png
new file mode 100644
index 0000000000..882f9f89e5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/open_book.png differ
diff --git a/plugins/emoji/public/images/twitter/open_file_folder.png b/plugins/emoji/public/images/twitter/open_file_folder.png
new file mode 100644
index 0000000000..cc2d2f3eba
Binary files /dev/null and b/plugins/emoji/public/images/twitter/open_file_folder.png differ
diff --git a/plugins/emoji/public/images/twitter/open_hands.png b/plugins/emoji/public/images/twitter/open_hands.png
new file mode 100644
index 0000000000..54ce8e260a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/open_hands.png differ
diff --git a/plugins/emoji/public/images/twitter/open_mouth.png b/plugins/emoji/public/images/twitter/open_mouth.png
new file mode 100644
index 0000000000..d5b315565c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/open_mouth.png differ
diff --git a/plugins/emoji/public/images/twitter/ophiuchus.png b/plugins/emoji/public/images/twitter/ophiuchus.png
new file mode 100644
index 0000000000..718308fff6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ophiuchus.png differ
diff --git a/plugins/emoji/public/images/twitter/orange_book.png b/plugins/emoji/public/images/twitter/orange_book.png
new file mode 100644
index 0000000000..25dc2e153b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/orange_book.png differ
diff --git a/plugins/emoji/public/images/twitter/outbox_tray.png b/plugins/emoji/public/images/twitter/outbox_tray.png
new file mode 100644
index 0000000000..fd277e59c4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/outbox_tray.png differ
diff --git a/plugins/emoji/public/images/twitter/ox.png b/plugins/emoji/public/images/twitter/ox.png
new file mode 100644
index 0000000000..0404a21d6d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ox.png differ
diff --git a/plugins/emoji/public/images/twitter/package.png b/plugins/emoji/public/images/twitter/package.png
new file mode 100644
index 0000000000..a2f83e560f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/package.png differ
diff --git a/plugins/emoji/public/images/twitter/page_facing_up.png b/plugins/emoji/public/images/twitter/page_facing_up.png
new file mode 100644
index 0000000000..4927daf5bd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/page_facing_up.png differ
diff --git a/plugins/emoji/public/images/twitter/page_with_curl.png b/plugins/emoji/public/images/twitter/page_with_curl.png
new file mode 100644
index 0000000000..10e3219b9d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/page_with_curl.png differ
diff --git a/plugins/emoji/public/images/twitter/pager.png b/plugins/emoji/public/images/twitter/pager.png
new file mode 100644
index 0000000000..f1ae64ce33
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pager.png differ
diff --git a/plugins/emoji/public/images/twitter/palm_tree.png b/plugins/emoji/public/images/twitter/palm_tree.png
new file mode 100644
index 0000000000..aa115eddfe
Binary files /dev/null and b/plugins/emoji/public/images/twitter/palm_tree.png differ
diff --git a/plugins/emoji/public/images/twitter/panda_face.png b/plugins/emoji/public/images/twitter/panda_face.png
new file mode 100644
index 0000000000..de196c5434
Binary files /dev/null and b/plugins/emoji/public/images/twitter/panda_face.png differ
diff --git a/plugins/emoji/public/images/twitter/paperclip.png b/plugins/emoji/public/images/twitter/paperclip.png
new file mode 100644
index 0000000000..e6859732ca
Binary files /dev/null and b/plugins/emoji/public/images/twitter/paperclip.png differ
diff --git a/plugins/emoji/public/images/twitter/parking.png b/plugins/emoji/public/images/twitter/parking.png
new file mode 100644
index 0000000000..efbfbebd9f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/parking.png differ
diff --git a/plugins/emoji/public/images/twitter/part_alternation_mark.png b/plugins/emoji/public/images/twitter/part_alternation_mark.png
new file mode 100644
index 0000000000..a73ddf7767
Binary files /dev/null and b/plugins/emoji/public/images/twitter/part_alternation_mark.png differ
diff --git a/plugins/emoji/public/images/twitter/partly_sunny.png b/plugins/emoji/public/images/twitter/partly_sunny.png
new file mode 100644
index 0000000000..0d42818d19
Binary files /dev/null and b/plugins/emoji/public/images/twitter/partly_sunny.png differ
diff --git a/plugins/emoji/public/images/twitter/passport_control.png b/plugins/emoji/public/images/twitter/passport_control.png
new file mode 100644
index 0000000000..328551726e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/passport_control.png differ
diff --git a/plugins/emoji/public/images/twitter/paw_prints.png b/plugins/emoji/public/images/twitter/paw_prints.png
new file mode 100644
index 0000000000..94deaa1e55
Binary files /dev/null and b/plugins/emoji/public/images/twitter/paw_prints.png differ
diff --git a/plugins/emoji/public/images/twitter/peach.png b/plugins/emoji/public/images/twitter/peach.png
new file mode 100644
index 0000000000..92fa321311
Binary files /dev/null and b/plugins/emoji/public/images/twitter/peach.png differ
diff --git a/plugins/emoji/public/images/twitter/pear.png b/plugins/emoji/public/images/twitter/pear.png
new file mode 100644
index 0000000000..4a6ad8fc45
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pear.png differ
diff --git a/plugins/emoji/public/images/twitter/pencil.png b/plugins/emoji/public/images/twitter/pencil.png
new file mode 100644
index 0000000000..9bbc624eb0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pencil.png differ
diff --git a/plugins/emoji/public/images/twitter/pencil2.png b/plugins/emoji/public/images/twitter/pencil2.png
new file mode 100644
index 0000000000..a469366006
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pencil2.png differ
diff --git a/plugins/emoji/public/images/twitter/penguin.png b/plugins/emoji/public/images/twitter/penguin.png
new file mode 100644
index 0000000000..fd363881c8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/penguin.png differ
diff --git a/plugins/emoji/public/images/twitter/pensive.png b/plugins/emoji/public/images/twitter/pensive.png
new file mode 100644
index 0000000000..5935c47958
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pensive.png differ
diff --git a/plugins/emoji/public/images/twitter/performing_arts.png b/plugins/emoji/public/images/twitter/performing_arts.png
new file mode 100644
index 0000000000..4c9d19f580
Binary files /dev/null and b/plugins/emoji/public/images/twitter/performing_arts.png differ
diff --git a/plugins/emoji/public/images/twitter/persevere.png b/plugins/emoji/public/images/twitter/persevere.png
new file mode 100644
index 0000000000..9fe8a28e94
Binary files /dev/null and b/plugins/emoji/public/images/twitter/persevere.png differ
diff --git a/plugins/emoji/public/images/twitter/person_frowning.png b/plugins/emoji/public/images/twitter/person_frowning.png
new file mode 100644
index 0000000000..bf0cecd277
Binary files /dev/null and b/plugins/emoji/public/images/twitter/person_frowning.png differ
diff --git a/plugins/emoji/public/images/twitter/person_with_blond_hair.png b/plugins/emoji/public/images/twitter/person_with_blond_hair.png
new file mode 100644
index 0000000000..c493fb1c23
Binary files /dev/null and b/plugins/emoji/public/images/twitter/person_with_blond_hair.png differ
diff --git a/plugins/emoji/public/images/twitter/person_with_pouting_face.png b/plugins/emoji/public/images/twitter/person_with_pouting_face.png
new file mode 100644
index 0000000000..6f8b40e3a7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/person_with_pouting_face.png differ
diff --git a/plugins/emoji/public/images/twitter/phone.png b/plugins/emoji/public/images/twitter/phone.png
new file mode 100644
index 0000000000..c7afd7627b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/phone.png differ
diff --git a/plugins/emoji/public/images/twitter/pig.png b/plugins/emoji/public/images/twitter/pig.png
new file mode 100644
index 0000000000..45baef3875
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pig.png differ
diff --git a/plugins/emoji/public/images/twitter/pig2.png b/plugins/emoji/public/images/twitter/pig2.png
new file mode 100644
index 0000000000..2492c5628f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pig2.png differ
diff --git a/plugins/emoji/public/images/twitter/pig_nose.png b/plugins/emoji/public/images/twitter/pig_nose.png
new file mode 100644
index 0000000000..a78d4e9ee7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pig_nose.png differ
diff --git a/plugins/emoji/public/images/twitter/pill.png b/plugins/emoji/public/images/twitter/pill.png
new file mode 100644
index 0000000000..57699d264b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pill.png differ
diff --git a/plugins/emoji/public/images/twitter/pineapple.png b/plugins/emoji/public/images/twitter/pineapple.png
new file mode 100644
index 0000000000..0d7b9e186a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pineapple.png differ
diff --git a/plugins/emoji/public/images/twitter/pisces.png b/plugins/emoji/public/images/twitter/pisces.png
new file mode 100644
index 0000000000..92d30f5206
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pisces.png differ
diff --git a/plugins/emoji/public/images/twitter/pizza.png b/plugins/emoji/public/images/twitter/pizza.png
new file mode 100644
index 0000000000..9b5c3506b2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pizza.png differ
diff --git a/plugins/emoji/public/images/twitter/point_down.png b/plugins/emoji/public/images/twitter/point_down.png
new file mode 100644
index 0000000000..275970ffce
Binary files /dev/null and b/plugins/emoji/public/images/twitter/point_down.png differ
diff --git a/plugins/emoji/public/images/twitter/point_left.png b/plugins/emoji/public/images/twitter/point_left.png
new file mode 100644
index 0000000000..fe1c9e2a9b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/point_left.png differ
diff --git a/plugins/emoji/public/images/twitter/point_right.png b/plugins/emoji/public/images/twitter/point_right.png
new file mode 100644
index 0000000000..54b368ac63
Binary files /dev/null and b/plugins/emoji/public/images/twitter/point_right.png differ
diff --git a/plugins/emoji/public/images/twitter/point_up.png b/plugins/emoji/public/images/twitter/point_up.png
new file mode 100644
index 0000000000..8f13a38f16
Binary files /dev/null and b/plugins/emoji/public/images/twitter/point_up.png differ
diff --git a/plugins/emoji/public/images/twitter/point_up_2.png b/plugins/emoji/public/images/twitter/point_up_2.png
new file mode 100644
index 0000000000..0b22c988c4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/point_up_2.png differ
diff --git a/plugins/emoji/public/images/twitter/police_car.png b/plugins/emoji/public/images/twitter/police_car.png
new file mode 100644
index 0000000000..1738deed97
Binary files /dev/null and b/plugins/emoji/public/images/twitter/police_car.png differ
diff --git a/plugins/emoji/public/images/twitter/poodle.png b/plugins/emoji/public/images/twitter/poodle.png
new file mode 100644
index 0000000000..6e77dc3f09
Binary files /dev/null and b/plugins/emoji/public/images/twitter/poodle.png differ
diff --git a/plugins/emoji/public/images/twitter/poop.png b/plugins/emoji/public/images/twitter/poop.png
new file mode 100644
index 0000000000..604d2a2d0a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/poop.png differ
diff --git a/plugins/emoji/public/images/twitter/post_office.png b/plugins/emoji/public/images/twitter/post_office.png
new file mode 100644
index 0000000000..aeecd2f65f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/post_office.png differ
diff --git a/plugins/emoji/public/images/twitter/postal_horn.png b/plugins/emoji/public/images/twitter/postal_horn.png
new file mode 100644
index 0000000000..9e28985e89
Binary files /dev/null and b/plugins/emoji/public/images/twitter/postal_horn.png differ
diff --git a/plugins/emoji/public/images/twitter/postbox.png b/plugins/emoji/public/images/twitter/postbox.png
new file mode 100644
index 0000000000..fbff07974f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/postbox.png differ
diff --git a/plugins/emoji/public/images/twitter/potable_water.png b/plugins/emoji/public/images/twitter/potable_water.png
new file mode 100644
index 0000000000..5d8b61f82d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/potable_water.png differ
diff --git a/plugins/emoji/public/images/twitter/pouch.png b/plugins/emoji/public/images/twitter/pouch.png
new file mode 100644
index 0000000000..5fb07c4464
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pouch.png differ
diff --git a/plugins/emoji/public/images/twitter/poultry_leg.png b/plugins/emoji/public/images/twitter/poultry_leg.png
new file mode 100644
index 0000000000..e4140ec393
Binary files /dev/null and b/plugins/emoji/public/images/twitter/poultry_leg.png differ
diff --git a/plugins/emoji/public/images/twitter/pound.png b/plugins/emoji/public/images/twitter/pound.png
new file mode 100644
index 0000000000..a8156dc4f2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pound.png differ
diff --git a/plugins/emoji/public/images/twitter/pouting_cat.png b/plugins/emoji/public/images/twitter/pouting_cat.png
new file mode 100644
index 0000000000..77a4195fdc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pouting_cat.png differ
diff --git a/plugins/emoji/public/images/twitter/pray.png b/plugins/emoji/public/images/twitter/pray.png
new file mode 100644
index 0000000000..e866b14496
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pray.png differ
diff --git a/plugins/emoji/public/images/twitter/princess.png b/plugins/emoji/public/images/twitter/princess.png
new file mode 100644
index 0000000000..07c383ebf2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/princess.png differ
diff --git a/plugins/emoji/public/images/twitter/punch.png b/plugins/emoji/public/images/twitter/punch.png
new file mode 100644
index 0000000000..697997a833
Binary files /dev/null and b/plugins/emoji/public/images/twitter/punch.png differ
diff --git a/plugins/emoji/public/images/twitter/purple_heart.png b/plugins/emoji/public/images/twitter/purple_heart.png
new file mode 100644
index 0000000000..e62774d2e8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/purple_heart.png differ
diff --git a/plugins/emoji/public/images/twitter/purse.png b/plugins/emoji/public/images/twitter/purse.png
new file mode 100644
index 0000000000..206ab47c75
Binary files /dev/null and b/plugins/emoji/public/images/twitter/purse.png differ
diff --git a/plugins/emoji/public/images/twitter/pushpin.png b/plugins/emoji/public/images/twitter/pushpin.png
new file mode 100644
index 0000000000..93c514150f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/pushpin.png differ
diff --git a/plugins/emoji/public/images/twitter/put_litter_in_its_place.png b/plugins/emoji/public/images/twitter/put_litter_in_its_place.png
new file mode 100644
index 0000000000..f505278dd1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/put_litter_in_its_place.png differ
diff --git a/plugins/emoji/public/images/twitter/question.png b/plugins/emoji/public/images/twitter/question.png
new file mode 100644
index 0000000000..fc0680b3cd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/question.png differ
diff --git a/plugins/emoji/public/images/twitter/rabbit.png b/plugins/emoji/public/images/twitter/rabbit.png
new file mode 100644
index 0000000000..a75b275827
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rabbit.png differ
diff --git a/plugins/emoji/public/images/twitter/rabbit2.png b/plugins/emoji/public/images/twitter/rabbit2.png
new file mode 100644
index 0000000000..fd7830ec3f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rabbit2.png differ
diff --git a/plugins/emoji/public/images/twitter/racehorse.png b/plugins/emoji/public/images/twitter/racehorse.png
new file mode 100644
index 0000000000..adad6b1ce1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/racehorse.png differ
diff --git a/plugins/emoji/public/images/twitter/radio.png b/plugins/emoji/public/images/twitter/radio.png
new file mode 100644
index 0000000000..1b54f54e03
Binary files /dev/null and b/plugins/emoji/public/images/twitter/radio.png differ
diff --git a/plugins/emoji/public/images/twitter/radio_button.png b/plugins/emoji/public/images/twitter/radio_button.png
new file mode 100644
index 0000000000..54d091f5c0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/radio_button.png differ
diff --git a/plugins/emoji/public/images/twitter/rage.png b/plugins/emoji/public/images/twitter/rage.png
new file mode 100644
index 0000000000..c1ab5d1fd9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rage.png differ
diff --git a/plugins/emoji/public/images/twitter/railway_car.png b/plugins/emoji/public/images/twitter/railway_car.png
new file mode 100644
index 0000000000..e4dbd4f882
Binary files /dev/null and b/plugins/emoji/public/images/twitter/railway_car.png differ
diff --git a/plugins/emoji/public/images/twitter/rainbow.png b/plugins/emoji/public/images/twitter/rainbow.png
new file mode 100644
index 0000000000..6abb2d9cae
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rainbow.png differ
diff --git a/plugins/emoji/public/images/twitter/raised_hand.png b/plugins/emoji/public/images/twitter/raised_hand.png
new file mode 100644
index 0000000000..f7edfd6c3d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/raised_hand.png differ
diff --git a/plugins/emoji/public/images/twitter/raised_hands.png b/plugins/emoji/public/images/twitter/raised_hands.png
new file mode 100644
index 0000000000..dcd5ccc2a9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/raised_hands.png differ
diff --git a/plugins/emoji/public/images/twitter/raising_hand.png b/plugins/emoji/public/images/twitter/raising_hand.png
new file mode 100644
index 0000000000..3d23df8810
Binary files /dev/null and b/plugins/emoji/public/images/twitter/raising_hand.png differ
diff --git a/plugins/emoji/public/images/twitter/ram.png b/plugins/emoji/public/images/twitter/ram.png
new file mode 100644
index 0000000000..9259b3c35a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ram.png differ
diff --git a/plugins/emoji/public/images/twitter/ramen.png b/plugins/emoji/public/images/twitter/ramen.png
new file mode 100644
index 0000000000..f09366b2e4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ramen.png differ
diff --git a/plugins/emoji/public/images/twitter/rat.png b/plugins/emoji/public/images/twitter/rat.png
new file mode 100644
index 0000000000..5c577cf5cb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rat.png differ
diff --git a/plugins/emoji/public/images/twitter/recycle.png b/plugins/emoji/public/images/twitter/recycle.png
new file mode 100644
index 0000000000..568b5459a7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/recycle.png differ
diff --git a/plugins/emoji/public/images/twitter/red_car.png b/plugins/emoji/public/images/twitter/red_car.png
new file mode 100644
index 0000000000..93610d2c43
Binary files /dev/null and b/plugins/emoji/public/images/twitter/red_car.png differ
diff --git a/plugins/emoji/public/images/twitter/red_circle.png b/plugins/emoji/public/images/twitter/red_circle.png
new file mode 100644
index 0000000000..90103e1e70
Binary files /dev/null and b/plugins/emoji/public/images/twitter/red_circle.png differ
diff --git a/plugins/emoji/public/images/twitter/registered.png b/plugins/emoji/public/images/twitter/registered.png
new file mode 100644
index 0000000000..b617280ce0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/registered.png differ
diff --git a/plugins/emoji/public/images/twitter/relaxed.png b/plugins/emoji/public/images/twitter/relaxed.png
new file mode 100644
index 0000000000..98df7bb44e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/relaxed.png differ
diff --git a/plugins/emoji/public/images/twitter/relieved.png b/plugins/emoji/public/images/twitter/relieved.png
new file mode 100644
index 0000000000..a6a8971470
Binary files /dev/null and b/plugins/emoji/public/images/twitter/relieved.png differ
diff --git a/plugins/emoji/public/images/twitter/repeat.png b/plugins/emoji/public/images/twitter/repeat.png
new file mode 100644
index 0000000000..89fcc1f232
Binary files /dev/null and b/plugins/emoji/public/images/twitter/repeat.png differ
diff --git a/plugins/emoji/public/images/twitter/repeat_one.png b/plugins/emoji/public/images/twitter/repeat_one.png
new file mode 100644
index 0000000000..d8cba319ca
Binary files /dev/null and b/plugins/emoji/public/images/twitter/repeat_one.png differ
diff --git a/plugins/emoji/public/images/twitter/restroom.png b/plugins/emoji/public/images/twitter/restroom.png
new file mode 100644
index 0000000000..9eb596655d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/restroom.png differ
diff --git a/plugins/emoji/public/images/twitter/revolving_hearts.png b/plugins/emoji/public/images/twitter/revolving_hearts.png
new file mode 100644
index 0000000000..b75802b6ab
Binary files /dev/null and b/plugins/emoji/public/images/twitter/revolving_hearts.png differ
diff --git a/plugins/emoji/public/images/twitter/rewind.png b/plugins/emoji/public/images/twitter/rewind.png
new file mode 100644
index 0000000000..497af54ccf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rewind.png differ
diff --git a/plugins/emoji/public/images/twitter/ribbon.png b/plugins/emoji/public/images/twitter/ribbon.png
new file mode 100644
index 0000000000..c67a4b6ca2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ribbon.png differ
diff --git a/plugins/emoji/public/images/twitter/rice.png b/plugins/emoji/public/images/twitter/rice.png
new file mode 100644
index 0000000000..d4824bfa78
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rice.png differ
diff --git a/plugins/emoji/public/images/twitter/rice_ball.png b/plugins/emoji/public/images/twitter/rice_ball.png
new file mode 100644
index 0000000000..c32ee0395d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rice_ball.png differ
diff --git a/plugins/emoji/public/images/twitter/rice_cracker.png b/plugins/emoji/public/images/twitter/rice_cracker.png
new file mode 100644
index 0000000000..0be2e5c481
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rice_cracker.png differ
diff --git a/plugins/emoji/public/images/twitter/rice_scene.png b/plugins/emoji/public/images/twitter/rice_scene.png
new file mode 100644
index 0000000000..2a0aa43706
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rice_scene.png differ
diff --git a/plugins/emoji/public/images/twitter/ring.png b/plugins/emoji/public/images/twitter/ring.png
new file mode 100644
index 0000000000..f00841f99a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ring.png differ
diff --git a/plugins/emoji/public/images/twitter/rocket.png b/plugins/emoji/public/images/twitter/rocket.png
new file mode 100644
index 0000000000..64d83ead2c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rocket.png differ
diff --git a/plugins/emoji/public/images/twitter/roller_coaster.png b/plugins/emoji/public/images/twitter/roller_coaster.png
new file mode 100644
index 0000000000..ec9f71952c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/roller_coaster.png differ
diff --git a/plugins/emoji/public/images/twitter/rooster.png b/plugins/emoji/public/images/twitter/rooster.png
new file mode 100644
index 0000000000..ea5c8564a8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rooster.png differ
diff --git a/plugins/emoji/public/images/twitter/rose.png b/plugins/emoji/public/images/twitter/rose.png
new file mode 100644
index 0000000000..aba7e66516
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rose.png differ
diff --git a/plugins/emoji/public/images/twitter/rotating_light.png b/plugins/emoji/public/images/twitter/rotating_light.png
new file mode 100644
index 0000000000..950497413a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rotating_light.png differ
diff --git a/plugins/emoji/public/images/twitter/round_pushpin.png b/plugins/emoji/public/images/twitter/round_pushpin.png
new file mode 100644
index 0000000000..7846f1669b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/round_pushpin.png differ
diff --git a/plugins/emoji/public/images/twitter/rowboat.png b/plugins/emoji/public/images/twitter/rowboat.png
new file mode 100644
index 0000000000..05004b4eef
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rowboat.png differ
diff --git a/plugins/emoji/public/images/twitter/ru.png b/plugins/emoji/public/images/twitter/ru.png
new file mode 100644
index 0000000000..021d32f938
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ru.png differ
diff --git a/plugins/emoji/public/images/twitter/rugby_football.png b/plugins/emoji/public/images/twitter/rugby_football.png
new file mode 100644
index 0000000000..eab4516fed
Binary files /dev/null and b/plugins/emoji/public/images/twitter/rugby_football.png differ
diff --git a/plugins/emoji/public/images/twitter/runner.png b/plugins/emoji/public/images/twitter/runner.png
new file mode 100644
index 0000000000..73a678354b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/runner.png differ
diff --git a/plugins/emoji/public/images/twitter/running.png b/plugins/emoji/public/images/twitter/running.png
new file mode 100644
index 0000000000..73a678354b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/running.png differ
diff --git a/plugins/emoji/public/images/twitter/running_shirt_with_sash.png b/plugins/emoji/public/images/twitter/running_shirt_with_sash.png
new file mode 100644
index 0000000000..1e41d23f89
Binary files /dev/null and b/plugins/emoji/public/images/twitter/running_shirt_with_sash.png differ
diff --git a/plugins/emoji/public/images/twitter/sa.png b/plugins/emoji/public/images/twitter/sa.png
new file mode 100644
index 0000000000..05625f5ee7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sa.png differ
diff --git a/plugins/emoji/public/images/twitter/sagittarius.png b/plugins/emoji/public/images/twitter/sagittarius.png
new file mode 100644
index 0000000000..68d964ca99
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sagittarius.png differ
diff --git a/plugins/emoji/public/images/twitter/sailboat.png b/plugins/emoji/public/images/twitter/sailboat.png
new file mode 100644
index 0000000000..7b4a289ed2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sailboat.png differ
diff --git a/plugins/emoji/public/images/twitter/sake.png b/plugins/emoji/public/images/twitter/sake.png
new file mode 100644
index 0000000000..caaa02d55a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sake.png differ
diff --git a/plugins/emoji/public/images/twitter/sandal.png b/plugins/emoji/public/images/twitter/sandal.png
new file mode 100644
index 0000000000..73bbff56af
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sandal.png differ
diff --git a/plugins/emoji/public/images/twitter/santa.png b/plugins/emoji/public/images/twitter/santa.png
new file mode 100644
index 0000000000..527b412d3d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/santa.png differ
diff --git a/plugins/emoji/public/images/twitter/satellite.png b/plugins/emoji/public/images/twitter/satellite.png
new file mode 100644
index 0000000000..a83aa3e259
Binary files /dev/null and b/plugins/emoji/public/images/twitter/satellite.png differ
diff --git a/plugins/emoji/public/images/twitter/satisfied.png b/plugins/emoji/public/images/twitter/satisfied.png
new file mode 100644
index 0000000000..a0f1a824ed
Binary files /dev/null and b/plugins/emoji/public/images/twitter/satisfied.png differ
diff --git a/plugins/emoji/public/images/twitter/saxophone.png b/plugins/emoji/public/images/twitter/saxophone.png
new file mode 100644
index 0000000000..5a4831eafa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/saxophone.png differ
diff --git a/plugins/emoji/public/images/twitter/school.png b/plugins/emoji/public/images/twitter/school.png
new file mode 100644
index 0000000000..ad2d40a2a3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/school.png differ
diff --git a/plugins/emoji/public/images/twitter/school_satchel.png b/plugins/emoji/public/images/twitter/school_satchel.png
new file mode 100644
index 0000000000..e5d59bef58
Binary files /dev/null and b/plugins/emoji/public/images/twitter/school_satchel.png differ
diff --git a/plugins/emoji/public/images/twitter/scissors.png b/plugins/emoji/public/images/twitter/scissors.png
new file mode 100644
index 0000000000..bd64b7de9e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/scissors.png differ
diff --git a/plugins/emoji/public/images/twitter/scorpius.png b/plugins/emoji/public/images/twitter/scorpius.png
new file mode 100644
index 0000000000..17b213184f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/scorpius.png differ
diff --git a/plugins/emoji/public/images/twitter/scream.png b/plugins/emoji/public/images/twitter/scream.png
new file mode 100644
index 0000000000..51396eca52
Binary files /dev/null and b/plugins/emoji/public/images/twitter/scream.png differ
diff --git a/plugins/emoji/public/images/twitter/scream_cat.png b/plugins/emoji/public/images/twitter/scream_cat.png
new file mode 100644
index 0000000000..46095abeab
Binary files /dev/null and b/plugins/emoji/public/images/twitter/scream_cat.png differ
diff --git a/plugins/emoji/public/images/twitter/scroll.png b/plugins/emoji/public/images/twitter/scroll.png
new file mode 100644
index 0000000000..c973d3cb98
Binary files /dev/null and b/plugins/emoji/public/images/twitter/scroll.png differ
diff --git a/plugins/emoji/public/images/twitter/seat.png b/plugins/emoji/public/images/twitter/seat.png
new file mode 100644
index 0000000000..4f42f6212e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/seat.png differ
diff --git a/plugins/emoji/public/images/twitter/secret.png b/plugins/emoji/public/images/twitter/secret.png
new file mode 100644
index 0000000000..d64ecfabd2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/secret.png differ
diff --git a/plugins/emoji/public/images/twitter/see_no_evil.png b/plugins/emoji/public/images/twitter/see_no_evil.png
new file mode 100644
index 0000000000..193927e180
Binary files /dev/null and b/plugins/emoji/public/images/twitter/see_no_evil.png differ
diff --git a/plugins/emoji/public/images/twitter/seedling.png b/plugins/emoji/public/images/twitter/seedling.png
new file mode 100644
index 0000000000..e2afd3fc73
Binary files /dev/null and b/plugins/emoji/public/images/twitter/seedling.png differ
diff --git a/plugins/emoji/public/images/twitter/seven.png b/plugins/emoji/public/images/twitter/seven.png
new file mode 100644
index 0000000000..9d846a9878
Binary files /dev/null and b/plugins/emoji/public/images/twitter/seven.png differ
diff --git a/plugins/emoji/public/images/twitter/shaved_ice.png b/plugins/emoji/public/images/twitter/shaved_ice.png
new file mode 100644
index 0000000000..40e7e673ae
Binary files /dev/null and b/plugins/emoji/public/images/twitter/shaved_ice.png differ
diff --git a/plugins/emoji/public/images/twitter/sheep.png b/plugins/emoji/public/images/twitter/sheep.png
new file mode 100644
index 0000000000..6ea58187d8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sheep.png differ
diff --git a/plugins/emoji/public/images/twitter/shell.png b/plugins/emoji/public/images/twitter/shell.png
new file mode 100644
index 0000000000..e9efae186e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/shell.png differ
diff --git a/plugins/emoji/public/images/twitter/ship.png b/plugins/emoji/public/images/twitter/ship.png
new file mode 100644
index 0000000000..bad0411e1f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ship.png differ
diff --git a/plugins/emoji/public/images/twitter/shirt.png b/plugins/emoji/public/images/twitter/shirt.png
new file mode 100644
index 0000000000..241cb12b5b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/shirt.png differ
diff --git a/plugins/emoji/public/images/twitter/shit.png b/plugins/emoji/public/images/twitter/shit.png
new file mode 100644
index 0000000000..604d2a2d0a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/shit.png differ
diff --git a/plugins/emoji/public/images/twitter/shoe.png b/plugins/emoji/public/images/twitter/shoe.png
new file mode 100644
index 0000000000..71d4be2c33
Binary files /dev/null and b/plugins/emoji/public/images/twitter/shoe.png differ
diff --git a/plugins/emoji/public/images/twitter/shower.png b/plugins/emoji/public/images/twitter/shower.png
new file mode 100644
index 0000000000..0ed9f120ad
Binary files /dev/null and b/plugins/emoji/public/images/twitter/shower.png differ
diff --git a/plugins/emoji/public/images/twitter/signal_strength.png b/plugins/emoji/public/images/twitter/signal_strength.png
new file mode 100644
index 0000000000..ef25cb85c5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/signal_strength.png differ
diff --git a/plugins/emoji/public/images/twitter/six.png b/plugins/emoji/public/images/twitter/six.png
new file mode 100644
index 0000000000..a79b45b739
Binary files /dev/null and b/plugins/emoji/public/images/twitter/six.png differ
diff --git a/plugins/emoji/public/images/twitter/six_pointed_star.png b/plugins/emoji/public/images/twitter/six_pointed_star.png
new file mode 100644
index 0000000000..148a7090cd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/six_pointed_star.png differ
diff --git a/plugins/emoji/public/images/twitter/ski.png b/plugins/emoji/public/images/twitter/ski.png
new file mode 100644
index 0000000000..b28aa21fa0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ski.png differ
diff --git a/plugins/emoji/public/images/twitter/skull.png b/plugins/emoji/public/images/twitter/skull.png
new file mode 100644
index 0000000000..63665fde1b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/skull.png differ
diff --git a/plugins/emoji/public/images/twitter/sleeping.png b/plugins/emoji/public/images/twitter/sleeping.png
new file mode 100644
index 0000000000..b521d0321d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sleeping.png differ
diff --git a/plugins/emoji/public/images/twitter/sleepy.png b/plugins/emoji/public/images/twitter/sleepy.png
new file mode 100644
index 0000000000..e3720f8f4f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sleepy.png differ
diff --git a/plugins/emoji/public/images/twitter/slot_machine.png b/plugins/emoji/public/images/twitter/slot_machine.png
new file mode 100644
index 0000000000..cfdc70a0fd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/slot_machine.png differ
diff --git a/plugins/emoji/public/images/twitter/small_blue_diamond.png b/plugins/emoji/public/images/twitter/small_blue_diamond.png
new file mode 100644
index 0000000000..a431ee0c45
Binary files /dev/null and b/plugins/emoji/public/images/twitter/small_blue_diamond.png differ
diff --git a/plugins/emoji/public/images/twitter/small_orange_diamond.png b/plugins/emoji/public/images/twitter/small_orange_diamond.png
new file mode 100644
index 0000000000..c0770290fd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/small_orange_diamond.png differ
diff --git a/plugins/emoji/public/images/twitter/small_red_triangle.png b/plugins/emoji/public/images/twitter/small_red_triangle.png
new file mode 100644
index 0000000000..cbfc5377da
Binary files /dev/null and b/plugins/emoji/public/images/twitter/small_red_triangle.png differ
diff --git a/plugins/emoji/public/images/twitter/small_red_triangle_down.png b/plugins/emoji/public/images/twitter/small_red_triangle_down.png
new file mode 100644
index 0000000000..3aa3db5f65
Binary files /dev/null and b/plugins/emoji/public/images/twitter/small_red_triangle_down.png differ
diff --git a/plugins/emoji/public/images/twitter/smile.png b/plugins/emoji/public/images/twitter/smile.png
new file mode 100644
index 0000000000..642c90ccbc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/smile.png differ
diff --git a/plugins/emoji/public/images/twitter/smile_cat.png b/plugins/emoji/public/images/twitter/smile_cat.png
new file mode 100644
index 0000000000..81b6e5c42c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/smile_cat.png differ
diff --git a/plugins/emoji/public/images/twitter/smiley.png b/plugins/emoji/public/images/twitter/smiley.png
new file mode 100644
index 0000000000..add5433807
Binary files /dev/null and b/plugins/emoji/public/images/twitter/smiley.png differ
diff --git a/plugins/emoji/public/images/twitter/smiley_cat.png b/plugins/emoji/public/images/twitter/smiley_cat.png
new file mode 100644
index 0000000000..d8d42a8ca2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/smiley_cat.png differ
diff --git a/plugins/emoji/public/images/twitter/smiling_imp.png b/plugins/emoji/public/images/twitter/smiling_imp.png
new file mode 100644
index 0000000000..66a8653d01
Binary files /dev/null and b/plugins/emoji/public/images/twitter/smiling_imp.png differ
diff --git a/plugins/emoji/public/images/twitter/smirk.png b/plugins/emoji/public/images/twitter/smirk.png
new file mode 100644
index 0000000000..70240ea5ba
Binary files /dev/null and b/plugins/emoji/public/images/twitter/smirk.png differ
diff --git a/plugins/emoji/public/images/twitter/smirk_cat.png b/plugins/emoji/public/images/twitter/smirk_cat.png
new file mode 100644
index 0000000000..24f9337a52
Binary files /dev/null and b/plugins/emoji/public/images/twitter/smirk_cat.png differ
diff --git a/plugins/emoji/public/images/twitter/smoking.png b/plugins/emoji/public/images/twitter/smoking.png
new file mode 100644
index 0000000000..2dd81c268f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/smoking.png differ
diff --git a/plugins/emoji/public/images/twitter/snail.png b/plugins/emoji/public/images/twitter/snail.png
new file mode 100644
index 0000000000..1cf9e6e426
Binary files /dev/null and b/plugins/emoji/public/images/twitter/snail.png differ
diff --git a/plugins/emoji/public/images/twitter/snake.png b/plugins/emoji/public/images/twitter/snake.png
new file mode 100644
index 0000000000..ea864572a5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/snake.png differ
diff --git a/plugins/emoji/public/images/twitter/snowboarder.png b/plugins/emoji/public/images/twitter/snowboarder.png
new file mode 100644
index 0000000000..18e45f61e4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/snowboarder.png differ
diff --git a/plugins/emoji/public/images/twitter/snowflake.png b/plugins/emoji/public/images/twitter/snowflake.png
new file mode 100644
index 0000000000..f028132c84
Binary files /dev/null and b/plugins/emoji/public/images/twitter/snowflake.png differ
diff --git a/plugins/emoji/public/images/twitter/snowman.png b/plugins/emoji/public/images/twitter/snowman.png
new file mode 100644
index 0000000000..3762ed4a9f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/snowman.png differ
diff --git a/plugins/emoji/public/images/twitter/sob.png b/plugins/emoji/public/images/twitter/sob.png
new file mode 100644
index 0000000000..a6d73884f2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sob.png differ
diff --git a/plugins/emoji/public/images/twitter/soccer.png b/plugins/emoji/public/images/twitter/soccer.png
new file mode 100644
index 0000000000..eb0dc7bfc1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/soccer.png differ
diff --git a/plugins/emoji/public/images/twitter/soon.png b/plugins/emoji/public/images/twitter/soon.png
new file mode 100644
index 0000000000..01b034fa83
Binary files /dev/null and b/plugins/emoji/public/images/twitter/soon.png differ
diff --git a/plugins/emoji/public/images/twitter/sos.png b/plugins/emoji/public/images/twitter/sos.png
new file mode 100644
index 0000000000..086755edd4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sos.png differ
diff --git a/plugins/emoji/public/images/twitter/sound.png b/plugins/emoji/public/images/twitter/sound.png
new file mode 100644
index 0000000000..e0d7df94b8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sound.png differ
diff --git a/plugins/emoji/public/images/twitter/space_invader.png b/plugins/emoji/public/images/twitter/space_invader.png
new file mode 100644
index 0000000000..c714fc2815
Binary files /dev/null and b/plugins/emoji/public/images/twitter/space_invader.png differ
diff --git a/plugins/emoji/public/images/twitter/spades.png b/plugins/emoji/public/images/twitter/spades.png
new file mode 100644
index 0000000000..b8276037eb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/spades.png differ
diff --git a/plugins/emoji/public/images/twitter/spaghetti.png b/plugins/emoji/public/images/twitter/spaghetti.png
new file mode 100644
index 0000000000..7bf424ea50
Binary files /dev/null and b/plugins/emoji/public/images/twitter/spaghetti.png differ
diff --git a/plugins/emoji/public/images/twitter/sparkle.png b/plugins/emoji/public/images/twitter/sparkle.png
new file mode 100644
index 0000000000..d3e0207641
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sparkle.png differ
diff --git a/plugins/emoji/public/images/twitter/sparkler.png b/plugins/emoji/public/images/twitter/sparkler.png
new file mode 100644
index 0000000000..25a6cf62f4
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sparkler.png differ
diff --git a/plugins/emoji/public/images/twitter/sparkles.png b/plugins/emoji/public/images/twitter/sparkles.png
new file mode 100644
index 0000000000..514855cf81
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sparkles.png differ
diff --git a/plugins/emoji/public/images/twitter/sparkling_heart.png b/plugins/emoji/public/images/twitter/sparkling_heart.png
new file mode 100644
index 0000000000..14a98d05a1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sparkling_heart.png differ
diff --git a/plugins/emoji/public/images/twitter/speak_no_evil.png b/plugins/emoji/public/images/twitter/speak_no_evil.png
new file mode 100644
index 0000000000..e78d285e1a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/speak_no_evil.png differ
diff --git a/plugins/emoji/public/images/twitter/speaker.png b/plugins/emoji/public/images/twitter/speaker.png
new file mode 100644
index 0000000000..ed651cc72e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/speaker.png differ
diff --git a/plugins/emoji/public/images/twitter/speech_balloon.png b/plugins/emoji/public/images/twitter/speech_balloon.png
new file mode 100644
index 0000000000..3c7b9c61d3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/speech_balloon.png differ
diff --git a/plugins/emoji/public/images/twitter/speedboat.png b/plugins/emoji/public/images/twitter/speedboat.png
new file mode 100644
index 0000000000..de945ce10a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/speedboat.png differ
diff --git a/plugins/emoji/public/images/twitter/star.png b/plugins/emoji/public/images/twitter/star.png
new file mode 100644
index 0000000000..6e54055529
Binary files /dev/null and b/plugins/emoji/public/images/twitter/star.png differ
diff --git a/plugins/emoji/public/images/twitter/star2.png b/plugins/emoji/public/images/twitter/star2.png
new file mode 100644
index 0000000000..d00c34d2d6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/star2.png differ
diff --git a/plugins/emoji/public/images/twitter/stars.png b/plugins/emoji/public/images/twitter/stars.png
new file mode 100644
index 0000000000..61a2907213
Binary files /dev/null and b/plugins/emoji/public/images/twitter/stars.png differ
diff --git a/plugins/emoji/public/images/twitter/station.png b/plugins/emoji/public/images/twitter/station.png
new file mode 100644
index 0000000000..0a2489cd3e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/station.png differ
diff --git a/plugins/emoji/public/images/twitter/statue_of_liberty.png b/plugins/emoji/public/images/twitter/statue_of_liberty.png
new file mode 100644
index 0000000000..e3006b714c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/statue_of_liberty.png differ
diff --git a/plugins/emoji/public/images/twitter/steam_locomotive.png b/plugins/emoji/public/images/twitter/steam_locomotive.png
new file mode 100644
index 0000000000..7e6d80a23e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/steam_locomotive.png differ
diff --git a/plugins/emoji/public/images/twitter/stew.png b/plugins/emoji/public/images/twitter/stew.png
new file mode 100644
index 0000000000..93f74e6b81
Binary files /dev/null and b/plugins/emoji/public/images/twitter/stew.png differ
diff --git a/plugins/emoji/public/images/twitter/straight_ruler.png b/plugins/emoji/public/images/twitter/straight_ruler.png
new file mode 100644
index 0000000000..fa467cab1f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/straight_ruler.png differ
diff --git a/plugins/emoji/public/images/twitter/strawberry.png b/plugins/emoji/public/images/twitter/strawberry.png
new file mode 100644
index 0000000000..9bbfe1be3c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/strawberry.png differ
diff --git a/plugins/emoji/public/images/twitter/stuck_out_tongue.png b/plugins/emoji/public/images/twitter/stuck_out_tongue.png
new file mode 100644
index 0000000000..f036ed35fa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/stuck_out_tongue.png differ
diff --git a/plugins/emoji/public/images/twitter/stuck_out_tongue_closed_eyes.png b/plugins/emoji/public/images/twitter/stuck_out_tongue_closed_eyes.png
new file mode 100644
index 0000000000..05b69618ae
Binary files /dev/null and b/plugins/emoji/public/images/twitter/stuck_out_tongue_closed_eyes.png differ
diff --git a/plugins/emoji/public/images/twitter/stuck_out_tongue_winking_eye.png b/plugins/emoji/public/images/twitter/stuck_out_tongue_winking_eye.png
new file mode 100644
index 0000000000..46b8fa0239
Binary files /dev/null and b/plugins/emoji/public/images/twitter/stuck_out_tongue_winking_eye.png differ
diff --git a/plugins/emoji/public/images/twitter/sun_with_face.png b/plugins/emoji/public/images/twitter/sun_with_face.png
new file mode 100644
index 0000000000..38400d98b0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sun_with_face.png differ
diff --git a/plugins/emoji/public/images/twitter/sunflower.png b/plugins/emoji/public/images/twitter/sunflower.png
new file mode 100644
index 0000000000..5b2d74e4e0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sunflower.png differ
diff --git a/plugins/emoji/public/images/twitter/sunglasses.png b/plugins/emoji/public/images/twitter/sunglasses.png
new file mode 100644
index 0000000000..2c8b71100b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sunglasses.png differ
diff --git a/plugins/emoji/public/images/twitter/sunny.png b/plugins/emoji/public/images/twitter/sunny.png
new file mode 100644
index 0000000000..334988bbbc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sunny.png differ
diff --git a/plugins/emoji/public/images/twitter/sunrise.png b/plugins/emoji/public/images/twitter/sunrise.png
new file mode 100644
index 0000000000..c117bbbce6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sunrise.png differ
diff --git a/plugins/emoji/public/images/twitter/sunrise_over_mountains.png b/plugins/emoji/public/images/twitter/sunrise_over_mountains.png
new file mode 100644
index 0000000000..8efb301543
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sunrise_over_mountains.png differ
diff --git a/plugins/emoji/public/images/twitter/surfer.png b/plugins/emoji/public/images/twitter/surfer.png
new file mode 100644
index 0000000000..84e76fa439
Binary files /dev/null and b/plugins/emoji/public/images/twitter/surfer.png differ
diff --git a/plugins/emoji/public/images/twitter/sushi.png b/plugins/emoji/public/images/twitter/sushi.png
new file mode 100644
index 0000000000..53c053f021
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sushi.png differ
diff --git a/plugins/emoji/public/images/twitter/suspension_railway.png b/plugins/emoji/public/images/twitter/suspension_railway.png
new file mode 100644
index 0000000000..5a9b15555a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/suspension_railway.png differ
diff --git a/plugins/emoji/public/images/twitter/sweat.png b/plugins/emoji/public/images/twitter/sweat.png
new file mode 100644
index 0000000000..2154e41d2c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sweat.png differ
diff --git a/plugins/emoji/public/images/twitter/sweat_drops.png b/plugins/emoji/public/images/twitter/sweat_drops.png
new file mode 100644
index 0000000000..b59b6a47cd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sweat_drops.png differ
diff --git a/plugins/emoji/public/images/twitter/sweat_smile.png b/plugins/emoji/public/images/twitter/sweat_smile.png
new file mode 100644
index 0000000000..c80fbcfd9d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sweat_smile.png differ
diff --git a/plugins/emoji/public/images/twitter/sweet_potato.png b/plugins/emoji/public/images/twitter/sweet_potato.png
new file mode 100644
index 0000000000..014490b42f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/sweet_potato.png differ
diff --git a/plugins/emoji/public/images/twitter/swimmer.png b/plugins/emoji/public/images/twitter/swimmer.png
new file mode 100644
index 0000000000..738b288591
Binary files /dev/null and b/plugins/emoji/public/images/twitter/swimmer.png differ
diff --git a/plugins/emoji/public/images/twitter/symbols.png b/plugins/emoji/public/images/twitter/symbols.png
new file mode 100644
index 0000000000..21ccc8953b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/symbols.png differ
diff --git a/plugins/emoji/public/images/twitter/syringe.png b/plugins/emoji/public/images/twitter/syringe.png
new file mode 100644
index 0000000000..583dfe3cf9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/syringe.png differ
diff --git a/plugins/emoji/public/images/twitter/tada.png b/plugins/emoji/public/images/twitter/tada.png
new file mode 100644
index 0000000000..e391ee02c2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tada.png differ
diff --git a/plugins/emoji/public/images/twitter/tanabata_tree.png b/plugins/emoji/public/images/twitter/tanabata_tree.png
new file mode 100644
index 0000000000..9e583b9e02
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tanabata_tree.png differ
diff --git a/plugins/emoji/public/images/twitter/tangerine.png b/plugins/emoji/public/images/twitter/tangerine.png
new file mode 100644
index 0000000000..9d7c349b38
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tangerine.png differ
diff --git a/plugins/emoji/public/images/twitter/taurus.png b/plugins/emoji/public/images/twitter/taurus.png
new file mode 100644
index 0000000000..413be66bc1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/taurus.png differ
diff --git a/plugins/emoji/public/images/twitter/taxi.png b/plugins/emoji/public/images/twitter/taxi.png
new file mode 100644
index 0000000000..4b79bff57a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/taxi.png differ
diff --git a/plugins/emoji/public/images/twitter/tea.png b/plugins/emoji/public/images/twitter/tea.png
new file mode 100644
index 0000000000..ddbfa8b20a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tea.png differ
diff --git a/plugins/emoji/public/images/twitter/telephone.png b/plugins/emoji/public/images/twitter/telephone.png
new file mode 100644
index 0000000000..c7afd7627b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/telephone.png differ
diff --git a/plugins/emoji/public/images/twitter/telephone_receiver.png b/plugins/emoji/public/images/twitter/telephone_receiver.png
new file mode 100644
index 0000000000..1b73765e05
Binary files /dev/null and b/plugins/emoji/public/images/twitter/telephone_receiver.png differ
diff --git a/plugins/emoji/public/images/twitter/telescope.png b/plugins/emoji/public/images/twitter/telescope.png
new file mode 100644
index 0000000000..ab393ed335
Binary files /dev/null and b/plugins/emoji/public/images/twitter/telescope.png differ
diff --git a/plugins/emoji/public/images/twitter/tennis.png b/plugins/emoji/public/images/twitter/tennis.png
new file mode 100644
index 0000000000..e45a2d374f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tennis.png differ
diff --git a/plugins/emoji/public/images/twitter/tent.png b/plugins/emoji/public/images/twitter/tent.png
new file mode 100644
index 0000000000..338545570e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tent.png differ
diff --git a/plugins/emoji/public/images/twitter/thought_balloon.png b/plugins/emoji/public/images/twitter/thought_balloon.png
new file mode 100644
index 0000000000..65b0129676
Binary files /dev/null and b/plugins/emoji/public/images/twitter/thought_balloon.png differ
diff --git a/plugins/emoji/public/images/twitter/three.png b/plugins/emoji/public/images/twitter/three.png
new file mode 100644
index 0000000000..044578cdab
Binary files /dev/null and b/plugins/emoji/public/images/twitter/three.png differ
diff --git a/plugins/emoji/public/images/twitter/thumbsdown.png b/plugins/emoji/public/images/twitter/thumbsdown.png
new file mode 100644
index 0000000000..892f5cf1ee
Binary files /dev/null and b/plugins/emoji/public/images/twitter/thumbsdown.png differ
diff --git a/plugins/emoji/public/images/twitter/thumbsup.png b/plugins/emoji/public/images/twitter/thumbsup.png
new file mode 100644
index 0000000000..f4bafe3cc1
Binary files /dev/null and b/plugins/emoji/public/images/twitter/thumbsup.png differ
diff --git a/plugins/emoji/public/images/twitter/ticket.png b/plugins/emoji/public/images/twitter/ticket.png
new file mode 100644
index 0000000000..79a010d9aa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/ticket.png differ
diff --git a/plugins/emoji/public/images/twitter/tiger.png b/plugins/emoji/public/images/twitter/tiger.png
new file mode 100644
index 0000000000..97bf16261d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tiger.png differ
diff --git a/plugins/emoji/public/images/twitter/tiger2.png b/plugins/emoji/public/images/twitter/tiger2.png
new file mode 100644
index 0000000000..0b7f0ebb38
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tiger2.png differ
diff --git a/plugins/emoji/public/images/twitter/tired_face.png b/plugins/emoji/public/images/twitter/tired_face.png
new file mode 100644
index 0000000000..567b854e0f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tired_face.png differ
diff --git a/plugins/emoji/public/images/twitter/tm.png b/plugins/emoji/public/images/twitter/tm.png
new file mode 100644
index 0000000000..29ac4fb92e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tm.png differ
diff --git a/plugins/emoji/public/images/twitter/toilet.png b/plugins/emoji/public/images/twitter/toilet.png
new file mode 100644
index 0000000000..7b7468b1be
Binary files /dev/null and b/plugins/emoji/public/images/twitter/toilet.png differ
diff --git a/plugins/emoji/public/images/twitter/tokyo_tower.png b/plugins/emoji/public/images/twitter/tokyo_tower.png
new file mode 100644
index 0000000000..ec902e72de
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tokyo_tower.png differ
diff --git a/plugins/emoji/public/images/twitter/tomato.png b/plugins/emoji/public/images/twitter/tomato.png
new file mode 100644
index 0000000000..e3cf7f6202
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tomato.png differ
diff --git a/plugins/emoji/public/images/twitter/tongue.png b/plugins/emoji/public/images/twitter/tongue.png
new file mode 100644
index 0000000000..a79abe033f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tongue.png differ
diff --git a/plugins/emoji/public/images/twitter/top.png b/plugins/emoji/public/images/twitter/top.png
new file mode 100644
index 0000000000..eb23f5ef3c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/top.png differ
diff --git a/plugins/emoji/public/images/twitter/tophat.png b/plugins/emoji/public/images/twitter/tophat.png
new file mode 100644
index 0000000000..4441011666
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tophat.png differ
diff --git a/plugins/emoji/public/images/twitter/tractor.png b/plugins/emoji/public/images/twitter/tractor.png
new file mode 100644
index 0000000000..711a128eb8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tractor.png differ
diff --git a/plugins/emoji/public/images/twitter/traffic_light.png b/plugins/emoji/public/images/twitter/traffic_light.png
new file mode 100644
index 0000000000..48b5d29a42
Binary files /dev/null and b/plugins/emoji/public/images/twitter/traffic_light.png differ
diff --git a/plugins/emoji/public/images/twitter/train.png b/plugins/emoji/public/images/twitter/train.png
new file mode 100644
index 0000000000..013893b76f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/train.png differ
diff --git a/plugins/emoji/public/images/twitter/train2.png b/plugins/emoji/public/images/twitter/train2.png
new file mode 100644
index 0000000000..b617401dbb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/train2.png differ
diff --git a/plugins/emoji/public/images/twitter/tram.png b/plugins/emoji/public/images/twitter/tram.png
new file mode 100644
index 0000000000..2297b1de0c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tram.png differ
diff --git a/plugins/emoji/public/images/twitter/triangular_flag_on_post.png b/plugins/emoji/public/images/twitter/triangular_flag_on_post.png
new file mode 100644
index 0000000000..2243d6db66
Binary files /dev/null and b/plugins/emoji/public/images/twitter/triangular_flag_on_post.png differ
diff --git a/plugins/emoji/public/images/twitter/triangular_ruler.png b/plugins/emoji/public/images/twitter/triangular_ruler.png
new file mode 100644
index 0000000000..3bd2c50795
Binary files /dev/null and b/plugins/emoji/public/images/twitter/triangular_ruler.png differ
diff --git a/plugins/emoji/public/images/twitter/trident.png b/plugins/emoji/public/images/twitter/trident.png
new file mode 100644
index 0000000000..1729a9760f
Binary files /dev/null and b/plugins/emoji/public/images/twitter/trident.png differ
diff --git a/plugins/emoji/public/images/twitter/triumph.png b/plugins/emoji/public/images/twitter/triumph.png
new file mode 100644
index 0000000000..4f0a6c1484
Binary files /dev/null and b/plugins/emoji/public/images/twitter/triumph.png differ
diff --git a/plugins/emoji/public/images/twitter/trolleybus.png b/plugins/emoji/public/images/twitter/trolleybus.png
new file mode 100644
index 0000000000..fe8548106d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/trolleybus.png differ
diff --git a/plugins/emoji/public/images/twitter/trophy.png b/plugins/emoji/public/images/twitter/trophy.png
new file mode 100644
index 0000000000..8010d8cdfa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/trophy.png differ
diff --git a/plugins/emoji/public/images/twitter/tropical_drink.png b/plugins/emoji/public/images/twitter/tropical_drink.png
new file mode 100644
index 0000000000..16f2c8822c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tropical_drink.png differ
diff --git a/plugins/emoji/public/images/twitter/tropical_fish.png b/plugins/emoji/public/images/twitter/tropical_fish.png
new file mode 100644
index 0000000000..4a02ce1c35
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tropical_fish.png differ
diff --git a/plugins/emoji/public/images/twitter/truck.png b/plugins/emoji/public/images/twitter/truck.png
new file mode 100644
index 0000000000..8f6ea86ffa
Binary files /dev/null and b/plugins/emoji/public/images/twitter/truck.png differ
diff --git a/plugins/emoji/public/images/twitter/trumpet.png b/plugins/emoji/public/images/twitter/trumpet.png
new file mode 100644
index 0000000000..c8493813d5
Binary files /dev/null and b/plugins/emoji/public/images/twitter/trumpet.png differ
diff --git a/plugins/emoji/public/images/twitter/tshirt.png b/plugins/emoji/public/images/twitter/tshirt.png
new file mode 100644
index 0000000000..241cb12b5b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tshirt.png differ
diff --git a/plugins/emoji/public/images/twitter/tulip.png b/plugins/emoji/public/images/twitter/tulip.png
new file mode 100644
index 0000000000..c206c34c9a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tulip.png differ
diff --git a/plugins/emoji/public/images/twitter/turtle.png b/plugins/emoji/public/images/twitter/turtle.png
new file mode 100644
index 0000000000..4ab991b3d9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/turtle.png differ
diff --git a/plugins/emoji/public/images/twitter/tv.png b/plugins/emoji/public/images/twitter/tv.png
new file mode 100644
index 0000000000..2bbee71c3e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/tv.png differ
diff --git a/plugins/emoji/public/images/twitter/twisted_rightwards_arrows.png b/plugins/emoji/public/images/twitter/twisted_rightwards_arrows.png
new file mode 100644
index 0000000000..fc1e421606
Binary files /dev/null and b/plugins/emoji/public/images/twitter/twisted_rightwards_arrows.png differ
diff --git a/plugins/emoji/public/images/twitter/two.png b/plugins/emoji/public/images/twitter/two.png
new file mode 100644
index 0000000000..74bea34f2d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/two.png differ
diff --git a/plugins/emoji/public/images/twitter/two_hearts.png b/plugins/emoji/public/images/twitter/two_hearts.png
new file mode 100644
index 0000000000..aa670390de
Binary files /dev/null and b/plugins/emoji/public/images/twitter/two_hearts.png differ
diff --git a/plugins/emoji/public/images/twitter/two_men_holding_hands.png b/plugins/emoji/public/images/twitter/two_men_holding_hands.png
new file mode 100644
index 0000000000..361d186182
Binary files /dev/null and b/plugins/emoji/public/images/twitter/two_men_holding_hands.png differ
diff --git a/plugins/emoji/public/images/twitter/two_women_holding_hands.png b/plugins/emoji/public/images/twitter/two_women_holding_hands.png
new file mode 100644
index 0000000000..8374165a22
Binary files /dev/null and b/plugins/emoji/public/images/twitter/two_women_holding_hands.png differ
diff --git a/plugins/emoji/public/images/twitter/u5272.png b/plugins/emoji/public/images/twitter/u5272.png
new file mode 100644
index 0000000000..212a675858
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u5272.png differ
diff --git a/plugins/emoji/public/images/twitter/u5408.png b/plugins/emoji/public/images/twitter/u5408.png
new file mode 100644
index 0000000000..2cb63bb9c6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u5408.png differ
diff --git a/plugins/emoji/public/images/twitter/u55b6.png b/plugins/emoji/public/images/twitter/u55b6.png
new file mode 100644
index 0000000000..6fe0b6f229
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u55b6.png differ
diff --git a/plugins/emoji/public/images/twitter/u6307.png b/plugins/emoji/public/images/twitter/u6307.png
new file mode 100644
index 0000000000..2e35375ce8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u6307.png differ
diff --git a/plugins/emoji/public/images/twitter/u6708.png b/plugins/emoji/public/images/twitter/u6708.png
new file mode 100644
index 0000000000..75c4af6975
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u6708.png differ
diff --git a/plugins/emoji/public/images/twitter/u6709.png b/plugins/emoji/public/images/twitter/u6709.png
new file mode 100644
index 0000000000..f2cb50f981
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u6709.png differ
diff --git a/plugins/emoji/public/images/twitter/u6e80.png b/plugins/emoji/public/images/twitter/u6e80.png
new file mode 100644
index 0000000000..597b02eefb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u6e80.png differ
diff --git a/plugins/emoji/public/images/twitter/u7121.png b/plugins/emoji/public/images/twitter/u7121.png
new file mode 100644
index 0000000000..75e6e0fae0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u7121.png differ
diff --git a/plugins/emoji/public/images/twitter/u7533.png b/plugins/emoji/public/images/twitter/u7533.png
new file mode 100644
index 0000000000..b94f801411
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u7533.png differ
diff --git a/plugins/emoji/public/images/twitter/u7981.png b/plugins/emoji/public/images/twitter/u7981.png
new file mode 100644
index 0000000000..82764f6d4d
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u7981.png differ
diff --git a/plugins/emoji/public/images/twitter/u7a7a.png b/plugins/emoji/public/images/twitter/u7a7a.png
new file mode 100644
index 0000000000..b99965daa7
Binary files /dev/null and b/plugins/emoji/public/images/twitter/u7a7a.png differ
diff --git a/plugins/emoji/public/images/twitter/uk.png b/plugins/emoji/public/images/twitter/uk.png
new file mode 100644
index 0000000000..3ad16324d3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/uk.png differ
diff --git a/plugins/emoji/public/images/twitter/umbrella.png b/plugins/emoji/public/images/twitter/umbrella.png
new file mode 100644
index 0000000000..aaac00573e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/umbrella.png differ
diff --git a/plugins/emoji/public/images/twitter/unamused.png b/plugins/emoji/public/images/twitter/unamused.png
new file mode 100644
index 0000000000..7152d299a8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/unamused.png differ
diff --git a/plugins/emoji/public/images/twitter/underage.png b/plugins/emoji/public/images/twitter/underage.png
new file mode 100644
index 0000000000..41f1303bfb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/underage.png differ
diff --git a/plugins/emoji/public/images/twitter/unlock.png b/plugins/emoji/public/images/twitter/unlock.png
new file mode 100644
index 0000000000..764cabd930
Binary files /dev/null and b/plugins/emoji/public/images/twitter/unlock.png differ
diff --git a/plugins/emoji/public/images/twitter/up.png b/plugins/emoji/public/images/twitter/up.png
new file mode 100644
index 0000000000..a5ecd5db13
Binary files /dev/null and b/plugins/emoji/public/images/twitter/up.png differ
diff --git a/plugins/emoji/public/images/twitter/us.png b/plugins/emoji/public/images/twitter/us.png
new file mode 100644
index 0000000000..2a0cbf0009
Binary files /dev/null and b/plugins/emoji/public/images/twitter/us.png differ
diff --git a/plugins/emoji/public/images/twitter/v.png b/plugins/emoji/public/images/twitter/v.png
new file mode 100644
index 0000000000..c6e9b64534
Binary files /dev/null and b/plugins/emoji/public/images/twitter/v.png differ
diff --git a/plugins/emoji/public/images/twitter/vertical_traffic_light.png b/plugins/emoji/public/images/twitter/vertical_traffic_light.png
new file mode 100644
index 0000000000..2f7294f0f0
Binary files /dev/null and b/plugins/emoji/public/images/twitter/vertical_traffic_light.png differ
diff --git a/plugins/emoji/public/images/twitter/vhs.png b/plugins/emoji/public/images/twitter/vhs.png
new file mode 100644
index 0000000000..4583077e22
Binary files /dev/null and b/plugins/emoji/public/images/twitter/vhs.png differ
diff --git a/plugins/emoji/public/images/twitter/vibration_mode.png b/plugins/emoji/public/images/twitter/vibration_mode.png
new file mode 100644
index 0000000000..cb81a51c3a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/vibration_mode.png differ
diff --git a/plugins/emoji/public/images/twitter/video_camera.png b/plugins/emoji/public/images/twitter/video_camera.png
new file mode 100644
index 0000000000..acc4578753
Binary files /dev/null and b/plugins/emoji/public/images/twitter/video_camera.png differ
diff --git a/plugins/emoji/public/images/twitter/video_game.png b/plugins/emoji/public/images/twitter/video_game.png
new file mode 100644
index 0000000000..d84ae0786b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/video_game.png differ
diff --git a/plugins/emoji/public/images/twitter/violin.png b/plugins/emoji/public/images/twitter/violin.png
new file mode 100644
index 0000000000..7d2e82d5d8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/violin.png differ
diff --git a/plugins/emoji/public/images/twitter/virgo.png b/plugins/emoji/public/images/twitter/virgo.png
new file mode 100644
index 0000000000..4c4c2c0c5c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/virgo.png differ
diff --git a/plugins/emoji/public/images/twitter/volcano.png b/plugins/emoji/public/images/twitter/volcano.png
new file mode 100644
index 0000000000..0bbae82a5c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/volcano.png differ
diff --git a/plugins/emoji/public/images/twitter/vs.png b/plugins/emoji/public/images/twitter/vs.png
new file mode 100644
index 0000000000..f9e0f523f2
Binary files /dev/null and b/plugins/emoji/public/images/twitter/vs.png differ
diff --git a/plugins/emoji/public/images/twitter/walking.png b/plugins/emoji/public/images/twitter/walking.png
new file mode 100644
index 0000000000..7f6b71175c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/walking.png differ
diff --git a/plugins/emoji/public/images/twitter/waning_crescent_moon.png b/plugins/emoji/public/images/twitter/waning_crescent_moon.png
new file mode 100644
index 0000000000..62dd410911
Binary files /dev/null and b/plugins/emoji/public/images/twitter/waning_crescent_moon.png differ
diff --git a/plugins/emoji/public/images/twitter/waning_gibbous_moon.png b/plugins/emoji/public/images/twitter/waning_gibbous_moon.png
new file mode 100644
index 0000000000..6f29e36b80
Binary files /dev/null and b/plugins/emoji/public/images/twitter/waning_gibbous_moon.png differ
diff --git a/plugins/emoji/public/images/twitter/warning.png b/plugins/emoji/public/images/twitter/warning.png
new file mode 100644
index 0000000000..2a3c4a48c8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/warning.png differ
diff --git a/plugins/emoji/public/images/twitter/watch.png b/plugins/emoji/public/images/twitter/watch.png
new file mode 100644
index 0000000000..893c261fbb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/watch.png differ
diff --git a/plugins/emoji/public/images/twitter/water_buffalo.png b/plugins/emoji/public/images/twitter/water_buffalo.png
new file mode 100644
index 0000000000..8bf82933fd
Binary files /dev/null and b/plugins/emoji/public/images/twitter/water_buffalo.png differ
diff --git a/plugins/emoji/public/images/twitter/watermelon.png b/plugins/emoji/public/images/twitter/watermelon.png
new file mode 100644
index 0000000000..718569b1f6
Binary files /dev/null and b/plugins/emoji/public/images/twitter/watermelon.png differ
diff --git a/plugins/emoji/public/images/twitter/wave.png b/plugins/emoji/public/images/twitter/wave.png
new file mode 100644
index 0000000000..82a45d2969
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wave.png differ
diff --git a/plugins/emoji/public/images/twitter/wavy_dash.png b/plugins/emoji/public/images/twitter/wavy_dash.png
new file mode 100644
index 0000000000..3fcfdfb0ec
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wavy_dash.png differ
diff --git a/plugins/emoji/public/images/twitter/waxing_crescent_moon.png b/plugins/emoji/public/images/twitter/waxing_crescent_moon.png
new file mode 100644
index 0000000000..4af47f2e94
Binary files /dev/null and b/plugins/emoji/public/images/twitter/waxing_crescent_moon.png differ
diff --git a/plugins/emoji/public/images/twitter/waxing_gibbous_moon.png b/plugins/emoji/public/images/twitter/waxing_gibbous_moon.png
new file mode 100644
index 0000000000..3d96314452
Binary files /dev/null and b/plugins/emoji/public/images/twitter/waxing_gibbous_moon.png differ
diff --git a/plugins/emoji/public/images/twitter/wc.png b/plugins/emoji/public/images/twitter/wc.png
new file mode 100644
index 0000000000..0c779cd477
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wc.png differ
diff --git a/plugins/emoji/public/images/twitter/weary.png b/plugins/emoji/public/images/twitter/weary.png
new file mode 100644
index 0000000000..1ef63c7e73
Binary files /dev/null and b/plugins/emoji/public/images/twitter/weary.png differ
diff --git a/plugins/emoji/public/images/twitter/wedding.png b/plugins/emoji/public/images/twitter/wedding.png
new file mode 100644
index 0000000000..6483199e4a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wedding.png differ
diff --git a/plugins/emoji/public/images/twitter/whale.png b/plugins/emoji/public/images/twitter/whale.png
new file mode 100644
index 0000000000..2e5f613f4e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/whale.png differ
diff --git a/plugins/emoji/public/images/twitter/whale2.png b/plugins/emoji/public/images/twitter/whale2.png
new file mode 100644
index 0000000000..e1fd1fdd67
Binary files /dev/null and b/plugins/emoji/public/images/twitter/whale2.png differ
diff --git a/plugins/emoji/public/images/twitter/wheelchair.png b/plugins/emoji/public/images/twitter/wheelchair.png
new file mode 100644
index 0000000000..52966c6889
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wheelchair.png differ
diff --git a/plugins/emoji/public/images/twitter/white_check_mark.png b/plugins/emoji/public/images/twitter/white_check_mark.png
new file mode 100644
index 0000000000..2ce525a314
Binary files /dev/null and b/plugins/emoji/public/images/twitter/white_check_mark.png differ
diff --git a/plugins/emoji/public/images/twitter/white_circle.png b/plugins/emoji/public/images/twitter/white_circle.png
new file mode 100644
index 0000000000..1f3f7874e9
Binary files /dev/null and b/plugins/emoji/public/images/twitter/white_circle.png differ
diff --git a/plugins/emoji/public/images/twitter/white_flower.png b/plugins/emoji/public/images/twitter/white_flower.png
new file mode 100644
index 0000000000..14f8a430ca
Binary files /dev/null and b/plugins/emoji/public/images/twitter/white_flower.png differ
diff --git a/plugins/emoji/public/images/twitter/white_large_square.png b/plugins/emoji/public/images/twitter/white_large_square.png
new file mode 100644
index 0000000000..bc9de693ad
Binary files /dev/null and b/plugins/emoji/public/images/twitter/white_large_square.png differ
diff --git a/plugins/emoji/public/images/twitter/white_medium_small_square.png b/plugins/emoji/public/images/twitter/white_medium_small_square.png
new file mode 100644
index 0000000000..83df4c86df
Binary files /dev/null and b/plugins/emoji/public/images/twitter/white_medium_small_square.png differ
diff --git a/plugins/emoji/public/images/twitter/white_medium_square.png b/plugins/emoji/public/images/twitter/white_medium_square.png
new file mode 100644
index 0000000000..78a5940ebe
Binary files /dev/null and b/plugins/emoji/public/images/twitter/white_medium_square.png differ
diff --git a/plugins/emoji/public/images/twitter/white_small_square.png b/plugins/emoji/public/images/twitter/white_small_square.png
new file mode 100644
index 0000000000..bcff71a524
Binary files /dev/null and b/plugins/emoji/public/images/twitter/white_small_square.png differ
diff --git a/plugins/emoji/public/images/twitter/white_square_button.png b/plugins/emoji/public/images/twitter/white_square_button.png
new file mode 100644
index 0000000000..59089e757c
Binary files /dev/null and b/plugins/emoji/public/images/twitter/white_square_button.png differ
diff --git a/plugins/emoji/public/images/twitter/wind_chime.png b/plugins/emoji/public/images/twitter/wind_chime.png
new file mode 100644
index 0000000000..c6694e8a28
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wind_chime.png differ
diff --git a/plugins/emoji/public/images/twitter/wine_glass.png b/plugins/emoji/public/images/twitter/wine_glass.png
new file mode 100644
index 0000000000..4b0701582a
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wine_glass.png differ
diff --git a/plugins/emoji/public/images/twitter/wink.png b/plugins/emoji/public/images/twitter/wink.png
new file mode 100644
index 0000000000..ebd7e32703
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wink.png differ
diff --git a/plugins/emoji/public/images/twitter/wolf.png b/plugins/emoji/public/images/twitter/wolf.png
new file mode 100644
index 0000000000..56e75953eb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wolf.png differ
diff --git a/plugins/emoji/public/images/twitter/woman.png b/plugins/emoji/public/images/twitter/woman.png
new file mode 100644
index 0000000000..37e32e866b
Binary files /dev/null and b/plugins/emoji/public/images/twitter/woman.png differ
diff --git a/plugins/emoji/public/images/twitter/womans_clothes.png b/plugins/emoji/public/images/twitter/womans_clothes.png
new file mode 100644
index 0000000000..5cc359fd15
Binary files /dev/null and b/plugins/emoji/public/images/twitter/womans_clothes.png differ
diff --git a/plugins/emoji/public/images/twitter/womans_hat.png b/plugins/emoji/public/images/twitter/womans_hat.png
new file mode 100644
index 0000000000..6e9ee853fb
Binary files /dev/null and b/plugins/emoji/public/images/twitter/womans_hat.png differ
diff --git a/plugins/emoji/public/images/twitter/womens.png b/plugins/emoji/public/images/twitter/womens.png
new file mode 100644
index 0000000000..7add2268d3
Binary files /dev/null and b/plugins/emoji/public/images/twitter/womens.png differ
diff --git a/plugins/emoji/public/images/twitter/worried.png b/plugins/emoji/public/images/twitter/worried.png
new file mode 100644
index 0000000000..4048ebf08e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/worried.png differ
diff --git a/plugins/emoji/public/images/twitter/wrench.png b/plugins/emoji/public/images/twitter/wrench.png
new file mode 100644
index 0000000000..f7b292c65e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/wrench.png differ
diff --git a/plugins/emoji/public/images/twitter/x.png b/plugins/emoji/public/images/twitter/x.png
new file mode 100644
index 0000000000..a245297866
Binary files /dev/null and b/plugins/emoji/public/images/twitter/x.png differ
diff --git a/plugins/emoji/public/images/twitter/yellow_heart.png b/plugins/emoji/public/images/twitter/yellow_heart.png
new file mode 100644
index 0000000000..1499a527bc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/yellow_heart.png differ
diff --git a/plugins/emoji/public/images/twitter/yen.png b/plugins/emoji/public/images/twitter/yen.png
new file mode 100644
index 0000000000..0700b6cbc8
Binary files /dev/null and b/plugins/emoji/public/images/twitter/yen.png differ
diff --git a/plugins/emoji/public/images/twitter/yum.png b/plugins/emoji/public/images/twitter/yum.png
new file mode 100644
index 0000000000..cd81753f0e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/yum.png differ
diff --git a/plugins/emoji/public/images/twitter/zap.png b/plugins/emoji/public/images/twitter/zap.png
new file mode 100644
index 0000000000..ee193678fc
Binary files /dev/null and b/plugins/emoji/public/images/twitter/zap.png differ
diff --git a/plugins/emoji/public/images/twitter/zero.png b/plugins/emoji/public/images/twitter/zero.png
new file mode 100644
index 0000000000..d4b5d1835e
Binary files /dev/null and b/plugins/emoji/public/images/twitter/zero.png differ
diff --git a/plugins/emoji/public/images/twitter/zzz.png b/plugins/emoji/public/images/twitter/zzz.png
new file mode 100644
index 0000000000..9e1ab21bcf
Binary files /dev/null and b/plugins/emoji/public/images/twitter/zzz.png differ
diff --git a/plugins/emoji/public/images/two.png b/plugins/emoji/public/images/two.png
deleted file mode 120000
index 53d81a6857..0000000000
--- a/plugins/emoji/public/images/two.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0032.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/two_hearts.png b/plugins/emoji/public/images/two_hearts.png
deleted file mode 120000
index c51e30afa1..0000000000
--- a/plugins/emoji/public/images/two_hearts.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f495.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/two_men_holding_hands.png b/plugins/emoji/public/images/two_men_holding_hands.png
deleted file mode 120000
index b46ebc125a..0000000000
--- a/plugins/emoji/public/images/two_men_holding_hands.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f46c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/two_women_holding_hands.png b/plugins/emoji/public/images/two_women_holding_hands.png
deleted file mode 120000
index 3385e6aab4..0000000000
--- a/plugins/emoji/public/images/two_women_holding_hands.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f46d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u5272.png b/plugins/emoji/public/images/u5272.png
deleted file mode 120000
index 1f5347dbf2..0000000000
--- a/plugins/emoji/public/images/u5272.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f239.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u5408.png b/plugins/emoji/public/images/u5408.png
deleted file mode 120000
index 1e6f46f351..0000000000
--- a/plugins/emoji/public/images/u5408.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f234.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u55b6.png b/plugins/emoji/public/images/u55b6.png
deleted file mode 120000
index 5eb2272844..0000000000
--- a/plugins/emoji/public/images/u55b6.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f23a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u6307.png b/plugins/emoji/public/images/u6307.png
deleted file mode 120000
index 22e815a3a8..0000000000
--- a/plugins/emoji/public/images/u6307.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f22f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u6708.png b/plugins/emoji/public/images/u6708.png
deleted file mode 120000
index b1ef4805d7..0000000000
--- a/plugins/emoji/public/images/u6708.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f237.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u6709.png b/plugins/emoji/public/images/u6709.png
deleted file mode 120000
index 95217ff965..0000000000
--- a/plugins/emoji/public/images/u6709.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f236.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u6e80.png b/plugins/emoji/public/images/u6e80.png
deleted file mode 120000
index 033f6a9c15..0000000000
--- a/plugins/emoji/public/images/u6e80.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f235.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u7121.png b/plugins/emoji/public/images/u7121.png
deleted file mode 120000
index d03b88e343..0000000000
--- a/plugins/emoji/public/images/u7121.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f21a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u7533.png b/plugins/emoji/public/images/u7533.png
deleted file mode 120000
index c587a5840e..0000000000
--- a/plugins/emoji/public/images/u7533.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f238.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u7981.png b/plugins/emoji/public/images/u7981.png
deleted file mode 120000
index ffe13e4991..0000000000
--- a/plugins/emoji/public/images/u7981.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f232.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/u7a7a.png b/plugins/emoji/public/images/u7a7a.png
deleted file mode 120000
index 51d3b1b9fc..0000000000
--- a/plugins/emoji/public/images/u7a7a.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f233.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/uk.png b/plugins/emoji/public/images/uk.png
deleted file mode 120000
index 68cbaff002..0000000000
--- a/plugins/emoji/public/images/uk.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1ec-1f1e7.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/umbrella.png b/plugins/emoji/public/images/umbrella.png
deleted file mode 120000
index 9546363ef2..0000000000
--- a/plugins/emoji/public/images/umbrella.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2614.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/unamused.png b/plugins/emoji/public/images/unamused.png
deleted file mode 120000
index cd62ee34d6..0000000000
--- a/plugins/emoji/public/images/unamused.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f612.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/underage.png b/plugins/emoji/public/images/underage.png
deleted file mode 120000
index a43951e39a..0000000000
--- a/plugins/emoji/public/images/underage.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f51e.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/unicode/0023.png b/plugins/emoji/public/images/unicode/0023.png
deleted file mode 100755
index a8cd17f52f..0000000000
Binary files a/plugins/emoji/public/images/unicode/0023.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0030.png b/plugins/emoji/public/images/unicode/0030.png
deleted file mode 100755
index 2ad743df0c..0000000000
Binary files a/plugins/emoji/public/images/unicode/0030.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0031.png b/plugins/emoji/public/images/unicode/0031.png
deleted file mode 100755
index d792b49ef5..0000000000
Binary files a/plugins/emoji/public/images/unicode/0031.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0032.png b/plugins/emoji/public/images/unicode/0032.png
deleted file mode 100755
index 3da772c626..0000000000
Binary files a/plugins/emoji/public/images/unicode/0032.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0033.png b/plugins/emoji/public/images/unicode/0033.png
deleted file mode 100755
index 643a596a68..0000000000
Binary files a/plugins/emoji/public/images/unicode/0033.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0034.png b/plugins/emoji/public/images/unicode/0034.png
deleted file mode 100755
index 3e83ab5aec..0000000000
Binary files a/plugins/emoji/public/images/unicode/0034.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0035.png b/plugins/emoji/public/images/unicode/0035.png
deleted file mode 100755
index 05dfa5385b..0000000000
Binary files a/plugins/emoji/public/images/unicode/0035.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0036.png b/plugins/emoji/public/images/unicode/0036.png
deleted file mode 100755
index 78bb810f90..0000000000
Binary files a/plugins/emoji/public/images/unicode/0036.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0037.png b/plugins/emoji/public/images/unicode/0037.png
deleted file mode 100755
index 3a5f8a2e63..0000000000
Binary files a/plugins/emoji/public/images/unicode/0037.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0038.png b/plugins/emoji/public/images/unicode/0038.png
deleted file mode 100755
index 6ddacf2285..0000000000
Binary files a/plugins/emoji/public/images/unicode/0038.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/0039.png b/plugins/emoji/public/images/unicode/0039.png
deleted file mode 100755
index 92c3831fda..0000000000
Binary files a/plugins/emoji/public/images/unicode/0039.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/00ae.png b/plugins/emoji/public/images/unicode/00ae.png
deleted file mode 100755
index 23f009731f..0000000000
Binary files a/plugins/emoji/public/images/unicode/00ae.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f0cf.png b/plugins/emoji/public/images/unicode/1f0cf.png
deleted file mode 100755
index 172dbacf1b..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f0cf.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1e8-1f1f3.png b/plugins/emoji/public/images/unicode/1f1e8-1f1f3.png
deleted file mode 100755
index 0d6c10a9bd..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1e8-1f1f3.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1e9-1f1ea.png b/plugins/emoji/public/images/unicode/1f1e9-1f1ea.png
deleted file mode 100755
index b6e3d38893..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1e9-1f1ea.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1ea-1f1f8.png b/plugins/emoji/public/images/unicode/1f1ea-1f1f8.png
deleted file mode 100755
index 899f7c139e..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1ea-1f1f8.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1eb-1f1f7.png b/plugins/emoji/public/images/unicode/1f1eb-1f1f7.png
deleted file mode 100755
index 77ee310884..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1eb-1f1f7.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1ec-1f1e7.png b/plugins/emoji/public/images/unicode/1f1ec-1f1e7.png
deleted file mode 100755
index d6e2e7ac75..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1ec-1f1e7.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1ee-1f1f9.png b/plugins/emoji/public/images/unicode/1f1ee-1f1f9.png
deleted file mode 100755
index a416bcca1c..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1ee-1f1f9.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1ef-1f1f5.png b/plugins/emoji/public/images/unicode/1f1ef-1f1f5.png
deleted file mode 100755
index 449f6cc38d..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1ef-1f1f5.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1f0-1f1f7.png b/plugins/emoji/public/images/unicode/1f1f0-1f1f7.png
deleted file mode 100755
index 9814d03210..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1f0-1f1f7.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1f7-1f1fa.png b/plugins/emoji/public/images/unicode/1f1f7-1f1fa.png
deleted file mode 100755
index 302cdf5481..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1f7-1f1fa.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f1fa-1f1f8.png b/plugins/emoji/public/images/unicode/1f1fa-1f1f8.png
deleted file mode 100755
index a9908f7067..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f1fa-1f1f8.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f201.png b/plugins/emoji/public/images/unicode/1f201.png
deleted file mode 100755
index 11dac3a88e..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f201.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f202.png b/plugins/emoji/public/images/unicode/1f202.png
deleted file mode 100755
index cd55a4fb81..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f202.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f233.png b/plugins/emoji/public/images/unicode/1f233.png
deleted file mode 100755
index 2534d1e243..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f233.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f238.png b/plugins/emoji/public/images/unicode/1f238.png
deleted file mode 100755
index ce57dede38..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f238.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unicode/1f555.png b/plugins/emoji/public/images/unicode/1f555.png
deleted file mode 100755
index 071fb3b1bf..0000000000
Binary files a/plugins/emoji/public/images/unicode/1f555.png and /dev/null differ
diff --git a/plugins/emoji/public/images/unlock.png b/plugins/emoji/public/images/unlock.png
deleted file mode 120000
index d099026e1a..0000000000
--- a/plugins/emoji/public/images/unlock.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f513.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/up.png b/plugins/emoji/public/images/up.png
deleted file mode 120000
index aeef791319..0000000000
--- a/plugins/emoji/public/images/up.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f199.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/us.png b/plugins/emoji/public/images/us.png
deleted file mode 120000
index 5cbd32aba9..0000000000
--- a/plugins/emoji/public/images/us.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f1fa-1f1f8.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/v.png b/plugins/emoji/public/images/v.png
deleted file mode 120000
index fd69dfb603..0000000000
--- a/plugins/emoji/public/images/v.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/270c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/vertical_traffic_light.png b/plugins/emoji/public/images/vertical_traffic_light.png
deleted file mode 120000
index a25fff6514..0000000000
--- a/plugins/emoji/public/images/vertical_traffic_light.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6a6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/vhs.png b/plugins/emoji/public/images/vhs.png
deleted file mode 120000
index dd44ef29d3..0000000000
--- a/plugins/emoji/public/images/vhs.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4fc.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/vibration_mode.png b/plugins/emoji/public/images/vibration_mode.png
deleted file mode 120000
index d754d5e3e7..0000000000
--- a/plugins/emoji/public/images/vibration_mode.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4f3.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/video_camera.png b/plugins/emoji/public/images/video_camera.png
deleted file mode 120000
index e4adee991e..0000000000
--- a/plugins/emoji/public/images/video_camera.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4f9.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/video_game.png b/plugins/emoji/public/images/video_game.png
deleted file mode 120000
index d108a542bf..0000000000
--- a/plugins/emoji/public/images/video_game.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3ae.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/violin.png b/plugins/emoji/public/images/violin.png
deleted file mode 120000
index d29467f9f8..0000000000
--- a/plugins/emoji/public/images/violin.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f3bb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/virgo.png b/plugins/emoji/public/images/virgo.png
deleted file mode 120000
index ba706ef0d6..0000000000
--- a/plugins/emoji/public/images/virgo.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/264d.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/volcano.png b/plugins/emoji/public/images/volcano.png
deleted file mode 120000
index 6e4837e532..0000000000
--- a/plugins/emoji/public/images/volcano.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f30b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/vs.png b/plugins/emoji/public/images/vs.png
deleted file mode 120000
index 4c7be8986c..0000000000
--- a/plugins/emoji/public/images/vs.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f19a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/walking.png b/plugins/emoji/public/images/walking.png
deleted file mode 120000
index 51cf020d22..0000000000
--- a/plugins/emoji/public/images/walking.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6b6.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/waning_crescent_moon.png b/plugins/emoji/public/images/waning_crescent_moon.png
deleted file mode 120000
index 937d72e52c..0000000000
--- a/plugins/emoji/public/images/waning_crescent_moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f318.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/waning_gibbous_moon.png b/plugins/emoji/public/images/waning_gibbous_moon.png
deleted file mode 120000
index afe1127253..0000000000
--- a/plugins/emoji/public/images/waning_gibbous_moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f316.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/warning.png b/plugins/emoji/public/images/warning.png
deleted file mode 120000
index 9df8811097..0000000000
--- a/plugins/emoji/public/images/warning.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26a0.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/watch.png b/plugins/emoji/public/images/watch.png
deleted file mode 120000
index ee115707ef..0000000000
--- a/plugins/emoji/public/images/watch.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/231a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/water_buffalo.png b/plugins/emoji/public/images/water_buffalo.png
deleted file mode 120000
index e9da975772..0000000000
--- a/plugins/emoji/public/images/water_buffalo.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f403.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/watermelon.png b/plugins/emoji/public/images/watermelon.png
deleted file mode 120000
index 7ce5c0683a..0000000000
--- a/plugins/emoji/public/images/watermelon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f349.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wave.png b/plugins/emoji/public/images/wave.png
deleted file mode 120000
index a8eb534c69..0000000000
--- a/plugins/emoji/public/images/wave.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f44b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wavy_dash.png b/plugins/emoji/public/images/wavy_dash.png
deleted file mode 120000
index 27ebde71c6..0000000000
--- a/plugins/emoji/public/images/wavy_dash.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/3030.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/waxing_crescent_moon.png b/plugins/emoji/public/images/waxing_crescent_moon.png
deleted file mode 120000
index fba84d6dcd..0000000000
--- a/plugins/emoji/public/images/waxing_crescent_moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f312.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/waxing_gibbous_moon.png b/plugins/emoji/public/images/waxing_gibbous_moon.png
deleted file mode 120000
index 1c589610f6..0000000000
--- a/plugins/emoji/public/images/waxing_gibbous_moon.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f314.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wc.png b/plugins/emoji/public/images/wc.png
deleted file mode 120000
index e99ff27cec..0000000000
--- a/plugins/emoji/public/images/wc.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6be.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/weary.png b/plugins/emoji/public/images/weary.png
deleted file mode 120000
index 02c5636be6..0000000000
--- a/plugins/emoji/public/images/weary.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f629.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wedding.png b/plugins/emoji/public/images/wedding.png
deleted file mode 120000
index fd1d2d1159..0000000000
--- a/plugins/emoji/public/images/wedding.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f492.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/whale.png b/plugins/emoji/public/images/whale.png
deleted file mode 120000
index 2604404c2e..0000000000
--- a/plugins/emoji/public/images/whale.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f433.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/whale2.png b/plugins/emoji/public/images/whale2.png
deleted file mode 120000
index ae62b29788..0000000000
--- a/plugins/emoji/public/images/whale2.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f40b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wheelchair.png b/plugins/emoji/public/images/wheelchair.png
deleted file mode 120000
index 35cc6c3dce..0000000000
--- a/plugins/emoji/public/images/wheelchair.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/267f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/white_check_mark.png b/plugins/emoji/public/images/white_check_mark.png
deleted file mode 120000
index 1c30128873..0000000000
--- a/plugins/emoji/public/images/white_check_mark.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2705.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/white_circle.png b/plugins/emoji/public/images/white_circle.png
deleted file mode 120000
index 30505e96c1..0000000000
--- a/plugins/emoji/public/images/white_circle.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26aa.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/white_flower.png b/plugins/emoji/public/images/white_flower.png
deleted file mode 120000
index d2a05197fb..0000000000
--- a/plugins/emoji/public/images/white_flower.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4ae.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/white_large_square.png b/plugins/emoji/public/images/white_large_square.png
deleted file mode 120000
index 90c128071c..0000000000
--- a/plugins/emoji/public/images/white_large_square.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/2b1c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/white_medium_small_square.png b/plugins/emoji/public/images/white_medium_small_square.png
deleted file mode 120000
index cff4cd1d45..0000000000
--- a/plugins/emoji/public/images/white_medium_small_square.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/25fd.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/white_medium_square.png b/plugins/emoji/public/images/white_medium_square.png
deleted file mode 120000
index 57702e4889..0000000000
--- a/plugins/emoji/public/images/white_medium_square.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/25fb.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/white_small_square.png b/plugins/emoji/public/images/white_small_square.png
deleted file mode 120000
index d79315d809..0000000000
--- a/plugins/emoji/public/images/white_small_square.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/25ab.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/white_square_button.png b/plugins/emoji/public/images/white_square_button.png
deleted file mode 120000
index 9018615663..0000000000
--- a/plugins/emoji/public/images/white_square_button.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f533.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wind_chime.png b/plugins/emoji/public/images/wind_chime.png
deleted file mode 120000
index d9348911bf..0000000000
--- a/plugins/emoji/public/images/wind_chime.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f390.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wine_glass.png b/plugins/emoji/public/images/wine_glass.png
deleted file mode 120000
index dd6a6ad03e..0000000000
--- a/plugins/emoji/public/images/wine_glass.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f377.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wink.png b/plugins/emoji/public/images/wink.png
deleted file mode 120000
index e19070d3f4..0000000000
--- a/plugins/emoji/public/images/wink.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f609.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wolf.png b/plugins/emoji/public/images/wolf.png
deleted file mode 120000
index 7fdcf8f756..0000000000
--- a/plugins/emoji/public/images/wolf.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f43a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/woman.png b/plugins/emoji/public/images/woman.png
deleted file mode 120000
index c9a45f3982..0000000000
--- a/plugins/emoji/public/images/woman.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f469.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/womans_clothes.png b/plugins/emoji/public/images/womans_clothes.png
deleted file mode 120000
index dfdf15fadb..0000000000
--- a/plugins/emoji/public/images/womans_clothes.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f45a.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/womans_hat.png b/plugins/emoji/public/images/womans_hat.png
deleted file mode 120000
index fea765acda..0000000000
--- a/plugins/emoji/public/images/womans_hat.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f452.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/womens.png b/plugins/emoji/public/images/womens.png
deleted file mode 120000
index 4b2c93c184..0000000000
--- a/plugins/emoji/public/images/womens.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f6ba.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/worried.png b/plugins/emoji/public/images/worried.png
deleted file mode 120000
index 0087d65a40..0000000000
--- a/plugins/emoji/public/images/worried.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f61f.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/wrench.png b/plugins/emoji/public/images/wrench.png
deleted file mode 120000
index 5ff3e8c1fd..0000000000
--- a/plugins/emoji/public/images/wrench.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f527.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/x.png b/plugins/emoji/public/images/x.png
deleted file mode 120000
index ebb129dece..0000000000
--- a/plugins/emoji/public/images/x.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/274c.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/yellow_heart.png b/plugins/emoji/public/images/yellow_heart.png
deleted file mode 120000
index 8e529fc548..0000000000
--- a/plugins/emoji/public/images/yellow_heart.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f49b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/yen.png b/plugins/emoji/public/images/yen.png
deleted file mode 120000
index d2215b588c..0000000000
--- a/plugins/emoji/public/images/yen.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4b4.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/yum.png b/plugins/emoji/public/images/yum.png
deleted file mode 120000
index 98071348c3..0000000000
--- a/plugins/emoji/public/images/yum.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f60b.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/zap.png b/plugins/emoji/public/images/zap.png
deleted file mode 120000
index 8c83de84bb..0000000000
--- a/plugins/emoji/public/images/zap.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/26a1.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/zero.png b/plugins/emoji/public/images/zero.png
deleted file mode 120000
index c691c0825b..0000000000
--- a/plugins/emoji/public/images/zero.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/0030.png
\ No newline at end of file
diff --git a/plugins/emoji/public/images/zzz.png b/plugins/emoji/public/images/zzz.png
deleted file mode 120000
index 4901a6bed4..0000000000
--- a/plugins/emoji/public/images/zzz.png
+++ /dev/null
@@ -1 +0,0 @@
-unicode/1f4a4.png
\ No newline at end of file
diff --git a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs
index 7d26c141d9..96cf735f50 100644
--- a/plugins/poll/assets/javascripts/discourse/templates/poll.hbs
+++ b/plugins/poll/assets/javascripts/discourse/templates/poll.hbs
@@ -7,7 +7,7 @@
       <td class="option">
         <div class="option">{{{option}}}</div>
         {{#if controller.showResults}}
-          <div class="result">{{i18n poll.voteCount count=votes}}</div>
+          <div class="result">{{i18n 'poll.voteCount' count=votes}}</div>
         {{/if}}
       </td>
     </tr>
@@ -18,10 +18,10 @@
 <button {{action "toggleShowResults"}} class="btn btn-small show-results">
   {{#if showResults}}
     <i class="fa fa-eye-slash"></i>
-    {{i18n poll.results.hide}}
+    {{i18n 'poll.results.hide'}}
   {{else}}
     <i class="fa fa-eye"></i>
-    {{i18n poll.results.show}}
+    {{i18n 'poll.results.show'}}
   {{/if}}
 </button>
 
@@ -29,10 +29,10 @@
   <button {{action "toggleClosePoll"}} class="btn btn-small toggle-poll">
     {{#if poll.closed}}
       <i class="fa fa-unlock-alt"></i>
-      {{i18n poll.open_poll}}
+      {{i18n 'poll.open_poll'}}
     {{else}}
       <i class="fa fa-lock"></i>
-      {{i18n poll.close_poll}}
+      {{i18n 'poll.close_poll'}}
     {{/if}}
   </button>
 {{/if}}
diff --git a/plugins/poll/assets/javascripts/initializers/poll.js.es6 b/plugins/poll/assets/javascripts/initializers/poll.js.es6
index c55cac7eca..61bdeb321f 100644
--- a/plugins/poll/assets/javascripts/initializers/poll.js.es6
+++ b/plugins/poll/assets/javascripts/initializers/poll.js.es6
@@ -49,12 +49,6 @@ var Poll = Discourse.Model.extend({
 var PollView = Ember.View.extend({
   templateName: "poll",
   classNames: ['poll-ui'],
-
-  replaceElement: function(target) {
-    this._insertElementLater(function() {
-      target.replaceWith(this.$());
-    });
-  }
 });
 
 function initializePollView(self) {
@@ -70,13 +64,9 @@ function initializePollView(self) {
     postController: self.get('controller')
   });
 
-  var pollView = self.createChildView(PollView, {
-    controller: pollController
-  });
-  return pollView;
+  return self.createChildView(PollView, { controller: pollController });
 }
 
-
 export default {
   name: 'poll',
 
@@ -90,13 +80,14 @@ export default {
         }
 
         var view = initializePollView(this);
-
         var pollContainer = $post.find(".poll-ui:first");
         if (pollContainer.length === 0) {
           pollContainer = $post.find("ul:first");
         }
 
-        view.replaceElement(pollContainer);
+        var $div = $('<div>');
+        pollContainer.replaceWith($div);
+        view.constructor.renderer.appendTo(view, $div[0]);
         this.set('pollView', view);
 
       }.on('postViewInserted'),
@@ -108,4 +99,4 @@ export default {
       }.on('willClearRender')
     });
   }
-}
+};
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
new file mode 100644
index 0000000000..45eff0a048
--- /dev/null
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -0,0 +1,22 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ar:
+  js:
+    poll:
+      voteCount:
+        zero: "صوت 1"
+        one: "صوت 1"
+        two: "صوت 1"
+        few: "صوت 1"
+        many: "%{احسب} الأصوات"
+        other: "%{احسب} الأصوات"
+      results:
+        show: إظهار النتائج
+        hide: إخفاء النتائج
+      close_poll: "إغلاق التصويت"
+      open_poll: "فتح التصويت"
diff --git a/plugins/poll/config/locales/client.pt_BR.yml b/plugins/poll/config/locales/client.pt_BR.yml
new file mode 100644
index 0000000000..ddfea867fe
--- /dev/null
+++ b/plugins/poll/config/locales/client.pt_BR.yml
@@ -0,0 +1,29 @@
+# encoding: utf-8
+# This file contains content for the client portion of Discourse, sent out
+# to the Javascript app.
+#
+# To work with us on translations, see:
+# https://www.transifex.com/projects/p/discourse-org/
+#
+# This is a "source" file, which is used by Transifex to get translations for other languages.
+# After this file is changed, it needs to be pushed by a maintainer to Transifex:
+#
+#   tx push -s
+#
+# Read more here: https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882
+#
+# To validate this YAML file after you change it, please paste it into
+# http://yamllint.com/
+
+pt_BR:
+  js:
+    poll:
+      voteCount:
+        one: "1 voto"
+        other: "%{count} votos"
+      results:
+        show: Mostrar Resultados
+        hide: Esconder Resultados
+
+      close_poll: "Fechar Enquete "
+      open_poll: "Enquete aberta"
diff --git a/plugins/poll/config/locales/client.tr_TR.yml b/plugins/poll/config/locales/client.tr_TR.yml
new file mode 100644
index 0000000000..721807dd24
--- /dev/null
+++ b/plugins/poll/config/locales/client.tr_TR.yml
@@ -0,0 +1,17 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+tr_TR:
+  js:
+    poll:
+      voteCount:
+        other: "%{count} oy"
+      results:
+        show: Sonuçları göster
+        hide: Sonuçları gizle
+      close_poll: "Anketi Bitir"
+      open_poll: "Anket Başlat"
diff --git a/plugins/poll/config/locales/server.ar.yml b/plugins/poll/config/locales/server.ar.yml
new file mode 100644
index 0000000000..a66bdc8860
--- /dev/null
+++ b/plugins/poll/config/locales/server.ar.yml
@@ -0,0 +1,18 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ar:
+  activerecord:
+    attributes:
+      post:
+        poll_options: "خيارات التصويت"
+  poll:
+    must_contain_poll_options: "يجب أن يحتوي على قائمة خيارات التصويت"
+    cannot_have_modified_options: "التعديل غير ممكن بعد مضي 5 دقائق. اتصل بالمسؤول إذا كنت بحاجة لتغييرها."
+    cannot_add_or_remove_options: "تستطيع تعديله فقط ولا يمكنك إضافته أو حذفه. إذا كنت بحاجة لإضافة أو حذف خيارات يجب أن تُقفل هذا العنوان وتنشئ عنوان جديد."
+    prefix: "تصويت"
+    closed_prefix: "هذا التصويت مغلق"
diff --git a/plugins/poll/config/locales/server.pt_BR.yml b/plugins/poll/config/locales/server.pt_BR.yml
new file mode 100644
index 0000000000..085d44ce7c
--- /dev/null
+++ b/plugins/poll/config/locales/server.pt_BR.yml
@@ -0,0 +1,28 @@
+# encoding: utf-8
+#
+# This file contains content for the server portion of Discourse used by Ruby
+#
+# To work with us on translations, see:
+# https://www.transifex.com/projects/p/discourse-org/
+#
+# This is a "source" file, which is used by Transifex to get translations for other languages.
+# After this file is changed, it needs to be pushed by a maintainer to Transifex:
+#
+#   tx push -s
+#
+# Read more here: https://meta.discourse.org/t/contribute-a-translation-to-discourse/14882
+#
+# To validate this YAML file after you change it, please paste it into
+# http://yamllint.com/
+
+pt_BR:
+  activerecord:
+    attributes:
+      post:
+        poll_options: "Opções de votação "
+  poll:
+    must_contain_poll_options: "deve conter uma lista de opções de votação"
+    cannot_have_modified_options: "não pode ser modificado após os primeiros cinco minutos. Contate o moderador se necessitar fazer alguma mudança."
+    cannot_add_or_remove_options: "Só pode ser editado, mas não adicionar nem remover. Se precisar das opções para adicionar ou remover, você deve bloquear este tópico e criar um novo."
+    prefix: "Votação"
+    closed_prefix: "Votação encerrada"
diff --git a/plugins/poll/config/locales/server.tr_TR.yml b/plugins/poll/config/locales/server.tr_TR.yml
new file mode 100644
index 0000000000..d32284a4b9
--- /dev/null
+++ b/plugins/poll/config/locales/server.tr_TR.yml
@@ -0,0 +1,18 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+tr_TR:
+  activerecord:
+    attributes:
+      post:
+        poll_options: "Anket seçenekleri"
+  poll:
+    must_contain_poll_options: "anket seçenekleri listesini içermeli"
+    cannot_have_modified_options: "ilk beş dakikadan sonra değişiklik yapılamaz. Değişiklik yapmanız gerekiyorsa, bir moderatör ile iletişime geçin."
+    cannot_add_or_remove_options: "sadece düzenlenebilir, ekleme veya çıkarma yapılamaz. Seçenek ekleme veya çıkarmanız gerekiyorsa, bu konuyu kitlemeli ve yeni bir konu oluşturmalısınız."
+    prefix: "Anket"
+    closed_prefix: "Bitmiş Anket"
diff --git a/plugins/poll/spec/poll_plugin/poll_controller_spec.rb b/plugins/poll/spec/poll_plugin/poll_controller_spec.rb
index a621db5762..8f912d8492 100644
--- a/plugins/poll/spec/poll_plugin/poll_controller_spec.rb
+++ b/plugins/poll/spec/poll_plugin/poll_controller_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe PollPlugin::PollController, type: :controller do
+  routes { PollPlugin::Engine.routes }
+
   let(:topic) { create_topic(title: "Poll: Chitoge vs Onodera") }
   let!(:post) { create_post(topic: topic, raw: "Pick one.\n\n[poll]\n* Chitoge\n* Onodera\n[/poll]") }
   let(:user1) { Fabricate(:user) }
@@ -9,43 +11,43 @@ describe PollPlugin::PollController, type: :controller do
 
   describe 'vote' do
     it "returns 403 if no user is logged in" do
-      xhr :put, :vote, post_id: post.id, option: "Chitoge", use_route: :poll
+      xhr :put, :vote, post_id: post.id, option: "Chitoge"
       response.should be_forbidden
     end
 
     it "returns 400 if post_id or invalid option is not specified" do
       log_in_user user1
-      xhr :put, :vote, use_route: :poll
+      xhr :put, :vote
       response.status.should eq(400)
-      xhr :put, :vote, post_id: post.id, use_route: :poll
+      xhr :put, :vote, post_id: post.id
       response.status.should eq(400)
-      xhr :put, :vote, option: "Chitoge", use_route: :poll
+      xhr :put, :vote, option: "Chitoge"
       response.status.should eq(400)
-      xhr :put, :vote, post_id: post.id, option: "Tsugumi", use_route: :poll
+      xhr :put, :vote, post_id: post.id, option: "Tsugumi"
       response.status.should eq(400)
     end
 
     it "returns 400 if post_id doesn't correspond to a poll post" do
       log_in_user user1
       post2 = create_post(topic: topic, raw: "Generic reply")
-      xhr :put, :vote, post_id: post2.id, option: "Chitoge", use_route: :poll
+      xhr :put, :vote, post_id: post2.id, option: "Chitoge"
     end
 
     it "saves votes correctly" do
       MessageBus.expects(:publish).times(3)
 
       log_in_user user1
-      xhr :put, :vote, post_id: post.id, option: "Chitoge", use_route: :poll
+      xhr :put, :vote, post_id: post.id, option: "Chitoge"
       PollPlugin::Poll.new(post).get_vote(user1).should eq("Chitoge")
 
       log_in_user user2
-      xhr :put, :vote, post_id: post.id, option: "Onodera", use_route: :poll
+      xhr :put, :vote, post_id: post.id, option: "Onodera"
       PollPlugin::Poll.new(post).get_vote(user2).should eq("Onodera")
 
       PollPlugin::Poll.new(post).details["Chitoge"].should eq(1)
       PollPlugin::Poll.new(post).details["Onodera"].should eq(1)
 
-      xhr :put, :vote, post_id: post.id, option: "Chitoge", use_route: :poll
+      xhr :put, :vote, post_id: post.id, option: "Chitoge"
       PollPlugin::Poll.new(post).get_vote(user2).should eq("Chitoge")
 
       PollPlugin::Poll.new(post).details["Chitoge"].should eq(2)
@@ -57,21 +59,21 @@ describe PollPlugin::PollController, type: :controller do
     it "returns 400 if post_id doesn't correspond to a poll post" do
       log_in_user admin
       post2 = create_post(topic: topic, raw: "Generic reply")
-      xhr :put, :toggle_close, post_id: post2.id, use_route: :poll
+      xhr :put, :toggle_close, post_id: post2.id
       response.status.should eq(400)
     end
 
     it "returns 400 if the topic is locked" do
       log_in_user admin
       topic.update_attributes closed: true
-      xhr :put, :toggle_close, post_id: post.id, use_route: :poll
+      xhr :put, :toggle_close, post_id: post.id
       response.status.should eq(400)
     end
 
     it "raises Discourse::InvalidAccess is the user is not authorized" do
       log_in_user user1
       expect do
-        xhr :put, :toggle_close, post_id: post.id, use_route: :poll
+        xhr :put, :toggle_close, post_id: post.id
       end.to raise_error(Discourse::InvalidAccess)
     end
 
@@ -79,10 +81,10 @@ describe PollPlugin::PollController, type: :controller do
       I18n.stubs(:t).with('poll.prefix').returns("Poll ")
       I18n.stubs(:t).with('poll.closed_prefix').returns("Closed Poll ")
       log_in_user admin
-      xhr :put, :toggle_close, post_id: post.id, use_route: :poll
+      xhr :put, :toggle_close, post_id: post.id
       response.status.should eq(200)
       topic.reload.title.should == "Closed Poll : Chitoge vs Onodera"
-      xhr :put, :toggle_close, post_id: post.id, use_route: :poll
+      xhr :put, :toggle_close, post_id: post.id
       response.status.should eq(200)
       topic.reload.title.should == "Poll : Chitoge vs Onodera"
     end
diff --git a/public/403.ar.html b/public/403.ar.html
new file mode 100644
index 0000000000..1e2006dd1a
--- /dev/null
+++ b/public/403.ar.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+<title>لا يمكنك عمل ذلك (403)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>لا يمكنك عرض المحتوى!</p>
+
+    <p>سيتم تبديل الصفحة الحالية بصفحة ديسكورس 403 مخصصة.</p>
+  </div>
+</body>
+</html>
diff --git a/public/403.tr_TR.html b/public/403.tr_TR.html
new file mode 100644
index 0000000000..85d06c6ff9
--- /dev/null
+++ b/public/403.tr_TR.html
@@ -0,0 +1,26 @@
+<html>
+<head>
+<title>Bunu yapamazsınız (403)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 400%; color: #f00; line-height: 1em; }
+  </style>
+</head>
+<body>
+  <div class="dialog">
+    <h1>403</h1>
+    <p>Bu kaynağı görüntüleyemezsiniz!</p>
+
+    <p>Bu özel bir Discourse 403 sayfası ile değiştirilecektir.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.ar.html b/public/422.ar.html
new file mode 100644
index 0000000000..e8a38314ba
--- /dev/null
+++ b/public/422.ar.html
@@ -0,0 +1,25 @@
+<html>
+<head>
+<title>التغيير الذي طلبته غير مقبول (422)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>التغيير الذي طلبته غير مقبول.</h1>
+    <p>ربما حاولت تغيير شيء لا تملك الصلاحية لتغييره.</p>
+  </div>
+</body>
+</html>
diff --git a/public/422.tr_TR.html b/public/422.tr_TR.html
new file mode 100644
index 0000000000..489b978cb5
--- /dev/null
+++ b/public/422.tr_TR.html
@@ -0,0 +1,25 @@
+<html>
+<head>
+<title>İstediğiniz değişiklik reddedildi (422)</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+    body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
+    div.dialog {
+      width: 25em;
+      padding: 0 4em;
+      margin: 4em auto 0 auto;
+      border: 1px solid #ccc;
+      border-right-color: #999;
+      border-bottom-color: #999;
+    }
+    h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
+  </style>
+</head>
+<body>
+  <!-- This file lives in public/422.html -->
+  <div class="dialog">
+    <h1>İstediğiniz değişiklik reddedildi.</h1>
+    <p>Belki erişiminiz olmayan bir şeyi değiştirmeye çalıştınız.</p>
+  </div>
+</body>
+</html>
diff --git a/public/500.ar.html b/public/500.ar.html
new file mode 100644
index 0000000000..d89df35a9a
--- /dev/null
+++ b/public/500.ar.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+<title>عذرا - خطأ 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>عذرا</h1>
+    <p>البرنامج المشّغل لـ منصة المناقشة واجه خطأ غير متوقع. نحن نعتذر عن اي ازعاج.</p>
+    <p>تم تخزين معلومات تفصيلية عن هذا الخطا. و تم انشاء تنبية تلقائي. سوف نلقي نظرة على ذلك.</p>
+    <p>لا يوجد اي اجراء آخر ضروري. مع ذلك ، اذا الخطا استمر بالظهور، يمكنك تقديم معلومات اضافية , بما فية الخطوات لظهور الخطا ، عن طريق اضافة موضوع مناقشة في <a href="/category/meta">meta category</a>.</p>
+</body>
+</html>
diff --git a/public/500.tr_TR.html b/public/500.tr_TR.html
new file mode 100644
index 0000000000..a89213f175
--- /dev/null
+++ b/public/500.tr_TR.html
@@ -0,0 +1,12 @@
+<html>
+<head>
+<title>Oops - Hata 500</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Oops</h1>
+    <p>Bu tartışma forumunu çalıştıran yazılım beklenmeyen bir problem ile karşılaştı. Verdiğimiz rahatsızlık için özür dileriz.</p>
+    <p>Hata ile ilgili detaylı bilgiler kaydedildi ve bize otomatik olarak bildirildi. İnceleyeceğiz. </p>
+    <p>Başka bir şey yapmanız gerekmiyor. Ancak eğer hatayı tekrar oluşturabiliyorsanız <a href="/category/meta">meta kategorisi</a> altına hatanın oluşmasına neden olan adımları detaylı olarak açıklayan bir başlık açabilirsiniz.</p>
+</body>
+</html>
diff --git a/public/503.ar.html b/public/503.ar.html
new file mode 100644
index 0000000000..48b6e2d1bb
--- /dev/null
+++ b/public/503.ar.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<title>الموقع تحت الصيانة - Discourse.org</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>نعمل حالياً على صيانة دورية للموقع.</h1>
+    <p>يرجى التحقق لاحقا <span id="when-to-check-back"> في بضع دقائق </span>.</p>
+    <p id="apology">نأسف للإزعاج!</p>
+</body>
+</html>
diff --git a/public/503.tr_TR.html b/public/503.tr_TR.html
new file mode 100644
index 0000000000..ff627445d7
--- /dev/null
+++ b/public/503.tr_TR.html
@@ -0,0 +1,11 @@
+<html>
+<head>
+<title>Site Bakıma Alınıyor - Discourse.org</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+</head>
+<body>
+    <h1>Önceden planlanmış site bakımı nedeniyle şu an kapalıyız.</h1>
+    <p>Lütfen <span id="when-to-check-back">birkaç dakika içinde</span> tekrar kontrol edin.</p>
+    <p id="apology">Verdiğimiz rahatsızlık için özür dileriz!</p>
+</body>
+</html>
diff --git a/script/bench.rb b/script/bench.rb
index 46720b83f3..1b6eaaf0b9 100644
--- a/script/bench.rb
+++ b/script/bench.rb
@@ -2,6 +2,7 @@ require "socket"
 require "csv"
 require "yaml"
 require "optparse"
+require "fileutils"
 
 @include_env = false
 @result_file = nil
@@ -9,6 +10,7 @@ require "optparse"
 @best_of = 1
 @mem_stats = false
 @unicorn = false
+@dump_heap = false
 
 opts = OptionParser.new do |o|
   o.banner = "Usage: ruby bench.rb [options]"
@@ -25,6 +27,11 @@ opts = OptionParser.new do |o|
   o.on("-b", "--best_of [NUM]", "Number of times to run the bench taking best as result") do |i|
     @best_of = i.to_i
   end
+  o.on("-d", "--heap_dump") do
+    @dump_heap = true
+    # We need an env var for config/boot.rb to enable allocation tracing prior to framework init
+    ENV['DISCOURSE_DUMP_HEAP'] = "1"
+  end
   o.on("-m", "--memory_stats") do
     @mem_stats = true
   end
@@ -102,16 +109,18 @@ end
 ENV["RAILS_ENV"] = "profile"
 
 
+discourse_env_vars = %w(DISCOURSE_DUMP_HEAP RUBY_GC_HEAP_INIT_SLOTS RUBY_GC_HEAP_FREE_SLOTS RUBY_GC_HEAP_GROWTH_FACTOR RUBY_GC_HEAP_GROWTH_MAX_SLOTS RUBY_GC_MALLOC_LIMIT RUBY_GC_OLDMALLOC_LIMIT RUBY_GC_MALLOC_LIMIT_MAX RUBY_GC_OLDMALLOC_LIMIT_MAX RUBY_GC_MALLOC_LIMIT_GROWTH_FACTOR RUBY_GC_OLDMALLOC_LIMIT_GROWTH_FACTOR RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR)
+
 if @include_env
   puts "Running with tuned environment"
   ENV["RUBY_GC_MALLOC_LIMIT"] = "50_000_000"
-  ENV.delete "RUBY_HEAP_SLOTS_GROWTH_FACTOR"
-  ENV.delete "RUBY_HEAP_MIN_SLOTS"
-  ENV.delete "RUBY_FREE_MIN"
+  discourse_env_vars - %w(RUBY_GC_MALLOC_LIMIT).each do |v|
+    ENV.delete v
+  end
 else
   # clean env
   puts "Running with the following custom environment"
-  %w{RUBY_GC_MALLOC_LIMIT RUBY_HEAP_MIN_SLOTS RUBY_FREE_MIN}.each do |w|
+  discourse_env_vars.each do |w|
     puts "#{w}: #{ENV[w]}"
   end
 end
@@ -168,6 +177,7 @@ begin
 
   pid = if @unicorn
           ENV['UNICORN_PORT'] = @port.to_s
+          FileUtils.mkdir_p(File.join('tmp', 'pids'))
           spawn("bundle exec unicorn -c config/unicorn.conf.rb")
         else
           spawn("bundle exec thin start -p #{@port}")
@@ -252,6 +262,11 @@ begin
     puts open("http://127.0.0.1:#{@port}/admin/memory_stats#{append}").read
   end
 
+  if @dump_heap
+    puts
+    puts open("http://127.0.0.1:#{@port}/admin/dump_heap#{append}").read
+  end
+
   if @result_file
     File.open(@result_file,"wb") do |f|
       f.write(results)
diff --git a/script/measure.rb b/script/measure.rb
index d643625fb6..bc49614acd 100644
--- a/script/measure.rb
+++ b/script/measure.rb
@@ -1,4 +1,4 @@
-# using this script to try figure out why Rails 2 is slower that 1.9
+# using this script to try figure out why Ruby 2 is slower that 1.9
 #
 require 'flamegraph'
 
diff --git a/script/micro_bench.rb b/script/micro_bench.rb
new file mode 100644
index 0000000000..b7caadf01e
--- /dev/null
+++ b/script/micro_bench.rb
@@ -0,0 +1,27 @@
+require 'benchmark/ips'
+require File.expand_path("../../config/environment", __FILE__)
+
+conn = ActiveRecord::Base.connection.raw_connection
+
+Benchmark.ips do |b|
+  b.report("simple") do
+    User.first.name
+  end
+
+  b.report("simple with select") do
+    User.select("name").first.name
+  end
+
+  b.report("pluck with first") do
+    User.pluck(:name).first
+  end
+
+  b.report("pluck with limit") do
+    User.limit(1).pluck(:name).first
+  end
+
+  b.report("raw") do
+    conn.exec("SELECT name FROM users LIMIT 1").getvalue(0,0)
+  end
+end
+
diff --git a/spec/components/discourse_plugin_registry_spec.rb b/spec/components/discourse_plugin_registry_spec.rb
index f3942e9122..b4d0cdbf4e 100644
--- a/spec/components/discourse_plugin_registry_spec.rb
+++ b/spec/components/discourse_plugin_registry_spec.rb
@@ -82,4 +82,65 @@ describe DiscoursePluginRegistry do
     end
   end
 
+  context '#register_asset' do
+    let(:registry) { DiscoursePluginRegistry }
+
+    after do
+      registry.reset!
+    end
+
+    it "does register general css properly" do
+      registry.register_asset("test.css")
+      registry.register_asset("test2.css")
+
+      registry.mobile_stylesheets.count.should == 0
+      registry.stylesheets.count.should == 2
+    end
+
+    it "registers desktop css properly" do
+      registry.register_asset("test.css", :desktop)
+
+      registry.mobile_stylesheets.count.should == 0
+      registry.desktop_stylesheets.count.should == 1
+      registry.stylesheets.count.should == 0
+    end
+
+    it "registers mobile css properly" do
+      registry.register_asset("test.css", :mobile)
+
+      registry.mobile_stylesheets.count.should == 1
+      registry.stylesheets.count.should == 0
+    end
+
+    it "registers desktop css properly" do
+      registry.register_asset("test.css", :desktop)
+
+      registry.desktop_stylesheets.count.should == 1
+      registry.stylesheets.count.should == 0
+    end
+
+    it "registers sass variable properly" do
+      registry.register_asset("test.css", :variables)
+
+      registry.sass_variables.count.should == 1
+      registry.stylesheets.count.should == 0
+    end
+
+    it "registers admin javascript properly" do
+      registry.register_asset("my_admin.js", :admin)
+
+      registry.admin_javascripts.count.should == 1
+      registry.javascripts.count.should == 0
+      registry.server_side_javascripts.count.should == 0
+    end
+
+    it "registers server side javascript properly" do
+      registry.register_asset("my_admin.js", :server_side)
+
+      registry.server_side_javascripts.count.should == 1
+      registry.javascripts.count.should == 1
+      registry.admin_javascripts.count.should == 0
+    end
+  end
+
 end
diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb
index 55a7df2027..f649dde6da 100644
--- a/spec/components/email/receiver_spec.rb
+++ b/spec/components/email/receiver_spec.rb
@@ -93,6 +93,132 @@ Pleasure to have you here!
       )
     end
 
+    it "handles newlines" do
+      test_parse_body(fixture_file("emails/newlines.eml")).
+          should == (
+"This is my reply.
+It is my best reply.
+It will also be my *only* reply."
+      )
+    end
+
+    it "handles inline reply" do
+      test_parse_body(fixture_file("emails/inline_reply.eml")).
+          should == (
+"On Wed, Oct 8, 2014 at 11:12 AM, techAPJ <info@unconfigured.discourse.org> wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog."
+      )
+    end
+
+    it "should not include previous replies" do
+      test_parse_body(fixture_file("emails/previous_replies.eml")).should_not match /Previous Replies/
+    end
+
+    it "strips iPhone signature" do
+      test_parse_body(fixture_file("emails/iphone_signature.eml")).should_not match /Sent from my iPhone/
+    end
+
+    it "properly renders email reply from gmail web client" do
+      test_parse_body(fixture_file("emails/gmail_web.eml")).
+          should == (
+"### This is a reply from standard GMail in Google Chrome.
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog.
+
+Here's some **bold** text in Markdown.
+
+Here's a link http://example.com"
+      )
+    end
+
+    it "properly renders email reply from iOS default mail client" do
+      test_parse_body(fixture_file("emails/ios_default.eml")).
+          should == (
+"### this is a reply from iOS default mail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+
+Here's some **bold** markdown text.
+
+Here's a link http://example.com"
+      )
+    end
+
+    it "properly renders email reply from Android 5 gmail client" do
+      test_parse_body(fixture_file("emails/android_gmail.eml")).
+          should == (
+"### this is a reply from Android 5 gmail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+
+This is **bold** in Markdown.
+
+This is a link to http://example.com"
+      )
+    end
+
+    it "properly renders email reply from Windows 8.1 Metro default mail client" do
+      test_parse_body(fixture_file("emails/windows_8_metro.eml")).
+          should == (
+"### reply from default mail client in Windows 8.1 Metro
+
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+
+
+This is a **bold** word in Markdown
+
+
+This is a link http://example.com"
+      )
+    end
+
     it "properly renders email reply from MS Outlook client" do
       test_parse_body(fixture_file("emails/outlook.eml")).should == "Microsoft Outlook 2010"
     end
@@ -220,6 +346,14 @@ Pleasure to have you here!
       end
     end
 
+    describe "auto response email replies should not be accepted" do
+      let!(:reply_key) { '636ca428858779856c226bb145ef4fad' }
+      let!(:email_raw) { fixture_file("emails/auto_reply.eml") }
+      it "raises a TopicNotFoundError" do
+        expect { receiver.process }.to raise_error(Email::Receiver::TopicNotFoundError)
+      end
+    end
+
   end
 
   describe "posting reply to a closed topic" do
diff --git a/spec/components/plugin/instance_spec.rb b/spec/components/plugin/instance_spec.rb
index a971139060..95d9f85333 100644
--- a/spec/components/plugin/instance_spec.rb
+++ b/spec/components/plugin/instance_spec.rb
@@ -4,14 +4,7 @@ require_dependency 'plugin/instance'
 describe Plugin::Instance do
 
   after do
-    DiscoursePluginRegistry.javascripts.clear
-    DiscoursePluginRegistry.admin_javascripts.clear
-    DiscoursePluginRegistry.server_side_javascripts.clear
-    DiscoursePluginRegistry.stylesheets.clear
-    DiscoursePluginRegistry.mobile_stylesheets.clear
-    DiscoursePluginRegistry.desktop_stylesheets.clear
-    DiscoursePluginRegistry.sass_variables.clear
-    DiscoursePluginRegistry.serialized_current_user_fields
+    DiscoursePluginRegistry.reset!
   end
 
   context "find_all" do
@@ -31,7 +24,7 @@ describe Plugin::Instance do
   end
 
   context "register asset" do
-    it "does register general css properly" do
+    it "populates the DiscoursePluginRegistry" do
       plugin = Plugin::Instance.new nil, "/tmp/test.rb"
       plugin.register_asset("test.css")
       plugin.register_asset("test2.css")
@@ -41,71 +34,8 @@ describe Plugin::Instance do
       DiscoursePluginRegistry.mobile_stylesheets.count.should == 0
       DiscoursePluginRegistry.stylesheets.count.should == 2
     end
-
-    it "registers desktop css properly" do
-      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
-      plugin.register_asset("test.css", :desktop)
-      plugin.send :register_assets!
-
-      DiscoursePluginRegistry.mobile_stylesheets.count.should == 0
-      DiscoursePluginRegistry.desktop_stylesheets.count.should == 1
-      DiscoursePluginRegistry.stylesheets.count.should == 0
-    end
-
-    it "registers mobile css properly" do
-      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
-      plugin.register_asset("test.css", :mobile)
-      plugin.send :register_assets!
-
-      DiscoursePluginRegistry.mobile_stylesheets.count.should == 1
-      DiscoursePluginRegistry.stylesheets.count.should == 0
-    end
-
-    it "registers desktop css properly" do
-      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
-      plugin.register_asset("test.css", :desktop)
-      plugin.send :register_assets!
-
-      DiscoursePluginRegistry.desktop_stylesheets.count.should == 1
-      DiscoursePluginRegistry.stylesheets.count.should == 0
-    end
-
-
-    it "registers sass variable properly" do
-      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
-      plugin.register_asset("test.css", :variables)
-      plugin.send :register_assets!
-
-      DiscoursePluginRegistry.sass_variables.count.should == 1
-      DiscoursePluginRegistry.stylesheets.count.should == 0
-    end
-
-
-    it "registers admin javascript properly" do
-      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
-      plugin.register_asset("my_admin.js", :admin)
-
-      plugin.send :register_assets!
-
-      DiscoursePluginRegistry.admin_javascripts.count.should == 1
-      DiscoursePluginRegistry.javascripts.count.should == 0
-      DiscoursePluginRegistry.server_side_javascripts.count.should == 0
-    end
-
-    it "registers server side javascript properly" do
-      plugin = Plugin::Instance.new nil, "/tmp/test.rb"
-      plugin.register_asset("my_admin.js", :server_side)
-
-      plugin.send :register_assets!
-
-      DiscoursePluginRegistry.server_side_javascripts.count.should == 1
-      DiscoursePluginRegistry.javascripts.count.should == 1
-      DiscoursePluginRegistry.admin_javascripts.count.should == 0
-    end
-
   end
 
-
   context "activate!" do
     it "can activate plugins correctly" do
       plugin = Plugin::Instance.new
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 76e5122121..fe39d84b9a 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -84,7 +84,6 @@ describe PrettyText do
   describe "Excerpt" do
 
     it "sanitizes attempts to inject invalid attributes" do
-
       spinner = "<a href=\"http://thedailywtf.com/\" data-bbcode=\"' class='fa fa-spin\">WTF</a>"
       PrettyText.excerpt(spinner, 20).should match_html spinner
 
@@ -216,6 +215,10 @@ describe PrettyText do
       post.excerpt.should == two_hundred
     end
 
+    it "unescapes html entities when we want text entities" do
+      PrettyText.excerpt("&#39;", 500, text_entities: true).should == "'"
+    end
+
   end
 
   describe "strip links" do
diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb
index a80d648315..1c62078d56 100644
--- a/spec/components/search_spec.rb
+++ b/spec/components/search_spec.rb
@@ -96,6 +96,59 @@ describe Search do
     end
   end
 
+  context 'private messages' do
+
+    let(:topic) {
+      Fabricate(:topic,
+                  category_id: nil,
+                  archetype: 'private_message')
+    }
+
+    let(:post) { Fabricate(:post, topic: topic) }
+    let(:reply) { Fabricate(:post, topic: topic,
+                                   raw: 'hello from mars, we just landed') }
+
+
+
+    it 'searches correctly' do
+
+       expect do
+         Search.execute('mars', type_filter: 'private_messages')
+       end.to raise_error(Discourse::InvalidAccess)
+
+       TopicAllowedUser.create!(user_id: reply.user_id, topic_id: topic.id)
+       TopicAllowedUser.create!(user_id: post.user_id, topic_id: topic.id)
+
+
+       results = Search.execute('mars',
+                                type_filter: 'private_messages',
+                                guardian: Guardian.new(reply.user))
+
+       results.posts.length.should == 1
+
+       # does not leak out
+       results = Search.execute('mars',
+                                type_filter: 'private_messages',
+                                guardian: Guardian.new(Fabricate(:user)))
+
+       results.posts.length.should == 0
+
+       Fabricate(:topic, category_id: nil, archetype: 'private_message')
+       Fabricate(:post, topic: topic, raw: 'another secret pm from mars, testing')
+
+
+       # admin can search everything with correct context
+       results = Search.execute('mars',
+                                type_filter: 'private_messages',
+                                search_context: post.user,
+                                guardian: Guardian.new(Fabricate(:admin)))
+
+       results.posts.length.should == 1
+
+    end
+
+  end
+
   context 'topics' do
     let(:post) { Fabricate(:post) }
     let(:topic) { post.topic}
diff --git a/spec/components/summarize_spec.rb b/spec/components/summarize_spec.rb
deleted file mode 100644
index d0f502dde1..0000000000
--- a/spec/components/summarize_spec.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-require 'spec_helper'
-require 'summarize'
-
-describe Summarize do
-
-  it "is blank when the input is nil" do
-    Summarize.new(nil).summary.should be_blank
-  end
-
-  it "is blank when the input is an empty string" do
-    Summarize.new("").summary.should be_blank
-  end
-
-  it "removes html tags" do
-    Summarize.new("hello <b>robin</b>").summary.should == "hello robin"
-  end
-
-  it "removes doctype entries" do
-    # this is not valid html but this is just testing DOCTYPE entries
-    Summarize.new("<!DOCTYPE html>Discourse").summary.should == "Discourse"
-  end
-
-  it "strips leading and trailing space" do
-    Summarize.new("\t  \t hello   \t ").summary.should == "hello"
-  end
-
-  it "trims long strings and adds an ellipsis" do
-    Summarize.stubs(:max_length).returns(11)
-    Summarize.new("discourse is a cool forum").summary.should == "discourse is..."
-  end
-
-end
diff --git a/spec/components/topic_view_spec.rb b/spec/components/topic_view_spec.rb
index b25263bd9d..675b2a40ba 100644
--- a/spec/components/topic_view_spec.rb
+++ b/spec/components/topic_view_spec.rb
@@ -25,6 +25,16 @@ describe TopicView do
     lambda { TopicView.new(topic.id, admin) }.should_not raise_error
   end
 
+  context "chunk_size" do
+    it "returns `posts_chunksize` by default" do
+      TopicView.new(topic.id, coding_horror).chunk_size.should == SiteSetting.posts_chunksize
+    end
+
+    it "returns `posts_slow_chunksize` when slow_platform is true" do
+      tv = TopicView.new(topic.id, coding_horror, slow_platform: true)
+      tv.chunk_size.should == SiteSetting.posts_slow_chunksize
+    end
+  end
 
   context "with a few sample posts" do
     let!(:p1) { Fabricate(:post, topic: topic, user: first_poster, percent_rank: 1 )}
diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb
index 1740be819f..954bd80318 100644
--- a/spec/controllers/admin/users_controller_spec.rb
+++ b/spec/controllers/admin/users_controller_spec.rb
@@ -360,6 +360,37 @@ describe Admin::UsersController do
       end
     end
 
+    context 'activate' do
+      before do
+        @reg_user = Fabricate(:inactive_user)
+      end
+
+      it "returns success" do
+        xhr :put, :activate, user_id: @reg_user.id
+        response.should be_success
+        json = ::JSON.parse(response.body)
+        json['success'].should == "OK"
+      end
+    end
+
+    context 'log_out' do
+      before do
+        @reg_user = Fabricate(:user)
+      end
+
+      it "returns success" do
+        xhr :put, :log_out, user_id: @reg_user.id
+        response.should be_success
+        json = ::JSON.parse(response.body)
+        json['success'].should == "OK"
+      end
+
+      it "returns 404 when user_id does not exist" do
+        xhr :put, :log_out, user_id: 123123
+        response.should_not be_success
+      end
+    end
+
     context 'block' do
       before do
         @reg_user = Fabricate(:user)
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index bbaa136d20..63ac27d4b3 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -67,5 +67,20 @@ describe GroupsController do
       xhr :get, :posts, group_id: group.name
       response.should be_success
     end
+
+    it "ensures that membership can be paginated" do
+      5.times { group.add(Fabricate(:user)) }
+      usernames = group.users.map{ |m| m['username'] }.sort
+
+      xhr :get, :members, group_id: group.name, limit: 3
+      response.should be_success
+      members = JSON.parse(response.body)
+      members.map{ |m| m['username'] }.should eq(usernames[0..2])
+
+      xhr :get, :members, group_id: group.name, limit: 3, offset: 3
+      response.should be_success
+      members = JSON.parse(response.body)
+      members.map{ |m| m['username'] }.should eq(usernames[3..4])
+    end
   end
 end
diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb
index d8500e82d0..c8a05095de 100644
--- a/spec/controllers/topics_controller_spec.rb
+++ b/spec/controllers/topics_controller_spec.rb
@@ -783,6 +783,12 @@ describe TopicsController do
           expect(response).not_to be_success
         end
 
+        it "doesn't call the PostRevisor when there is no changes" do
+          PostRevisor.any_instance.expects(:revise!).never
+          xhr :put, :update, topic_id: @topic.id, slug: @topic.title, title: @topic.title, category_id: @topic.category_id
+          expect(response).to be_success
+        end
+
         context "allow_uncategorized_topics is false" do
           before do
             SiteSetting.stubs(:allow_uncategorized_topics).returns(false)
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 192e000cca..f682ab631f 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/spec/controllers/users_controller_spec.rb
@@ -1218,7 +1218,7 @@ describe UsersController do
             upload = Fabricate(:upload)
             Upload.expects(:create_for).returns(upload)
             # enqueues the user_image generator job
-            xhr :post, :upload_avatar, username: user.username, file: user_image_url, image_type: "avatar"
+            xhr :post, :upload_user_image, username: user.username, file: user_image_url, image_type: "avatar"
             json = JSON.parse(response.body)
             json['url'].should == "/uploads/default/1/1234567890123456.png"
             json['width'].should == 100
@@ -1292,6 +1292,13 @@ describe UsersController do
         response.should be_success
       end
 
+      it 'returns success' do
+        xhr :put, :pick_avatar, username: user.username, upload_id: 111
+        user.reload.uploaded_avatar_id.should == 111
+        response.should be_success
+        json = ::JSON.parse(response.body)
+        json['success'].should == "OK"
+      end
     end
 
   end
diff --git a/spec/fixtures/emails/android_gmail.eml b/spec/fixtures/emails/android_gmail.eml
new file mode 100644
index 0000000000..21c5dde234
--- /dev/null
+++ b/spec/fixtures/emails/android_gmail.eml
@@ -0,0 +1,177 @@
+Delivered-To: reply@discourse.org
+Return-Path: <walter.white@googlemail.com>
+MIME-Version: 1.0
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+References: <topic/22638@meta.discourse.org>
+  <topic/22638/86406@meta.discourse.org>
+Date: Fri, 28 Nov 2014 12:53:21 -0800
+Subject: Re: [Discourse Meta] [Lounge] Testing default email replies
+From: Walter White <walter.white@googlemail.com>
+To: Discourse Meta <reply@discourse.org>
+Content-Type: multipart/alternative; boundary=089e0149cfa485c6630508f173df
+
+--089e0149cfa485c6630508f173df
+Content-Type: text/plain; charset=UTF-8
+
+### this is a reply from Android 5 gmail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog.
+
+This is **bold** in Markdown.
+
+This is a link to http://example.com
+On Nov 28, 2014 12:36 PM, "Arpit Jalan" <info@discourse.org> wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+--089e0149cfa485c6630508f173df
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<p dir=3D"ltr">### this is a reply from Android 5 gmail</p>
+<p dir=3D"ltr">The quick brown fox jumps over the lazy dog. The quick brown=
+ fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. =
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over=
+ the lazy dog. The quick brown fox jumps over the lazy dog. </p>
+<p dir=3D"ltr">This is **bold** in Markdown.</p>
+<p dir=3D"ltr">This is a link to <a href=3D"http://example.com">http://exam=
+ple.com</a></p>
+<div class=3D"gmail_quote">On Nov 28, 2014 12:36 PM, &quot;Arpit Jalan&quot=
+; &lt;<a href=3D"mailto:info@discourse.org">info@discourse.org</a>&gt; wrot=
+e:<br type=3D"attribution"><blockquote class=3D"gmail_quote" style=3D"margi=
+n:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div>
+
+<table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" bor=
+der=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/techapj/45/3281.png" title=3D"techAPJ" style=3D"max-wi=
+dth:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/techapj" style=3D"text-=
+decoration:none;font-weight:bold;color:#006699;font-size:13px;font-family:&=
+#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;text-d=
+ecoration:none;font-weight:bold" target=3D"_blank">techAPJ</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">Test reply.</p>
+
+<p style=3D"margin-top:0;border:0">First paragraph.</p>
+
+<p style=3D"margin-top:0;border:0">Second paragraph.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style=3D"color:#666">
+    <p>To respond, reply to this email or visit <a href=3D"https://meta.dis=
+course.org/t/testing-default-email-replies/22638/3" style=3D"text-decoratio=
+n:none;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https:/=
+/meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your bro=
+wser.</p>
+  </div>
+  <hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-c=
+olor:#ddd;min-height:1px;border:1px">
+  <h4>Previous Replies</h4>
+
+  <table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" b=
+order=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/codinghorror/45/5297.png" title=3D"codinghorror" style=
+=3D"max-width:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/codinghorror" style=3D"=
+text-decoration:none;font-weight:bold;color:#006699;font-size:13px;font-fam=
+ily:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;t=
+ext-decoration:none;font-weight:bold" target=3D"_blank">codinghorror</a><br=
+>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">We&#39;re testing the latest GitHub emai=
+l processing library which we are integrating now.</p>
+
+<p style=3D"margin-top:0;border:0"><a href=3D"https://github.com/github/ema=
+il_reply_parser" style=3D"text-decoration:none;font-weight:bold;color:#0066=
+99" target=3D"_blank">https://github.com/github/email_reply_parser</a></p>
+
+<p style=3D"margin-top:0;border:0">Go ahead and reply to this topic and I&#=
+39;ll reply from various email clients for testing.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-col=
+or:#ddd;min-height:1px;border:1px">
+
+<div style=3D"color:#666">
+<p>To respond, reply to this email or visit <a href=3D"https://meta.discour=
+se.org/t/testing-default-email-replies/22638/3" style=3D"text-decoration:no=
+ne;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https://met=
+a.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser=
+.</p>
+</div>
+<div style=3D"color:#666">
+<p>To unsubscribe from these emails, visit your <a href=3D"https://meta.dis=
+course.org/my/preferences" style=3D"text-decoration:none;font-weight:bold;c=
+olor:#006699;color:#666" target=3D"_blank">user preferences</a>.</p>
+</div>
+</div>
+</blockquote></div>
+
+--089e0149cfa485c6630508f173df--
diff --git a/spec/fixtures/emails/auto_reply.eml b/spec/fixtures/emails/auto_reply.eml
new file mode 100644
index 0000000000..7999c8d78b
--- /dev/null
+++ b/spec/fixtures/emails/auto_reply.eml
@@ -0,0 +1,21 @@
+Return-Path: <jake@adventuretime.ooo>
+Received: from iceking.adventuretime.ooo ([unix socket]) by iceking (Cyrus v2.2.13-Debian-2.2.13-19+squeeze3) with LMTPA; Thu, 13 Jun 2013 17:03:50 -0400
+Received: from mail-ie0-x234.google.com (mail-ie0-x234.google.com [IPv6:2607:f8b0:4001:c03::234]) by iceking.adventuretime.ooo (8.14.3/8.14.3/Debian-9.4) with ESMTP id r5DL3nFJ016967 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 17:03:50 -0400
+Received: by mail-ie0-f180.google.com with SMTP id f4so21977375iea.25 for <reply+59d8df8370b7e95c5a49fbf86aeb2c93@discourse.example.com>; Thu, 13 Jun 2013 14:03:48 -0700
+Received: by 10.0.0.1 with HTTP; Thu, 13 Jun 2013 14:03:48 -0700
+Date: Thu, 13 Jun 2013 17:03:48 -0400
+From: Jake the Dog <jake@adventuretime.ooo>
+To: reply+636ca428858779856c226bb145ef4fad@appmail.adventuretime.ooo
+Message-ID: <CADkmRc+rNGAGGbV2iE5p918UVy4UyJqVcXRO2=otppgzduJSg@mail.gmail.com>
+Subject: re: [Discourse Meta] eviltrout posted in 'Adventure Time Sux'
+Mime-Version: 1.0
+Content-Type: text/plain;
+ charset=ISO-8859-1
+Content-Transfer-Encoding: 7bit
+Auto-Submitted: auto-generated
+X-Sieve: CMU Sieve 2.2
+X-Received: by 10.0.0.1 with SMTP id n7mr11234144ipb.85.1371157428600; Thu,
+ 13 Jun 2013 14:03:48 -0700 (PDT)
+X-Scanned-By: MIMEDefang 2.69 on IPv6:2001:470:1d:165::1
+
+Test reply to Discourse email digest
diff --git a/spec/fixtures/emails/gmail_web.eml b/spec/fixtures/emails/gmail_web.eml
new file mode 100644
index 0000000000..8bb8383571
--- /dev/null
+++ b/spec/fixtures/emails/gmail_web.eml
@@ -0,0 +1,181 @@
+Delivered-To: reply@discourse.org
+Return-Path: <walter.white@googlemail.com>
+MIME-Version: 1.0
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+References: <topic/22638@meta.discourse.org>
+  <topic/22638/86406@meta.discourse.org>
+Date: Fri, 28 Nov 2014 12:36:49 -0800
+Subject: Re: [Discourse Meta] [Lounge] Testing default email replies
+From: Walter White <walter.white@googlemail.com>
+To: Discourse Meta <reply@discourse.org>
+Content-Type: multipart/alternative; boundary=001a11c2e04e6544f30508f138ba
+
+--001a11c2e04e6544f30508f138ba
+Content-Type: text/plain; charset=UTF-8
+
+### This is a reply from standard GMail in Google Chrome.
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog.
+
+Here's some **bold** text in Markdown.
+
+Here's a link http://example.com
+
+On Fri, Nov 28, 2014 at 12:35 PM, Arpit Jalan <info@discourse.org> wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+--001a11c2e04e6544f30508f138ba
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+<div dir=3D"ltr"><div>### This is a reply from standard GMail in Google Chr=
+ome.</div><div><br></div><div>The quick brown fox jumps over the lazy dog. =
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over=
+ the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown=
+ fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog. =
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over=
+ the lazy dog.=C2=A0</div><div><br></div><div>Here&#39;s some **bold** text=
+ in Markdown.</div><div><br></div><div>Here&#39;s a link <a href=3D"http://=
+example.com">http://example.com</a></div></div><div class=3D"gmail_extra"><=
+br><div class=3D"gmail_quote">On Fri, Nov 28, 2014 at 12:35 PM, Arpit Jalan=
+ <span dir=3D"ltr">&lt;<a href=3D"mailto:info@discourse.org" target=3D"_bla=
+nk">info@discourse.org</a>&gt;</span> wrote:<br><blockquote class=3D"gmail_=
+quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1=
+ex"><div>
+
+<table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" bor=
+der=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/techapj/45/3281.png" title=3D"techAPJ" style=3D"max-wi=
+dth:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/techapj" style=3D"text-=
+decoration:none;font-weight:bold;color:#006699;font-size:13px;font-family:&=
+#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;text-d=
+ecoration:none;font-weight:bold" target=3D"_blank">techAPJ</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">Test reply.</p>
+
+<p style=3D"margin-top:0;border:0">First paragraph.</p>
+
+<p style=3D"margin-top:0;border:0">Second paragraph.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style=3D"color:#666">
+    <p>To respond, reply to this email or visit <a href=3D"https://meta.dis=
+course.org/t/testing-default-email-replies/22638/3" style=3D"text-decoratio=
+n:none;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https:/=
+/meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your bro=
+wser.</p>
+  </div>
+  <hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-c=
+olor:#ddd;min-height:1px;border:1px">
+  <h4>Previous Replies</h4>
+
+  <table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" b=
+order=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/codinghorror/45/5297.png" title=3D"codinghorror" style=
+=3D"max-width:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/codinghorror" style=3D"=
+text-decoration:none;font-weight:bold;color:#006699;font-size:13px;font-fam=
+ily:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;t=
+ext-decoration:none;font-weight:bold" target=3D"_blank">codinghorror</a><br=
+>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">We&#39;re testing the latest GitHub emai=
+l processing library which we are integrating now.</p>
+
+<p style=3D"margin-top:0;border:0"><a href=3D"https://github.com/github/ema=
+il_reply_parser" style=3D"text-decoration:none;font-weight:bold;color:#0066=
+99" target=3D"_blank">https://github.com/github/email_reply_parser</a></p>
+
+<p style=3D"margin-top:0;border:0">Go ahead and reply to this topic and I&#=
+39;ll reply from various email clients for testing.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-col=
+or:#ddd;min-height:1px;border:1px">
+
+<div style=3D"color:#666">
+<p>To respond, reply to this email or visit <a href=3D"https://meta.discour=
+se.org/t/testing-default-email-replies/22638/3" style=3D"text-decoration:no=
+ne;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https://met=
+a.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser=
+.</p>
+</div>
+<div style=3D"color:#666">
+<p>To unsubscribe from these emails, visit your <a href=3D"https://meta.dis=
+course.org/my/preferences" style=3D"text-decoration:none;font-weight:bold;c=
+olor:#006699;color:#666" target=3D"_blank">user preferences</a>.</p>
+</div>
+</div>
+</blockquote></div><br></div>
+
+--001a11c2e04e6544f30508f138ba--
diff --git a/spec/fixtures/emails/inline_reply.eml b/spec/fixtures/emails/inline_reply.eml
new file mode 100644
index 0000000000..39625a225d
--- /dev/null
+++ b/spec/fixtures/emails/inline_reply.eml
@@ -0,0 +1,60 @@
+
+MIME-Version: 1.0
+In-Reply-To: <reply@discourse-app.mail>
+References: <topic/36@discourse.techapj.com>
+  <5434ced4ee0f9_663fb0b5f76070593b@discourse-app.mail>
+Date: Mon, 1 Dec 2014 20:48:40 +0530
+Delivered-To: someone@googlemail.com
+Subject: Re: [Discourse] [Meta] Testing reply via email
+From: Walter White <walter.white@googlemail.com>
+To: Discourse <reply@mail.com>
+Content-Type: multipart/alternative; boundary=20cf30363f8522466905092920a6
+
+--20cf30363f8522466905092920a6
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+On Wed, Oct 8, 2014 at 11:12 AM, techAPJ <info@unconfigured.discourse.org>
+wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog.
+
+--20cf30363f8522466905092920a6--
diff --git a/spec/fixtures/emails/ios_default.eml b/spec/fixtures/emails/ios_default.eml
new file mode 100644
index 0000000000..8d4d58feb1
--- /dev/null
+++ b/spec/fixtures/emails/ios_default.eml
@@ -0,0 +1,136 @@
+Delivered-To: reply@discourse.org
+Return-Path: <walter.white@googlemail.com>
+From: Walter White <walter.white@googlemail.com>
+Content-Type: multipart/alternative;
+  boundary=Apple-Mail-B41C7F8E-3639-49B0-A5D5-440E125A7105
+Content-Transfer-Encoding: 7bit
+Mime-Version: 1.0 (1.0)
+Subject: Re: [Discourse Meta] [Lounge] Testing default email replies
+Date: Fri, 28 Nov 2014 12:41:41 -0800
+References: <topic/22638@meta.discourse.org> <topic/22638/86406@meta.discourse.org>
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+To: Discourse Meta <reply@discourse.org>
+X-Mailer: iPhone Mail (12B436)
+
+
+--Apple-Mail-B41C7F8E-3639-49B0-A5D5-440E125A7105
+Content-Type: text/plain;
+  charset=us-ascii
+Content-Transfer-Encoding: quoted-printable
+
+### this is a reply from iOS default mail
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over t=
+he lazy dog. The quick brown fox jumps over the lazy dog. The quick brown fo=
+x jumps over the lazy dog. The quick brown fox jumps over the lazy dog. The q=
+uick brown fox jumps over the lazy dog. The quick brown fox jumps over the l=
+azy dog.=20
+
+Here's some **bold** markdown text.
+
+Here's a link http://example.com
+
+
+> On Nov 28, 2014, at 12:35 PM, Arpit Jalan <info@discourse.org> wrote:
+>=20
+>=20
+> 	techAPJ
+> November 28
+> Test reply.
+>=20
+> First paragraph.
+>=20
+> Second paragraph.
+>=20
+> To respond, reply to this email or visit https://meta.discourse.org/t/test=
+ing-default-email-replies/22638/3 in your browser.
+>=20
+> Previous Replies
+>=20
+> 	codinghorror
+> November 28
+> We're testing the latest GitHub email processing library which we are inte=
+grating now.
+>=20
+> https://github.com/github/email_reply_parser
+>=20
+> Go ahead and reply to this topic and I'll reply from various email clients=
+ for testing.
+>=20
+> To respond, reply to this email or visit https://meta.discourse.org/t/test=
+ing-default-email-replies/22638/3 in your browser.
+>=20
+> To unsubscribe from these emails, visit your user preferences.
+
+--Apple-Mail-B41C7F8E-3639-49B0-A5D5-440E125A7105
+Content-Type: text/html;
+  charset=utf-8
+Content-Transfer-Encoding: 7bit
+
+<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto"><div>### this is a reply from iOS default mail</div><div><br></div><div>The quick brown fox jumps over the lazy dog.&nbsp;<span style="background-color: rgba(255, 255, 255, 0);">The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;The quick brown fox jumps over the lazy dog.&nbsp;</span></div><div><br></div><div>Here's some **bold** markdown text.</div><div><br></div><div>Here's a link <a href="http://example.com">http://example.com</a><br><br></div><div><br>On Nov 28, 2014, at 12:35 PM, Arpit Jalan &lt;<a href="mailto:info@discourse.org">info@discourse.org</a>&gt; wrote:<br><br></div><blockquote type="cite"><div><div>
+
+<table style="margin-bottom:25px;" cellspacing="0" cellpadding="0" border="0">
+  <tbody>
+    <tr>
+      <td style="vertical-align:top;width:55px;">
+        <img src="https://meta-discourse.global.ssl.fastly.net/user_avatar/meta.discourse.org/techapj/45/3281.png" title="techAPJ" style="max-width:100%;" width="45" height="45">
+      </td>
+      <td>
+        <a href="https://meta.discourse.org/users/techapj" target="_blank" style="text-decoration: none; font-weight: bold; color: #006699;; font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold">techAPJ</a><br>
+        <span style="text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style="padding-top:5px;" colspan="2">
+<p style="margin-top:0; border: 0;">Test reply.</p>
+
+<p style="margin-top:0; border: 0;">First paragraph.</p>
+
+<p style="margin-top:0; border: 0;">Second paragraph.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style="color:#666;">
+    <p>To respond, reply to this email or visit <a href="https://meta.discourse.org/t/testing-default-email-replies/22638/3" style="text-decoration: none; font-weight: bold; color: #006699;; color:#666;">https://meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser.</p>
+  </div>
+  <hr style="background-color: #ddd; height: 1px; border: 1px;; background-color: #ddd; height: 1px; border: 1px;">
+  <h4>Previous Replies</h4>
+
+  <table style="margin-bottom:25px;" cellspacing="0" cellpadding="0" border="0">
+  <tbody>
+    <tr>
+      <td style="vertical-align:top;width:55px;">
+        <img src="https://meta-discourse.global.ssl.fastly.net/user_avatar/meta.discourse.org/codinghorror/45/5297.png" title="codinghorror" style="max-width:100%;" width="45" height="45">
+      </td>
+      <td>
+        <a href="https://meta.discourse.org/users/codinghorror" target="_blank" style="text-decoration: none; font-weight: bold; color: #006699;; font-size:13px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;color:#3b5998;text-decoration:none;font-weight:bold">codinghorror</a><br>
+        <span style="text-align:right;color:#999999;padding-right:5px;font-family:'lucida grande',tahoma,verdana,arial,sans-serif;font-size:11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style="padding-top:5px;" colspan="2">
+<p style="margin-top:0; border: 0;">We're testing the latest GitHub email processing library which we are integrating now.</p>
+
+<p style="margin-top:0; border: 0;"><a href="https://github.com/github/email_reply_parser" target="_blank" style="text-decoration: none; font-weight: bold; color: #006699;">https://github.com/github/email_reply_parser</a></p>
+
+<p style="margin-top:0; border: 0;">Go ahead and reply to this topic and I'll reply from various email clients for testing.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style="background-color: #ddd; height: 1px; border: 1px;; background-color: #ddd; height: 1px; border: 1px;">
+
+<div style="color:#666;">
+<p>To respond, reply to this email or visit <a href="https://meta.discourse.org/t/testing-default-email-replies/22638/3" style="text-decoration: none; font-weight: bold; color: #006699;; color:#666;">https://meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser.</p>
+</div>
+<div style="color:#666;">
+<p>To unsubscribe from these emails, visit your <a href="https://meta.discourse.org/my/preferences" style="text-decoration: none; font-weight: bold; color: #006699;; color:#666;">user preferences</a>.</p>
+</div>
+</div>
+</div></blockquote></body></html>
+--Apple-Mail-B41C7F8E-3639-49B0-A5D5-440E125A7105--
diff --git a/spec/fixtures/emails/iphone_signature.eml b/spec/fixtures/emails/iphone_signature.eml
new file mode 100644
index 0000000000..d314ad1f1e
--- /dev/null
+++ b/spec/fixtures/emails/iphone_signature.eml
@@ -0,0 +1,29 @@
+Delivered-To: test@mail.com
+Return-Path: <walter.white@googlemail.com>
+From: Walter White <walter.white@googlemail.com>
+Content-Type: multipart/alternative;
+  boundary=Apple-Mail-8E182EEF-9DBC-41DE-A593-DF2E5EBD3975
+Content-Transfer-Encoding: 7bit
+Mime-Version: 1.0 (1.0)
+Subject: Re: Signature in email replies!
+Date: Thu, 23 Oct 2014 14:43:49 +0530
+References: <1234@mail.gmail.com>
+In-Reply-To: <1234@mail.gmail.com>
+To: Arpit Jalan <test@mail.com>
+X-Mailer: iPhone Mail (12A405)
+
+
+--Apple-Mail-8E182EEF-9DBC-41DE-A593-DF2E5EBD3975
+Content-Type: text/plain;
+  charset=us-ascii
+Content-Transfer-Encoding: 7bit
+
+This post should not include signature.
+
+Sent from my iPhone
+
+> On 23-Oct-2014, at 9:45 am, Arpit Jalan <test@mail.com> wrote:
+>
+> Signature in email replies!
+
+--Apple-Mail-8E182EEF-9DBC-41DE-A593-DF2E5EBD3975
diff --git a/spec/fixtures/emails/newlines.eml b/spec/fixtures/emails/newlines.eml
new file mode 100644
index 0000000000..cf03b9d18b
--- /dev/null
+++ b/spec/fixtures/emails/newlines.eml
@@ -0,0 +1,84 @@
+In-Reply-To: <test@discourse-app.mail>
+Date: Wed, 8 Oct 2014 10:36:19 +0530
+Delivered-To: walter.white@googlemail.com
+Subject: Re: [Discourse] Welcome to Discourse
+From: Walter White <walter.white@googlemail.com>
+To: Discourse <mail@arpitjalan.com>
+Content-Type: multipart/alternative; boundary=bcaec554078cc3d0c10504e24661
+
+--bcaec554078cc3d0c10504e24661
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+This is my reply.
+It is my best reply.
+It will also be my *only* reply.
+
+On Wed, Oct 8, 2014 at 10:33 AM, ajalan <info@unconfigured.discourse.org>
+wrote:
+
+>     ajalan
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoiMGM3a1pGT250VG5sb242RVNTdFdjS1FUSHdzIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3VzZXJzXFxcL2FqYWxhblwiLFwiaWRcIjpcImQxOWYxYjQ5NTdkODRkMGNhZWY1NDEzZGN=
+hODA4YTRhXCIsXCJ1cmxfaWRzXCI6W1wiNzA3MTNjNTg4MDI3YWQyM2RiM2QwOTVhOGQwYmY4ZT=
+YyMzNjYThiMFwiXX0ifQ>
+> October 8
+>
+> Awesome! Thank You! [image: +1]
+>
+> To respond, reply to this email or visit
+> http://discourse.techapj.com/t/welcome-to-discourse/8/2
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoibzNWaXFDRDdxSFNCbVRkUmdONlRJVW1ENU8wIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3RcXFwvd2VsY29tZS10by1kaXNjb3Vyc2VcXFwvOFxcXC8yXCIsXCJpZFwiOlwiZDE5ZjF=
+iNDk1N2Q4NGQwY2FlZjU0MTNkY2E4MDhhNGFcIixcInVybF9pZHNcIjpbXCIwYmFkNjE2NDJkNm=
+M2NzJhNGU0ZjYzMGU2ZDA5M2I3MzU3NzQ4MzYxXCJdfSJ9>
+> in your browser.
+>  ------------------------------
+> Previous Replies    system
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoicjFZQm8ySTJjUEtNclpvekZ5ZmFqYmdpTVFNIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3VzZXJzXFxcL3N5c3RlbVwiLFwiaWRcIjpcImQxOWYxYjQ5NTdkODRkMGNhZWY1NDEzZGN=
+hODA4YTRhXCIsXCJ1cmxfaWRzXCI6W1wiMTcxNWU2OTE1M2UzMjk4YmM2Y2NhMWEyM2E5N2ViMW=
+U5N2IwMWYyNFwiXX0ifQ>
+> October 8
+>
+> The first paragraph of this pinned topic will be visible as a welcome
+> message to all new visitors on your homepage. It's important!
+>
+> *Edit this* into a brief description of your community:
+>
+>    - Who is it for?
+>    - What can they find here?
+>    - Why should they come here?
+>    - Where can they read more (links, resources, etc)?
+>
+> You may want to close this topic via the wrench icon at the upper right,
+> so that replies don't pile up on an announcement.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> http://discourse.techapj.com/t/welcome-to-discourse/8/2
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoibzNWaXFDRDdxSFNCbVRkUmdONlRJVW1ENU8wIiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL3RcXFwvd2VsY29tZS10by1kaXNjb3Vyc2VcXFwvOFxcXC8yXCIsXCJpZFwiOlwiZDE5ZjF=
+iNDk1N2Q4NGQwY2FlZjU0MTNkY2E4MDhhNGFcIixcInVybF9pZHNcIjpbXCIwYmFkNjE2NDJkNm=
+M2NzJhNGU0ZjYzMGU2ZDA5M2I3MzU3NzQ4MzYxXCJdfSJ9>
+> in your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <http://mandrillapp.com/track/click/30081177/discourse.techapj.com?p=3Dey=
+JzIjoiaFdWSWtiRGIybjJOeWc0VHRrenAzbnhraU93IiwidiI6MSwicCI6IntcInVcIjozMDA4M=
+TE3NyxcInZcIjoxLFwidXJsXCI6XCJodHRwOlxcXC9cXFwvZGlzY291cnNlLnRlY2hhcGouY29t=
+XFxcL215XFxcL3ByZWZlcmVuY2VzXCIsXCJpZFwiOlwiZDE5ZjFiNDk1N2Q4NGQwY2FlZjU0MTN=
+kY2E4MDhhNGFcIixcInVybF9pZHNcIjpbXCI0OTIyMmMyZDgyNzUwMmQyMGZjYzU4MTZkNjhmYT=
+k3NzFkY2YzZDllXCJdfSJ9>
+> .
+>
+
+--bcaec554078cc3d0c10504e24661
diff --git a/spec/fixtures/emails/previous_replies.eml b/spec/fixtures/emails/previous_replies.eml
new file mode 100644
index 0000000000..3fd74482c0
--- /dev/null
+++ b/spec/fixtures/emails/previous_replies.eml
@@ -0,0 +1,180 @@
+Delivered-To: reply@discourse.org
+MIME-Version: 1.0
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+References: <topic/22638@meta.discourse.org>
+  <topic/22638/86406@meta.discourse.org>
+Date: Fri, 28 Nov 2014 12:55:32 -0800
+Subject: Re: [Discourse Meta] [Lounge] Testing default email replies
+From: Walter White <walter.white@googlemail.com>
+To: Discourse Meta <reply@discourse.org>
+Content-Type: multipart/alternative; boundary=001a1137c9285318bb0508f17bc5
+
+--001a1137c9285318bb0508f17bc5
+Content-Type: text/plain; charset=UTF-8
+
+### this is a reply from iOS Gmail app
+
+The quick brown fox jumps over the lazy dog. The quick brown fox jumps over
+the lazy dog. The quick brown fox jumps over the lazy dog. The quick brown
+fox jumps over the lazy dog. The quick brown fox jumps over the lazy
+dog. The quick brown fox jumps over the lazy dog. The quick brown fox jumps
+over the lazy dog.
+
+This is **bold** text in Markdown.
+
+This is a link to http://example.com
+
+On Friday, November 28, 2014, Arpit Jalan <info@discourse.org> wrote:
+
+>     techAPJ <https://meta.discourse.org/users/techapj>
+> November 28
+>
+> Test reply.
+>
+> First paragraph.
+>
+> Second paragraph.
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>  ------------------------------
+> Previous Replies    codinghorror
+> <https://meta.discourse.org/users/codinghorror>
+> November 28
+>
+> We're testing the latest GitHub email processing library which we are
+> integrating now.
+>
+> https://github.com/github/email_reply_parser
+>
+> Go ahead and reply to this topic and I'll reply from various email clients
+> for testing.
+>   ------------------------------
+>
+> To respond, reply to this email or visit
+> https://meta.discourse.org/t/testing-default-email-replies/22638/3 in
+> your browser.
+>
+> To unsubscribe from these emails, visit your user preferences
+> <https://meta.discourse.org/my/preferences>.
+>
+
+--001a1137c9285318bb0508f17bc5
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: quoted-printable
+
+### this is a reply from iOS Gmail app<div><br></div><div>The quick brown f=
+ox jumps over the lazy dog.=C2=A0<font><span style=3D"background-color:rgba=
+(255,255,255,0)">The quick brown fox jumps over the lazy dog.=C2=A0The quic=
+k brown fox jumps over the lazy dog.=C2=A0The quick brown fox jumps over th=
+e lazy dog.=C2=A0The quick brown fox jumps over the lazy dog.=C2=A0The quic=
+k brown fox jumps over the lazy dog.=C2=A0The quick brown fox jumps over th=
+e lazy dog.=C2=A0</span></font></div><div><font><span style><br></span></fo=
+nt></div><div><font><span style>This is **bold** text in Markdown.</span></=
+font></div><div><font><span style><br></span></font></div><div><font><span =
+style>This is a link to <a href=3D"http://example.com">http://example.com</=
+a><br></span></font><br>On Friday, November 28, 2014, Arpit Jalan &lt;<a hr=
+ef=3D"mailto:info@discourse.org">info@discourse.org</a>&gt; wrote:<br><bloc=
+kquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #cc=
+c solid;padding-left:1ex"><div>
+
+<table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" bor=
+der=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/techapj/45/3281.png" title=3D"techAPJ" style=3D"max-wi=
+dth:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/techapj" style=3D"text-=
+decoration:none;font-weight:bold;color:#006699;font-size:13px;font-family:&=
+#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;text-d=
+ecoration:none;font-weight:bold" target=3D"_blank">techAPJ</a><br>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">Test reply.</p>
+
+<p style=3D"margin-top:0;border:0">First paragraph.</p>
+
+<p style=3D"margin-top:0;border:0">Second paragraph.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+  <div style=3D"color:#666">
+    <p>To respond, reply to this email or visit <a href=3D"https://meta.dis=
+course.org/t/testing-default-email-replies/22638/3" style=3D"text-decoratio=
+n:none;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https:/=
+/meta.discourse.org/t/testing-default-email-replies/22638/3</a> in your bro=
+wser.</p>
+  </div>
+  <hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-c=
+olor:#ddd;min-height:1px;border:1px">
+  <h4>Previous Replies</h4>
+
+  <table style=3D"margin-bottom:25px" cellspacing=3D"0" cellpadding=3D"0" b=
+order=3D"0">
+  <tbody>
+    <tr>
+      <td style=3D"vertical-align:top;width:55px">
+        <img src=3D"https://meta-discourse.global.ssl.fastly.net/user_avata=
+r/meta.discourse.org/codinghorror/45/5297.png" title=3D"codinghorror" style=
+=3D"max-width:100%" width=3D"45" height=3D"45">
+      </td>
+      <td>
+        <a href=3D"https://meta.discourse.org/users/codinghorror" style=3D"=
+text-decoration:none;font-weight:bold;color:#006699;font-size:13px;font-fam=
+ily:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;color:#3b5998;t=
+ext-decoration:none;font-weight:bold" target=3D"_blank">codinghorror</a><br=
+>
+        <span style=3D"text-align:right;color:#999999;padding-right:5px;fon=
+t-family:&#39;lucida grande&#39;,tahoma,verdana,arial,sans-serif;font-size:=
+11px">November 28</span>
+      </td>
+    </tr>
+    <tr>
+      <td style=3D"padding-top:5px" colspan=3D"2">
+<p style=3D"margin-top:0;border:0">We&#39;re testing the latest GitHub emai=
+l processing library which we are integrating now.</p>
+
+<p style=3D"margin-top:0;border:0"><a href=3D"https://github.com/github/ema=
+il_reply_parser" style=3D"text-decoration:none;font-weight:bold;color:#0066=
+99" target=3D"_blank">https://github.com/github/email_reply_parser</a></p>
+
+<p style=3D"margin-top:0;border:0">Go ahead and reply to this topic and I&#=
+39;ll reply from various email clients for testing.</p>
+</td>
+    </tr>
+  </tbody>
+</table>
+
+
+<hr style=3D"background-color:#ddd;min-height:1px;border:1px;background-col=
+or:#ddd;min-height:1px;border:1px">
+
+<div style=3D"color:#666">
+<p>To respond, reply to this email or visit <a href=3D"https://meta.discour=
+se.org/t/testing-default-email-replies/22638/3" style=3D"text-decoration:no=
+ne;font-weight:bold;color:#006699;color:#666" target=3D"_blank">https://met=
+a.discourse.org/t/testing-default-email-replies/22638/3</a> in your browser=
+.</p>
+</div>
+<div style=3D"color:#666">
+<p>To unsubscribe from these emails, visit your <a href=3D"https://meta.dis=
+course.org/my/preferences" style=3D"text-decoration:none;font-weight:bold;c=
+olor:#006699;color:#666" target=3D"_blank">user preferences</a>.</p>
+</div>
+</div>
+</blockquote></div>
+
+--001a1137c9285318bb0508f17bc5--
diff --git a/spec/fixtures/emails/windows_8_metro.eml b/spec/fixtures/emails/windows_8_metro.eml
new file mode 100644
index 0000000000..67d204af56
--- /dev/null
+++ b/spec/fixtures/emails/windows_8_metro.eml
@@ -0,0 +1,173 @@
+Delivered-To: reply@discourse.org
+Return-Path: <walter.white@googlemail.com>
+MIME-Version: 1.0
+From: <walter.white@googlemail.com>
+To:
+  =?utf-8?Q?Discourse_Meta?=
+   <reply@discourse.org>
+Subject:
+ =?utf-8?Q?Re:_[Discourse_Meta]_[Lounge]_Testing_default_email_replies?=
+Importance: Normal
+Date: Fri, 28 Nov 2014 21:29:10 +0000
+In-Reply-To: <topic/22638/86406@meta.discourse.org>
+References:
+ <topic/22638@meta.discourse.org>,<topic/22638/86406@meta.discourse.org>
+Content-Type: multipart/alternative;
+  boundary="_866E2678-BB4F-4DD8-BE18-81B04AD8D1BC_"
+
+--_866E2678-BB4F-4DD8-BE18-81B04AD8D1BC_
+Content-Transfer-Encoding: base64
+Content-Type: text/plain; charset="utf-8"
+
+IyMjIHJlcGx5IGZyb20gZGVmYXVsdCBtYWlsIGNsaWVudCBpbiBXaW5kb3dzIDguMSBNZXRybw0K
+DQoNClRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWlj
+ayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gg
+anVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0
+aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cu
+IFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBi
+cm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVt
+cHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUg
+bGF6eSBkb2cuDQoNCg0KVGhpcyBpcyBhICoqYm9sZCoqIHdvcmQgaW4gTWFya2Rvd24NCg0KDQpU
+aGlzIGlzIGEgbGluayBodHRwOi8vZXhhbXBsZS5jb20NCiANCg0KDQoNCg0KDQpGcm9tOiBBcnBp
+dCBKYWxhbg0KU2VudDog4oCORnJpZGF54oCOLCDigI5Ob3ZlbWJlcuKAjiDigI4yOOKAjiwg4oCO
+MjAxNCDigI4xMuKAjjrigI4zNeKAjiDigI5QTQ0KVG86IGplZmYgYXR3b29kDQoNCg0KDQoNCg0K
+DQogdGVjaEFQSg0KTm92ZW1iZXIgMjggDQoNClRlc3QgcmVwbHkuDQoNCkZpcnN0IHBhcmFncmFw
+aC4NCg0KU2Vjb25kIHBhcmFncmFwaC4NCg0KDQoNClRvIHJlc3BvbmQsIHJlcGx5IHRvIHRoaXMg
+ZW1haWwgb3IgdmlzaXQgaHR0cHM6Ly9tZXRhLmRpc2NvdXJzZS5vcmcvdC90ZXN0aW5nLWRlZmF1
+bHQtZW1haWwtcmVwbGllcy8yMjYzOC8zIGluIHlvdXIgYnJvd3Nlci4NCg0KDQoNClByZXZpb3Vz
+IFJlcGxpZXMNCg0KIGNvZGluZ2hvcnJvcg0KTm92ZW1iZXIgMjggDQoNCldlJ3JlIHRlc3Rpbmcg
+dGhlIGxhdGVzdCBHaXRIdWIgZW1haWwgcHJvY2Vzc2luZyBsaWJyYXJ5IHdoaWNoIHdlIGFyZSBp
+bnRlZ3JhdGluZyBub3cuDQoNCmh0dHBzOi8vZ2l0aHViLmNvbS9naXRodWIvZW1haWxfcmVwbHlf
+cGFyc2VyDQoNCkdvIGFoZWFkIGFuZCByZXBseSB0byB0aGlzIHRvcGljIGFuZCBJJ2xsIHJlcGx5
+IGZyb20gdmFyaW91cyBlbWFpbCBjbGllbnRzIGZvciB0ZXN0aW5nLg0KDQoNCg0KDQoNClRvIHJl
+c3BvbmQsIHJlcGx5IHRvIHRoaXMgZW1haWwgb3IgdmlzaXQgaHR0cHM6Ly9tZXRhLmRpc2NvdXJz
+ZS5vcmcvdC90ZXN0aW5nLWRlZmF1bHQtZW1haWwtcmVwbGllcy8yMjYzOC8zIGluIHlvdXIgYnJv
+d3Nlci4NCg0KDQpUbyB1bnN1YnNjcmliZSBmcm9tIHRoZXNlIGVtYWlscywgdmlzaXQgeW91ciB1
+c2VyIHByZWZlcmVuY2VzLg==
+
+--_866E2678-BB4F-4DD8-BE18-81B04AD8D1BC_
+Content-Transfer-Encoding: base64
+Content-Type: text/html; charset="utf-8"
+
+CjxodG1sPgo8aGVhZD4KPG1ldGEgbmFtZT0iZ2VuZXJhdG9yIiBjb250ZW50PSJXaW5kb3dzIE1h
+aWwgMTcuNS45NjAwLjIwNjA1Ij4KPHN0eWxlIGRhdGEtZXh0ZXJuYWxzdHlsZT0idHJ1ZSI+PCEt
+LQpwLk1zb0xpc3RQYXJhZ3JhcGgsIGxpLk1zb0xpc3RQYXJhZ3JhcGgsIGRpdi5Nc29MaXN0UGFy
+YWdyYXBoIHsKbWFyZ2luLXRvcDowaW47Cm1hcmdpbi1yaWdodDowaW47Cm1hcmdpbi1ib3R0b206
+MGluOwptYXJnaW4tbGVmdDouNWluOwptYXJnaW4tYm90dG9tOi4wMDAxcHQ7Cn0KcC5Nc29Ob3Jt
+YWwsIGxpLk1zb05vcm1hbCwgZGl2Lk1zb05vcm1hbCB7Cm1hcmdpbjowaW47Cm1hcmdpbi1ib3R0
+b206LjAwMDFwdDsKfQpwLk1zb0xpc3RQYXJhZ3JhcGhDeFNwRmlyc3QsIGxpLk1zb0xpc3RQYXJh
+Z3JhcGhDeFNwRmlyc3QsIGRpdi5Nc29MaXN0UGFyYWdyYXBoQ3hTcEZpcnN0LCAKcC5Nc29MaXN0
+UGFyYWdyYXBoQ3hTcE1pZGRsZSwgbGkuTXNvTGlzdFBhcmFncmFwaEN4U3BNaWRkbGUsIGRpdi5N
+c29MaXN0UGFyYWdyYXBoQ3hTcE1pZGRsZSwgCnAuTXNvTGlzdFBhcmFncmFwaEN4U3BMYXN0LCBs
+aS5Nc29MaXN0UGFyYWdyYXBoQ3hTcExhc3QsIGRpdi5Nc29MaXN0UGFyYWdyYXBoQ3hTcExhc3Qg
+ewptYXJnaW4tdG9wOjBpbjsKbWFyZ2luLXJpZ2h0OjBpbjsKbWFyZ2luLWJvdHRvbTowaW47Cm1h
+cmdpbi1sZWZ0Oi41aW47Cm1hcmdpbi1ib3R0b206LjAwMDFwdDsKbGluZS1oZWlnaHQ6MTE1JTsK
+fQotLT48L3N0eWxlPjwvaGVhZD4KPGJvZHkgZGlyPSJsdHIiPgo8ZGl2IGRhdGEtZXh0ZXJuYWxz
+dHlsZT0iZmFsc2UiIGRpcj0ibHRyIiBzdHlsZT0iZm9udC1mYW1pbHk6ICdDYWxpYnJpJywgJ1Nl
+Z29lIFVJJywgJ01laXJ5bycsICdNaWNyb3NvZnQgWWFIZWkgVUknLCAnTWljcm9zb2Z0IEpoZW5n
+SGVpIFVJJywgJ01hbGd1biBHb3RoaWMnLCAnc2Fucy1zZXJpZic7Zm9udC1zaXplOjEycHQ7Ij48
+ZGl2IHN0eWxlPSJmb250LXNpemU6IDE0cHQ7Ij4jIyMgcmVwbHkgZnJvbSBkZWZhdWx0IG1haWwg
+Y2xpZW50IGluIFdpbmRvd3MgOC4xIE1ldHJvPC9kaXY+PGRpdiBzdHlsZT0iZm9udC1zaXplOiAx
+NHB0OyI+PGJyPjwvZGl2PjxkaXYgc3R5bGU9ImZvbnQtc2l6ZTogMTRwdDsiPlRoZSBxdWljayBi
+cm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVt
+cHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUg
+bGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRo
+ZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93
+biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMg
+b3ZlciB0aGUgbGF6eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6
+eSBkb2cuIFRoZSBxdWljayBicm93biBmb3gganVtcHMgb3ZlciB0aGUgbGF6eSBkb2cuPC9kaXY+
+PGRpdiBzdHlsZT0iZm9udC1zaXplOiAxNHB0OyI+PGJyPjwvZGl2PjxkaXYgc3R5bGU9ImZvbnQt
+c2l6ZTogMTRwdDsiPlRoaXMgaXMgYSAqKmJvbGQqKiB3b3JkIGluIE1hcmtkb3duPC9kaXY+PGRp
+diBzdHlsZT0iZm9udC1zaXplOiAxNHB0OyI+PGJyPjwvZGl2PjxkaXYgc3R5bGU9ImZvbnQtc2l6
+ZTogMTRwdDsiPlRoaXMgaXMgYSBsaW5rIDxhIGhyZWY9Imh0dHA6Ly9leGFtcGxlLmNvbSI+aHR0
+cDovL2V4YW1wbGUuY29tPC9hPjxicj4mbmJzcDs8L2Rpdj48ZGl2IHN0eWxlPSJmb250LXNpemU6
+IDE0cHQ7Ij48YnI+PC9kaXY+PGRpdiBzdHlsZT0icGFkZGluZy10b3A6IDVweDsgYm9yZGVyLXRv
+cC1jb2xvcjogcmdiKDIyOSwgMjI5LCAyMjkpOyBib3JkZXItdG9wLXdpZHRoOiAxcHg7IGJvcmRl
+ci10b3Atc3R5bGU6IHNvbGlkOyI+PGRpdj48Zm9udCBmYWNlPSIgJ0NhbGlicmknLCAnU2Vnb2Ug
+VUknLCAnTWVpcnlvJywgJ01pY3Jvc29mdCBZYUhlaSBVSScsICdNaWNyb3NvZnQgSmhlbmdIZWkg
+VUknLCAnTWFsZ3VuIEdvdGhpYycsICdzYW5zLXNlcmlmJyIgc3R5bGU9J2xpbmUtaGVpZ2h0OiAx
+NXB0OyBsZXR0ZXItc3BhY2luZzogMC4wMmVtOyBmb250LWZhbWlseTogIkNhbGlicmkiLCAiU2Vn
+b2UgVUkiLCAiTWVpcnlvIiwgIk1pY3Jvc29mdCBZYUhlaSBVSSIsICJNaWNyb3NvZnQgSmhlbmdI
+ZWkgVUkiLCAiTWFsZ3VuIEdvdGhpYyIsICJzYW5zLXNlcmlmIjsgZm9udC1zaXplOiAxMnB0Oyc+
+PGI+RnJvbTo8L2I+Jm5ic3A7PGEgaHJlZj0ibWFpbHRvOmluZm9AZGlzY291cnNlLm9yZyIgdGFy
+Z2V0PSJfcGFyZW50Ij5BcnBpdCBKYWxhbjwvYT48YnI+PGI+U2VudDo8L2I+Jm5ic3A74oCORnJp
+ZGF54oCOLCDigI5Ob3ZlbWJlcuKAjiDigI4yOOKAjiwg4oCOMjAxNCDigI4xMuKAjjrigI4zNeKA
+jiDigI5QTTxicj48Yj5Ubzo8L2I+Jm5ic3A7PGEgaHJlZj0ibWFpbHRvOmphdHdvb2RAY29kaW5n
+aG9ycm9yLmNvbSIgdGFyZ2V0PSJfcGFyZW50Ij5qZWZmIGF0d29vZDwvYT48L2ZvbnQ+PC9kaXY+
+PC9kaXY+PGRpdj48YnI+PC9kaXY+PGRpdiBkaXI9IiI+PGRpdj4KCjx0YWJsZSB0YWJpbmRleD0i
+LTEiIHN0eWxlPSJtYXJnaW4tYm90dG9tOiAyNXB4OyIgYm9yZGVyPSIwIiBjZWxsc3BhY2luZz0i
+MCIgY2VsbHBhZGRpbmc9IjAiPgogIDx0Ym9keT4KICAgIDx0cj4KICAgICAgPHRkIHN0eWxlPSJ3
+aWR0aDogNTVweDsgdmVydGljYWwtYWxpZ246IHRvcDsiPgogICAgICAgIDxpbWcgd2lkdGg9IjQ1
+IiBoZWlnaHQ9IjQ1IiB0YWJpbmRleD0iLTEiIHN0eWxlPSJtYXgtd2lkdGg6IDEwMCU7IiBzcmM9
+Imh0dHBzOi8vbWV0YS1kaXNjb3Vyc2UuZ2xvYmFsLnNzbC5mYXN0bHkubmV0L3VzZXJfYXZhdGFy
+L21ldGEuZGlzY291cnNlLm9yZy90ZWNoYXBqLzQ1LzMyODEucG5nIiBkYXRhLW1zLWltZ3NyYz0i
+aHR0cHM6Ly9tZXRhLWRpc2NvdXJzZS5nbG9iYWwuc3NsLmZhc3RseS5uZXQvdXNlcl9hdmF0YXIv
+bWV0YS5kaXNjb3Vyc2Uub3JnL3RlY2hhcGovNDUvMzI4MS5wbmciPgogICAgICA8L3RkPgogICAg
+ICA8dGQ+CiAgICAgICAgPGEgc3R5bGU9J2NvbG9yOiByZ2IoNTksIDg5LCAxNTIpOyBmb250LWZh
+bWlseTogImx1Y2lkYSBncmFuZGUiLHRhaG9tYSx2ZXJkYW5hLGFyaWFsLHNhbnMtc2VyaWY7IGZv
+bnQtc2l6ZTogMTNweDsgZm9udC13ZWlnaHQ6IGJvbGQ7IHRleHQtZGVjb3JhdGlvbjogbm9uZTsn
+IGhyZWY9Imh0dHBzOi8vbWV0YS5kaXNjb3Vyc2Uub3JnL3VzZXJzL3RlY2hhcGoiIHRhcmdldD0i
+X3BhcmVudCI+dGVjaEFQSjwvYT48YnI+CiAgICAgICAgPHNwYW4gc3R5bGU9J3RleHQtYWxpZ246
+IHJpZ2h0OyBjb2xvcjogcmdiKDE1MywgMTUzLCAxNTMpOyBwYWRkaW5nLXJpZ2h0OiA1cHg7IGZv
+bnQtZmFtaWx5OiAibHVjaWRhIGdyYW5kZSIsdGFob21hLHZlcmRhbmEsYXJpYWwsc2Fucy1zZXJp
+ZjsgZm9udC1zaXplOiAxMXB4Oyc+Tm92ZW1iZXIgMjg8L3NwYW4+CiAgICAgIDwvdGQ+CiAgICA8
+L3RyPgogICAgPHRyPgogICAgICA8dGQgc3R5bGU9InBhZGRpbmctdG9wOiA1cHg7IiBjb2xzcGFu
+PSIyIj4KPHAgc3R5bGU9ImJvcmRlcjogMHB4IGJsYWNrOyBib3JkZXItaW1hZ2U6IG5vbmU7IG1h
+cmdpbi10b3A6IDBweDsiPlRlc3QgcmVwbHkuPC9wPgoKPHAgc3R5bGU9ImJvcmRlcjogMHB4IGJs
+YWNrOyBib3JkZXItaW1hZ2U6IG5vbmU7IG1hcmdpbi10b3A6IDBweDsiPkZpcnN0IHBhcmFncmFw
+aC48L3A+Cgo8cCBzdHlsZT0iYm9yZGVyOiAwcHggYmxhY2s7IGJvcmRlci1pbWFnZTogbm9uZTsg
+bWFyZ2luLXRvcDogMHB4OyI+U2Vjb25kIHBhcmFncmFwaC48L3A+CjwvdGQ+CiAgICA8L3RyPgog
+IDwvdGJvZHk+CjwvdGFibGU+CgoKICA8ZGl2IHN0eWxlPSJjb2xvcjogcmdiKDEwMiwgMTAyLCAx
+MDIpOyI+CiAgICA8cD5UbyByZXNwb25kLCByZXBseSB0byB0aGlzIGVtYWlsIG9yIHZpc2l0IDxh
+IHN0eWxlPSJjb2xvcjogcmdiKDEwMiwgMTAyLCAxMDIpOyBmb250LXdlaWdodDogYm9sZDsgdGV4
+dC1kZWNvcmF0aW9uOiBub25lOyIgaHJlZj0iaHR0cHM6Ly9tZXRhLmRpc2NvdXJzZS5vcmcvdC90
+ZXN0aW5nLWRlZmF1bHQtZW1haWwtcmVwbGllcy8yMjYzOC8zIiB0YXJnZXQ9Il9wYXJlbnQiPmh0
+dHBzOi8vbWV0YS5kaXNjb3Vyc2Uub3JnL3QvdGVzdGluZy1kZWZhdWx0LWVtYWlsLXJlcGxpZXMv
+MjI2MzgvMzwvYT4gaW4geW91ciBicm93c2VyLjwvcD4KICA8L2Rpdj4KICA8aHIgc3R5bGU9ImJv
+cmRlcjogMXB4IGJsYWNrOyBib3JkZXItaW1hZ2U6IG5vbmU7IGhlaWdodDogMXB4OyBiYWNrZ3Jv
+dW5kLWNvbG9yOiByZ2IoMjIxLCAyMjEsIDIyMSk7Ij4KICA8aDQ+UHJldmlvdXMgUmVwbGllczwv
+aDQ+CgogIDx0YWJsZSB0YWJpbmRleD0iLTEiIHN0eWxlPSJtYXJnaW4tYm90dG9tOiAyNXB4OyIg
+Ym9yZGVyPSIwIiBjZWxsc3BhY2luZz0iMCIgY2VsbHBhZGRpbmc9IjAiPgogIDx0Ym9keT4KICAg
+IDx0cj4KICAgICAgPHRkIHN0eWxlPSJ3aWR0aDogNTVweDsgdmVydGljYWwtYWxpZ246IHRvcDsi
+PgogICAgICAgIDxpbWcgd2lkdGg9IjQ1IiBoZWlnaHQ9IjQ1IiB0YWJpbmRleD0iLTEiIHN0eWxl
+PSJtYXgtd2lkdGg6IDEwMCU7IiBzcmM9Imh0dHBzOi8vbWV0YS1kaXNjb3Vyc2UuZ2xvYmFsLnNz
+bC5mYXN0bHkubmV0L3VzZXJfYXZhdGFyL21ldGEuZGlzY291cnNlLm9yZy9jb2Rpbmdob3Jyb3Iv
+NDUvNTI5Ny5wbmciIGRhdGEtbXMtaW1nc3JjPSJodHRwczovL21ldGEtZGlzY291cnNlLmdsb2Jh
+bC5zc2wuZmFzdGx5Lm5ldC91c2VyX2F2YXRhci9tZXRhLmRpc2NvdXJzZS5vcmcvY29kaW5naG9y
+cm9yLzQ1LzUyOTcucG5nIj4KICAgICAgPC90ZD4KICAgICAgPHRkPgogICAgICAgIDxhIHN0eWxl
+PSdjb2xvcjogcmdiKDU5LCA4OSwgMTUyKTsgZm9udC1mYW1pbHk6ICJsdWNpZGEgZ3JhbmRlIix0
+YWhvbWEsdmVyZGFuYSxhcmlhbCxzYW5zLXNlcmlmOyBmb250LXNpemU6IDEzcHg7IGZvbnQtd2Vp
+Z2h0OiBib2xkOyB0ZXh0LWRlY29yYXRpb246IG5vbmU7JyBocmVmPSJodHRwczovL21ldGEuZGlz
+Y291cnNlLm9yZy91c2Vycy9jb2Rpbmdob3Jyb3IiIHRhcmdldD0iX3BhcmVudCI+Y29kaW5naG9y
+cm9yPC9hPjxicj4KICAgICAgICA8c3BhbiBzdHlsZT0ndGV4dC1hbGlnbjogcmlnaHQ7IGNvbG9y
+OiByZ2IoMTUzLCAxNTMsIDE1Myk7IHBhZGRpbmctcmlnaHQ6IDVweDsgZm9udC1mYW1pbHk6ICJs
+dWNpZGEgZ3JhbmRlIix0YWhvbWEsdmVyZGFuYSxhcmlhbCxzYW5zLXNlcmlmOyBmb250LXNpemU6
+IDExcHg7Jz5Ob3ZlbWJlciAyODwvc3Bhbj4KICAgICAgPC90ZD4KICAgIDwvdHI+CiAgICA8dHI+
+CiAgICAgIDx0ZCBzdHlsZT0icGFkZGluZy10b3A6IDVweDsiIGNvbHNwYW49IjIiPgo8cCBzdHls
+ZT0iYm9yZGVyOiAwcHggYmxhY2s7IGJvcmRlci1pbWFnZTogbm9uZTsgbWFyZ2luLXRvcDogMHB4
+OyI+V2UncmUgdGVzdGluZyB0aGUgbGF0ZXN0IEdpdEh1YiBlbWFpbCBwcm9jZXNzaW5nIGxpYnJh
+cnkgd2hpY2ggd2UgYXJlIGludGVncmF0aW5nIG5vdy48L3A+Cgo8cCBzdHlsZT0iYm9yZGVyOiAw
+cHggYmxhY2s7IGJvcmRlci1pbWFnZTogbm9uZTsgbWFyZ2luLXRvcDogMHB4OyI+PGEgc3R5bGU9
+ImNvbG9yOiByZ2IoMCwgMTAyLCAxNTMpOyBmb250LXdlaWdodDogYm9sZDsgdGV4dC1kZWNvcmF0
+aW9uOiBub25lOyIgaHJlZj0iaHR0cHM6Ly9naXRodWIuY29tL2dpdGh1Yi9lbWFpbF9yZXBseV9w
+YXJzZXIiIHRhcmdldD0iX3BhcmVudCI+aHR0cHM6Ly9naXRodWIuY29tL2dpdGh1Yi9lbWFpbF9y
+ZXBseV9wYXJzZXI8L2E+PC9wPgoKPHAgc3R5bGU9ImJvcmRlcjogMHB4IGJsYWNrOyBib3JkZXIt
+aW1hZ2U6IG5vbmU7IG1hcmdpbi10b3A6IDBweDsiPkdvIGFoZWFkIGFuZCByZXBseSB0byB0aGlz
+IHRvcGljIGFuZCBJJ2xsIHJlcGx5IGZyb20gdmFyaW91cyBlbWFpbCBjbGllbnRzIGZvciB0ZXN0
+aW5nLjwvcD4KPC90ZD4KICAgIDwvdHI+CiAgPC90Ym9keT4KPC90YWJsZT4KCgo8aHIgc3R5bGU9
+ImJvcmRlcjogMXB4IGJsYWNrOyBib3JkZXItaW1hZ2U6IG5vbmU7IGhlaWdodDogMXB4OyBiYWNr
+Z3JvdW5kLWNvbG9yOiByZ2IoMjIxLCAyMjEsIDIyMSk7Ij4KCjxkaXYgc3R5bGU9ImNvbG9yOiBy
+Z2IoMTAyLCAxMDIsIDEwMik7Ij4KPHA+VG8gcmVzcG9uZCwgcmVwbHkgdG8gdGhpcyBlbWFpbCBv
+ciB2aXNpdCA8YSBzdHlsZT0iY29sb3I6IHJnYigxMDIsIDEwMiwgMTAyKTsgZm9udC13ZWlnaHQ6
+IGJvbGQ7IHRleHQtZGVjb3JhdGlvbjogbm9uZTsiIGhyZWY9Imh0dHBzOi8vbWV0YS5kaXNjb3Vy
+c2Uub3JnL3QvdGVzdGluZy1kZWZhdWx0LWVtYWlsLXJlcGxpZXMvMjI2MzgvMyIgdGFyZ2V0PSJf
+cGFyZW50Ij5odHRwczovL21ldGEuZGlzY291cnNlLm9yZy90L3Rlc3RpbmctZGVmYXVsdC1lbWFp
+bC1yZXBsaWVzLzIyNjM4LzM8L2E+IGluIHlvdXIgYnJvd3Nlci48L3A+CjwvZGl2Pgo8ZGl2IHN0
+eWxlPSJjb2xvcjogcmdiKDEwMiwgMTAyLCAxMDIpOyI+CjxwPlRvIHVuc3Vic2NyaWJlIGZyb20g
+dGhlc2UgZW1haWxzLCB2aXNpdCB5b3VyIDxhIHN0eWxlPSJjb2xvcjogcmdiKDEwMiwgMTAyLCAx
+MDIpOyBmb250LXdlaWdodDogYm9sZDsgdGV4dC1kZWNvcmF0aW9uOiBub25lOyIgaHJlZj0iaHR0
+cHM6Ly9tZXRhLmRpc2NvdXJzZS5vcmcvbXkvcHJlZmVyZW5jZXMiIHRhcmdldD0iX3BhcmVudCI+
+dXNlciBwcmVmZXJlbmNlczwvYT4uPC9wPgo8L2Rpdj4KPC9kaXY+CjwvZGl2PjxkaXYgc3R5bGU9
+ImZvbnQtc2l6ZTogMTRwdDsiPjxicj48L2Rpdj48L2Rpdj4KPC9ib2R5Pgo8L2h0bWw+Cg==
+
+--_866E2678-BB4F-4DD8-BE18-81B04AD8D1BC_--
diff --git a/spec/jobs/process_post_spec.rb b/spec/jobs/process_post_spec.rb
index 9d0223be83..4ddb8b0f26 100644
--- a/spec/jobs/process_post_spec.rb
+++ b/spec/jobs/process_post_spec.rb
@@ -9,26 +9,41 @@ describe Jobs::ProcessPost do
 
   context 'with a post' do
 
-    before do
-      @post = Fabricate(:post)
+    let(:post) do
+      Fabricate(:post)
     end
 
-    it 'calls process on a CookedPostProcessor' do
-      CookedPostProcessor.any_instance.expects(:post_process).once
-      Jobs::ProcessPost.new.execute(post_id: @post.id)
+    it 'does not erase posts when CookedPostProcessor malfunctions' do
+      # Look kids, an actual reason why you want to use mocks
+      CookedPostProcessor.any_instance.expects(:html).returns(' ')
+      cooked = post.cooked
+
+      post.reload
+      post.cooked.should == cooked
+
+      Jobs::ProcessPost.new.execute(post_id: post.id, cook: true)
     end
 
-    it 'updates the html if the dirty flag is true' do
-      CookedPostProcessor.any_instance.expects(:dirty?).returns(true)
-      CookedPostProcessor.any_instance.expects(:html).returns('test')
-      Post.any_instance.expects(:update_column).with(:cooked, 'test').once
-      Jobs::ProcessPost.new.execute(post_id: @post.id)
+    it 'recooks if needed' do
+      cooked = post.cooked
+
+      post.update_columns(cooked: "frogs")
+      Jobs::ProcessPost.new.execute(post_id: post.id, cook: true)
+
+      post.reload
+      post.cooked.should == cooked
     end
 
-    it "doesn't update the cooked content if dirty is false" do
-      CookedPostProcessor.any_instance.expects(:dirty?).returns(false)
-      Post.any_instance.expects(:update_column).never
-      Jobs::ProcessPost.new.execute(post_id: @post.id)
+    it 'processes posts' do
+
+      post = Fabricate(:post, raw: "<img src='#{Discourse.base_url_no_prefix}/awesome/picture.png'>")
+      post.cooked.should =~ /http/
+
+      Jobs::ProcessPost.new.execute(post_id: post.id)
+      post.reload
+
+      # subtle but cooked post processor strip this stuff, this ensures all the code gets a workout
+      post.cooked.should_not =~ /http/
     end
 
   end
diff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rb
index a8ddc4246d..fa03d5ac71 100644
--- a/spec/mailers/user_notifications_spec.rb
+++ b/spec/mailers/user_notifications_spec.rb
@@ -131,11 +131,11 @@ describe UserNotifications do
   end
 
   describe '.user_posted' do
-    let(:response_by_user) { Fabricate(:user, name: "John Doe") }
+    let(:response_by_user) { Fabricate(:user, name: "John Doe", username: "john") }
     let(:post) { Fabricate(:post) }
     let(:response) { Fabricate(:post, topic: post.topic, user: response_by_user)}
     let(:user) { Fabricate(:user) }
-    let(:notification) { Fabricate(:notification, user: user) }
+    let(:notification) { Fabricate(:notification, user: user, data: {original_username: response_by_user.username}.to_json) }
 
     it 'generates a correct email' do
       SiteSetting.stubs(:enable_email_names).returns(false)
@@ -144,6 +144,9 @@ describe UserNotifications do
       # from should not include full user name if "show user full names" is disabled
       expect(mail[:from].display_names).to_not eql(['John Doe'])
 
+      # from should include username if "show user full names" is disabled
+      expect(mail[:from].display_names).to eql(['john'])
+
       # subject should not include category name
       expect(mail.subject).not_to match(/Uncategorized/)
 
@@ -160,18 +163,18 @@ describe UserNotifications do
   end
 
   describe '.user_private_message' do
-    let(:response_by_user) { Fabricate(:user, name: "John Doe") }
+    let(:response_by_user) { Fabricate(:user, name: "", username: "john") }
     let(:topic) { Fabricate(:private_message_topic) }
     let(:response) { Fabricate(:post, topic: topic, user: response_by_user)}
     let(:user) { Fabricate(:user) }
-    let(:notification) { Fabricate(:notification, user: user) }
+    let(:notification) { Fabricate(:notification, user: user, data: {original_username: response_by_user.username}.to_json) }
 
     it 'generates a correct email' do
       SiteSetting.stubs(:enable_email_names).returns(true)
       mail = UserNotifications.user_private_message(response.user, post: response, notification: notification)
 
-      # from should include full user name
-      expect(mail[:from].display_names).to eql(['John Doe'])
+      # from should include username if full user name is not provided
+      expect(mail[:from].display_names).to eql(['john'])
 
       # subject should include "[PM]"
       expect(mail.subject).to match("[PM]")
diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb
index f150153832..c2277e5f09 100644
--- a/spec/models/post_action_spec.rb
+++ b/spec/models/post_action_spec.rb
@@ -17,6 +17,12 @@ describe PostAction do
 
   describe "messaging" do
 
+    it "doesn't generate title longer than 255 characters" do
+      topic = create_topic(title: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sit amet rutrum neque. Pellentesque suscipit vehicula facilisis. Phasellus lacus sapien, aliquam nec convallis sit amet, vestibulum laoreet ante. Curabitur et pellentesque tortor. Donec non.")
+      post = create_post(topic: topic)
+      -> { PostAction.act(admin, post, PostActionType.types[:notify_user], message: "WAT") }.should_not raise_error
+    end
+
     it "notify moderators integration test" do
       post = create_post
       mod = moderator
@@ -370,6 +376,50 @@ describe PostAction do
       post.hidden.should == false
     end
 
+    it "will automatically close a topic due to large community flagging" do
+      SiteSetting.stubs(:flags_required_to_hide_post).returns(0)
+
+      SiteSetting.stubs(:num_flags_to_close_topic).returns(3)
+      SiteSetting.stubs(:num_flaggers_to_close_topic).returns(2)
+
+      topic = Fabricate(:topic)
+      post1 = create_post(topic: topic)
+      post2 = create_post(topic: topic)
+      post3 = create_post(topic: topic)
+
+      flagger1 = Fabricate(:user)
+      flagger2 = Fabricate(:user)
+
+      # reaching `num_flaggers_to_close_topic` isn't enough
+      [flagger1, flagger2].each do |flagger|
+        PostAction.act(flagger, post1, PostActionType.types[:inappropriate])
+      end
+
+      topic.reload.closed.should == false
+
+      # clean up
+      PostAction.where(post: post1).delete_all
+
+      # reaching `num_flags_to_close_topic` isn't enough
+      [post1, post2, post3].each do |post|
+        PostAction.act(flagger1, post, PostActionType.types[:inappropriate])
+      end
+
+      topic.reload.closed.should == false
+
+      # clean up
+      PostAction.where(post: [post1, post2, post3]).delete_all
+
+      # reaching both should close the topic
+      [flagger1, flagger2].each do |flagger|
+        [post1, post2, post3].each do |post|
+          PostAction.act(flagger, post, PostActionType.types[:inappropriate])
+        end
+      end
+
+      topic.reload.closed.should == true
+    end
+
   end
 
   it "prevents user to act twice at the same time" do
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index d2d1d79afe..ce009f1cb5 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1155,13 +1155,13 @@ describe User do
     end
   end
 
-  describe "#purge_inactive" do
+  describe "#purge_unactivated" do
     let!(:user) { Fabricate(:user) }
     let!(:inactive) { Fabricate(:user, active: false) }
     let!(:inactive_old) { Fabricate(:user, active: false, created_at: 1.month.ago) }
 
-    it 'should only remove old, inactive users' do
-      User.purge_inactive
+    it 'should only remove old, unactivated users' do
+      User.purge_unactivated
       all_users = User.all
       all_users.include?(user).should == true
       all_users.include?(inactive).should == true
diff --git a/spec/services/user_destroyer_spec.rb b/spec/services/user_destroyer_spec.rb
index efb50f0bd2..b7b685a558 100644
--- a/spec/services/user_destroyer_spec.rb
+++ b/spec/services/user_destroyer_spec.rb
@@ -283,6 +283,17 @@ describe UserDestroyer do
       end
     end
 
+    context 'user got an email' do
+      let(:user) { Fabricate(:user) }
+      let!(:email_log) { Fabricate(:email_log, user: user) }
+
+      it "deletes the email log" do
+        expect {
+          UserDestroyer.new(@admin).destroy(user, {delete_posts: true})
+        }.to change { EmailLog.count }.by(-1)
+      end
+    end
+
     context 'user liked things' do
       before do
         @topic = Fabricate(:topic, user: Fabricate(:user))
diff --git a/test/javascripts/models/post-stream-test.js.es6 b/test/javascripts/models/post-stream-test.js.es6
index dcb06d1305..fccbbd2416 100644
--- a/test/javascripts/models/post-stream-test.js.es6
+++ b/test/javascripts/models/post-stream-test.js.es6
@@ -1,7 +1,7 @@
 module("Discourse.PostStream");
 
 var buildStream = function(id, stream) {
-  var topic = Discourse.Topic.create({id: id});
+  var topic = Discourse.Topic.create({id: id, chunk_size: 5});
   var ps = topic.get('postStream');
   if (stream) {
     ps.set('stream', stream);
@@ -20,7 +20,6 @@ test('defaults', function() {
   blank(postStream.get('posts'), "there are no posts in a stream by default");
   ok(!postStream.get('loaded'), "it has never loaded");
   present(postStream.get('topic'));
-
 });
 
 test('appending posts', function() {
@@ -182,7 +181,6 @@ test("loading", function() {
 });
 
 test("nextWindow", function() {
-  Discourse.SiteSettings.posts_chunksize = 5;
   var postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]);
 
   blank(postStream.get('nextWindow'), 'With no posts loaded, the window is blank');
@@ -199,7 +197,6 @@ test("nextWindow", function() {
 });
 
 test("previousWindow", function() {
-  Discourse.SiteSettings.posts_chunksize = 5;
   var postStream = buildStream(1234, [1,2,3,5,8,9,10,11,13,14,15,16]);
 
   blank(postStream.get('previousWindow'), 'With no posts loaded, the window is blank');
@@ -233,7 +230,7 @@ test("storePost", function() {
   var postWithoutId = Discourse.Post.create({raw: 'hello world'});
   stored = postStream.storePost(postWithoutId);
   equal(stored, postWithoutId, "it returns the same post back");
-  equal(postStream.get('postIdentityMap.length'), 1, "it does not add a new entry into the identity map");
+  equal(postStream.get('postIdentityMap.size'), 1, "it does not add a new entry into the identity map");
 
 });
 
diff --git a/test/javascripts/views/view-test.js.es6 b/test/javascripts/views/view-test.js.es6
index 1595c9bc7f..f9ea42dfe4 100644
--- a/test/javascripts/views/view-test.js.es6
+++ b/test/javascripts/views/view-test.js.es6
@@ -30,47 +30,3 @@ test("registerHelper: enables embedding a child view in a parent view via dedica
   equal(parentView.$("#child").length, 1, "child view registered as helper is appended to the parent view");
   equal(parentView.$("#child").text(), "foo", "child view registered as helper gets parameters provided during helper invocation in parent's template");
 });
-
-test("renderIfChanged: rerenders the whole view template when one of registered view fields changes", function() {
-  var view, rerenderSpy;
-
-  var viewRerendersOnceWhen = function(message, changeCallback) {
-    rerenderSpy.reset();
-    Ember.run(function() { changeCallback(); });
-    ok(rerenderSpy.calledOnce, "view rerenders when " + message);
-  };
-
-  var viewDoesNotRerenderWhen = function(message, changeCallback) {
-    rerenderSpy.reset();
-    Ember.run(function() { changeCallback(); });
-    ok(!rerenderSpy.called, "view does not rerender when " + message);
-  };
-
-
-  view = Ember.View.extend({
-    shouldRerender: Discourse.View.renderIfChanged("simple", "complex.@each.nested")
-  }).create({
-    simple: "initial value",
-    complex: [Ember.Object.create({nested: "initial value"})],
-    unregistered: "initial value"
-  });
-
-  rerenderSpy = sinon.spy(view, "rerender");
-
-  Ember.run(function() {
-    view.appendTo("#qunit-fixture");
-  });
-
-
-  viewRerendersOnceWhen("a simple field (holding a string) changes", function() {
-    view.set("simple", "updated value");
-  });
-
-  viewRerendersOnceWhen("a nested sub-field of a complex field (holding an array of objects) changes", function() {
-    view.get("complex").objectAt(0).set("nested", "updated value");
-  });
-
-  viewDoesNotRerenderWhen("unregistered field changes", function() {
-    view.set("unregistered", "updated value");
-  });
-});
diff --git a/vendor/assets/javascripts/development/ember.js b/vendor/assets/javascripts/development/ember.js
index 4e25fe0987..e8b57d0adc 100644
--- a/vendor/assets/javascripts/development/ember.js
+++ b/vendor/assets/javascripts/development/ember.js
@@ -5,24 +5,24 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.7.1
+ * @version   1.8.1
  */
 
 (function() {
-var define, requireModule, require, requirejs, Ember;
+var enifed, requireModule, eriuqer, requirejs, Ember;
 
 (function() {
   Ember = this.Ember = this.Ember || {};
-  if (typeof Ember === 'undefined') { Ember = {} };
+  if (typeof Ember === 'undefined') { Ember = {}; };
 
   if (typeof Ember.__loader === 'undefined') {
     var registry = {}, seen = {};
 
-    define = function(name, deps, callback) {
+    enifed = function(name, deps, callback) {
       registry[name] = { deps: deps, callback: callback };
     };
 
-    requirejs = require = requireModule = function(name) {
+    requirejs = eriuqer = requireModule = function(name) {
       if (seen.hasOwnProperty(name)) { return seen[name]; }
       seen[name] = {};
 
@@ -30,11 +30,11 @@ var define, requireModule, require, requirejs, Ember;
         throw new Error("Could not find module " + name);
       }
 
-      var mod = registry[name],
-      deps = mod.deps,
-      callback = mod.callback,
-      reified = [],
-      exports;
+      var mod = registry[name];
+      var deps = mod.deps;
+      var callback = mod.callback;
+      var reified = [];
+      var exports;
 
       for (var i=0, l=deps.length; i<l; i++) {
         if (deps[i] === 'exports') {
@@ -65,42 +65,34 @@ var define, requireModule, require, requirejs, Ember;
     };
     requirejs._eak_seen = registry;
 
-    Ember.__loader = {define: define, require: require, registry: registry};
+    Ember.__loader = {define: enifed, require: eriuqer, registry: registry};
   } else {
-    define = Ember.__loader.define;
-    requirejs = require = requireModule = Ember.__loader.require;
+    enifed = Ember.__loader.define;
+    requirejs = eriuqer = requireModule = Ember.__loader.require;
   }
 })();
 
-define("backburner",
-  ["backburner/utils","backburner/deferred_action_queues","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("backburner",
+  ["backburner/utils","backburner/platform","backburner/binary-search","backburner/deferred-action-queues","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    var Utils = __dependency1__["default"];
-    var DeferredActionQueues = __dependency2__.DeferredActionQueues;
+    var each = __dependency1__.each;
+    var isString = __dependency1__.isString;
+    var isFunction = __dependency1__.isFunction;
+    var isNumber = __dependency1__.isNumber;
+    var isCoercableNumber = __dependency1__.isCoercableNumber;
+    var wrapInTryCatch = __dependency1__.wrapInTryCatch;
+    var now = __dependency1__.now;
 
-    var slice = [].slice,
-        pop = [].pop,
-        each = Utils.each,
-        isString = Utils.isString,
-        isFunction = Utils.isFunction,
-        isNumber = Utils.isNumber,
-        timers = [],
-        global = this,
-        NUMBER = /\d+/;
+    var needsIETryCatchFix = __dependency2__.needsIETryCatchFix;
 
-    // In IE 6-8, try/finally doesn't work without a catch.
-    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
-    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
-    var needsIETryCatchFix = (function(e,x){
-      try{ x(); }
-      catch(e) { } // jshint ignore:line
-      return !!e;
-    })();
+    var searchTimer = __dependency3__["default"];
 
-    function isCoercableNumber(number) {
-      return isNumber(number) || NUMBER.test(number);
-    }
+    var DeferredActionQueues = __dependency4__["default"];
+
+    var slice = [].slice;
+    var pop = [].pop;
+    var global = this;
 
     function Backburner(queueNames, options) {
       this.queueNames = queueNames;
@@ -111,18 +103,14 @@ define("backburner",
       this.instanceStack = [];
       this._debouncees = [];
       this._throttlers = [];
+      this._timers = [];
     }
 
     Backburner.prototype = {
-      queueNames: null,
-      options: null,
-      currentInstance: null,
-      instanceStack: null,
-
       begin: function() {
-        var options = this.options,
-            onBegin = options && options.onBegin,
-            previousInstance = this.currentInstance;
+        var options = this.options;
+        var onBegin = options && options.onBegin;
+        var previousInstance = this.currentInstance;
 
         if (previousInstance) {
           this.instanceStack.push(previousInstance);
@@ -135,10 +123,10 @@ define("backburner",
       },
 
       end: function() {
-        var options = this.options,
-            onEnd = options && options.onEnd,
-            currentInstance = this.currentInstance,
-            nextInstance = null;
+        var options = this.options;
+        var onEnd = options && options.onEnd;
+        var currentInstance = this.currentInstance;
+        var nextInstance = null;
 
         // Prevent double-finally bug in Safari 6.0.2 and iOS 6
         // This bug appears to be resolved in Safari 6.0.5 and iOS 7
@@ -215,8 +203,19 @@ define("backburner",
           method = target[method];
         }
 
-        var stack = this.DEBUG ? new Error() : undefined,
-            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
+        var stack = this.DEBUG ? new Error() : undefined;
+        var length = arguments.length;
+        var args;
+
+        if (length > 3) {
+          args = new Array(length - 3);
+          for (var i = 3; i < length; i++) {
+            args[i-3] = arguments[i];
+          }
+        } else {
+          args = undefined;
+        }
+
         if (!this.currentInstance) { createAutorun(this); }
         return this.currentInstance.schedule(queueName, target, method, args, false, stack);
       },
@@ -231,15 +230,34 @@ define("backburner",
           method = target[method];
         }
 
-        var stack = this.DEBUG ? new Error() : undefined,
-            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
-        if (!this.currentInstance) { createAutorun(this); }
+        var stack = this.DEBUG ? new Error() : undefined;
+        var length = arguments.length;
+        var args;
+
+        if (length > 3) {
+          args = new Array(length - 3);
+          for (var i = 3; i < length; i++) {
+            args[i-3] = arguments[i];
+          }
+        } else {
+          args = undefined;
+        }
+
+        if (!this.currentInstance) {
+          createAutorun(this);
+        }
         return this.currentInstance.schedule(queueName, target, method, args, true, stack);
       },
 
       setTimeout: function() {
-        var args = slice.call(arguments),
-            length = args.length,
+        var l = arguments.length;
+        var args = new Array(l);
+
+        for (var x = 0; x < l; x++) {
+          args[x] = arguments[x];
+        }
+
+        var length = args.length,
             method, wait, target,
             methodOrTarget, methodOrWait, methodOrArgs;
 
@@ -285,7 +303,7 @@ define("backburner",
           }
         }
 
-        var executeAt = (+new Date()) + parseInt(wait, 10);
+        var executeAt = now() + parseInt(wait, 10);
 
         if (isString(method)) {
           method = target[method];
@@ -306,9 +324,9 @@ define("backburner",
         }
 
         // find position to insert
-        var i = searchTimer(executeAt, timers);
+        var i = searchTimer(executeAt, this._timers);
 
-        timers.splice(i, 0, executeAt, fn);
+        this._timers.splice(i, 0, executeAt, fn);
 
         updateLaterTimer(this, executeAt, wait);
 
@@ -316,13 +334,10 @@ define("backburner",
       },
 
       throttle: function(target, method /* , args, wait, [immediate] */) {
-        var self = this,
-            args = arguments,
-            immediate = pop.call(args),
-            wait,
-            throttler,
-            index,
-            timer;
+        var backburner = this;
+        var args = arguments;
+        var immediate = pop.call(args);
+        var wait, throttler, index, timer;
 
         if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
@@ -338,16 +353,16 @@ define("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            self.run.apply(self, args);
+            backburner.run.apply(backburner, args);
           }
-          var index = findThrottler(target, method, self._throttlers);
+          var index = findThrottler(target, method, backburner._throttlers);
           if (index > -1) {
-            self._throttlers.splice(index, 1);
+            backburner._throttlers.splice(index, 1);
           }
         }, wait);
 
         if (immediate) {
-          self.run.apply(self, args);
+          this.run.apply(this, args);
         }
 
         throttler = [target, method, timer];
@@ -358,13 +373,10 @@ define("backburner",
       },
 
       debounce: function(target, method /* , args, wait, [immediate] */) {
-        var self = this,
-            args = arguments,
-            immediate = pop.call(args),
-            wait,
-            index,
-            debouncee,
-            timer;
+        var backburner = this;
+        var args = arguments;
+        var immediate = pop.call(args);
+        var wait, index, debouncee, timer;
 
         if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
@@ -385,21 +397,25 @@ define("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            self.run.apply(self, args);
+            backburner.run.apply(backburner, args);
           }
-          var index = findDebouncee(target, method, self._debouncees);
+          var index = findDebouncee(target, method, backburner._debouncees);
           if (index > -1) {
-            self._debouncees.splice(index, 1);
+            backburner._debouncees.splice(index, 1);
           }
         }, wait);
 
         if (immediate && index === -1) {
-          self.run.apply(self, args);
+          backburner.run.apply(backburner, args);
         }
 
-        debouncee = [target, method, timer];
+        debouncee = [
+          target,
+          method,
+          timer
+        ];
 
-        self._debouncees.push(debouncee);
+        backburner._debouncees.push(debouncee);
 
         return debouncee;
       },
@@ -419,7 +435,7 @@ define("backburner",
           clearTimeout(this._laterTimer);
           this._laterTimer = null;
         }
-        timers = [];
+        this._timers = [];
 
         if (this._autorun) {
           clearTimeout(this._autorun);
@@ -428,7 +444,7 @@ define("backburner",
       },
 
       hasTimers: function() {
-        return !!timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
+        return !!this._timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
       },
 
       cancel: function(timer) {
@@ -437,9 +453,18 @@ define("backburner",
         if (timer && timerType === 'object' && timer.queue && timer.method) { // we're cancelling a deferOnce
           return timer.queue.cancel(timer);
         } else if (timerType === 'function') { // we're cancelling a setTimeout
-          for (var i = 0, l = timers.length; i < l; i += 2) {
-            if (timers[i + 1] === timer) {
-              timers.splice(i, 2); // remove the two elements
+          for (var i = 0, l = this._timers.length; i < l; i += 2) {
+            if (this._timers[i + 1] === timer) {
+              this._timers.splice(i, 2); // remove the two elements
+              if (i === 0) {
+                if (this._laterTimer) { // Active timer? Then clear timer and reset for future timer
+                  clearTimeout(this._laterTimer);
+                  this._laterTimer = null;
+                }
+                if (this._timers.length > 0) { // Update to next available timer when available
+                  updateLaterTimer(this, this._timers[0], this._timers[0] - now());
+                }
+              }
               return true;
             }
           }
@@ -452,18 +477,17 @@ define("backburner",
       },
 
       _cancelItem: function(findMethod, array, timer){
-        var item,
-            index;
+        var item, index;
 
         if (timer.length < 3) { return false; }
 
         index = findMethod(timer[0], timer[1], array);
 
-        if(index > -1) {
+        if (index > -1) {
 
           item = array[index];
 
-          if(item[2] === timer[2]){
+          if (item[2] === timer[2]) {
             array.splice(index, 1);
             clearTimeout(timer[2]);
             return true;
@@ -486,21 +510,10 @@ define("backburner",
       Backburner.prototype.end = wrapInTryCatch(originalEnd);
     }
 
-    function wrapInTryCatch(func) {
-      return function () {
-        try {
-          return func.apply(this, arguments);
-        } catch (e) {
-          throw e;
-        }
-      };
-    }
-
     function getOnError(options) {
       return options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
     }
 
-
     function createAutorun(backburner) {
       backburner.begin();
       backburner._autorun = global.setTimeout(function() {
@@ -509,33 +522,48 @@ define("backburner",
       });
     }
 
-    function updateLaterTimer(self, executeAt, wait) {
-      if (!self._laterTimer || executeAt < self._laterTimerExpiresAt) {
-        self._laterTimer = global.setTimeout(function() {
-          self._laterTimer = null;
-          self._laterTimerExpiresAt = null;
-          executeTimers(self);
+    function updateLaterTimer(backburner, executeAt, wait) {
+      var n = now();
+      if (!backburner._laterTimer || executeAt < backburner._laterTimerExpiresAt || backburner._laterTimerExpiresAt < n) {
+
+        if (backburner._laterTimer) {
+          // Clear when:
+          // - Already expired
+          // - New timer is earlier
+          clearTimeout(backburner._laterTimer);
+
+          if (backburner._laterTimerExpiresAt < n) { // If timer was never triggered
+            // Calculate the left-over wait-time
+            wait = Math.max(0, executeAt - n);
+          }
+        }
+
+        backburner._laterTimer = global.setTimeout(function() {
+          backburner._laterTimer = null;
+          backburner._laterTimerExpiresAt = null;
+          executeTimers(backburner);
         }, wait);
-        self._laterTimerExpiresAt = executeAt;
+
+        backburner._laterTimerExpiresAt = n + wait;
       }
     }
 
-    function executeTimers(self) {
-      var now = +new Date(),
-          time, fns, i, l;
+    function executeTimers(backburner) {
+      var n = now();
+      var fns, i, l;
 
-      self.run(function() {
-        i = searchTimer(now, timers);
+      backburner.run(function() {
+        i = searchTimer(n, backburner._timers);
 
-        fns = timers.splice(0, i);
+        fns = backburner._timers.splice(0, i);
 
         for (i = 1, l = fns.length; i < l; i += 2) {
-          self.schedule(self.options.defaultQueue, null, fns[i]);
+          backburner.schedule(backburner.options.defaultQueue, null, fns[i]);
         }
       });
 
-      if (timers.length) {
-        updateLaterTimer(self, timers[0], timers[0] - now);
+      if (backburner._timers.length) {
+        updateLaterTimer(backburner, backburner._timers[0], backburner._timers[0] - n);
       }
     }
 
@@ -548,8 +576,8 @@ define("backburner",
     }
 
     function findItem(target, method, collection) {
-      var item,
-          index = -1;
+      var item;
+      var index = -1;
 
       for (var i = 0, l = collection.length; i < l; i++) {
         item = collection[i];
@@ -562,10 +590,31 @@ define("backburner",
       return index;
     }
 
-    function searchTimer(time, timers) {
-      var start = 0,
-          end = timers.length - 2,
-          middle, l;
+    __exports__["default"] = Backburner;
+  });
+enifed("backburner.umd",
+  ["./backburner"],
+  function(__dependency1__) {
+    "use strict";
+    var Backburner = __dependency1__["default"];
+
+    /* global define:true module:true window: true */
+    if (typeof enifed === 'function' && enifed.amd) {
+      enifed(function() { return Backburner; });
+    } else if (typeof module !== 'undefined' && module.exports) {
+      module.exports = Backburner;
+    } else if (typeof this !== 'undefined') {
+      this['Backburner'] = Backburner;
+    }
+  });
+enifed("backburner/binary-search",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    __exports__["default"] = function binarySearch(time, timers) {
+      var start = 0;
+      var end = timers.length - 2;
+      var middle, l;
 
       while (start < end) {
         // since timers is an array of pairs 'l' will always
@@ -585,18 +634,14 @@ define("backburner",
 
       return (time >= timers[start]) ? start + 2 : start;
     }
-
-    __exports__.Backburner = Backburner;
   });
-define("backburner/deferred_action_queues",
-  ["backburner/utils","backburner/queue","exports"],
+enifed("backburner/deferred-action-queues",
+  ["./utils","./queue","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Utils = __dependency1__["default"];
-    var Queue = __dependency2__.Queue;
-
-    var each = Utils.each,
-        isString = Utils.isString;
+    var each = __dependency1__.each;
+    var isString = __dependency1__.isString;
+    var Queue = __dependency2__["default"];
 
     function DeferredActionQueues(queueNames, options) {
       var queues = this.queues = {};
@@ -605,20 +650,20 @@ define("backburner/deferred_action_queues",
       this.options = options;
 
       each(queueNames, function(queueName) {
-        queues[queueName] = new Queue(this, queueName, options);
+        queues[queueName] = new Queue(queueName, options[queueName], options);
       });
     }
 
+    function noSuchQueue(name) {
+      throw new Error("You attempted to schedule an action in a queue (" + name + ") that doesn't exist");
+    }
+
     DeferredActionQueues.prototype = {
-      queueNames: null,
-      queues: null,
-      options: null,
+      schedule: function(name, target, method, args, onceFlag, stack) {
+        var queues = this.queues;
+        var queue = queues[name];
 
-      schedule: function(queueName, target, method, args, onceFlag, stack) {
-        var queues = this.queues,
-            queue = queues[queueName];
-
-        if (!queue) { throw new Error("You attempted to schedule an action in a queue (" + queueName + ") that doesn't exist"); }
+        if (!queue) { noSuchQueue(name); }
 
         if (onceFlag) {
           return queue.pushUnique(target, method, args, stack);
@@ -627,7 +672,7 @@ define("backburner/deferred_action_queues",
         }
       },
 
-      invoke: function(target, method, args, _) {
+      invoke: function(target, method, args, _, _errorRecordedForStack) {
         if (args && args.length > 0) {
           method.apply(target, args);
         } else {
@@ -635,7 +680,7 @@ define("backburner/deferred_action_queues",
         }
       },
 
-      invokeWithOnError: function(target, method, args, onError) {
+      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
         try {
           if (args && args.length > 0) {
             method.apply(target, args);
@@ -643,59 +688,80 @@ define("backburner/deferred_action_queues",
             method.call(target);
           }
         } catch(error) {
-          onError(error);
+          onError(error, errorRecordedForStack);
         }
       },
 
       flush: function() {
-        var queues = this.queues,
-            queueNames = this.queueNames,
-            queueName, queue, queueItems, priorQueueNameIndex,
-            queueNameIndex = 0, numberOfQueues = queueNames.length,
-            options = this.options,
-            onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]),
-            invoke = onError ? this.invokeWithOnError : this.invoke;
+        var queues = this.queues;
+        var queueNames = this.queueNames;
+        var queueName, queue, queueItems, priorQueueNameIndex;
+        var queueNameIndex = 0;
+        var numberOfQueues = queueNames.length;
+        var options = this.options;
+        var onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
+        var invoke = onError ? this.invokeWithOnError : this.invoke;
 
-        outerloop:
         while (queueNameIndex < numberOfQueues) {
           queueName = queueNames[queueNameIndex];
           queue = queues[queueName];
           queueItems = queue._queueBeingFlushed = queue._queue.slice();
           queue._queue = [];
+          queue.targetQueues = Object.create(null);
 
-          var queueOptions = queue.options, // TODO: write a test for this
-              before = queueOptions && queueOptions.before,
-              after = queueOptions && queueOptions.after,
-              target, method, args, stack,
-              queueIndex = 0, numberOfQueueItems = queueItems.length;
+          var queueOptions = queue.options; // TODO: write a test for this
+          var before = queueOptions && queueOptions.before;
+          var after = queueOptions && queueOptions.after;
+          var target, method, args, errorRecordedForStack;
+          var queueIndex = 0;
+          var numberOfQueueItems = queueItems.length;
 
-          if (numberOfQueueItems && before) { before(); }
+          if (numberOfQueueItems && before) {
+            before();
+          }
 
           while (queueIndex < numberOfQueueItems) {
-            target = queueItems[queueIndex];
-            method = queueItems[queueIndex+1];
-            args   = queueItems[queueIndex+2];
-            stack  = queueItems[queueIndex+3]; // Debugging assistance
+            target                = queueItems[queueIndex];
+            method                = queueItems[queueIndex+1];
+            args                  = queueItems[queueIndex+2];
+            errorRecordedForStack = queueItems[queueIndex+3]; // Debugging assistance
 
-            if (isString(method)) { method = target[method]; }
+            //
+
+            if (isString(method)) {
+              method = target[method];
+            }
 
             // method could have been nullified / canceled during flush
             if (method) {
-              invoke(target, method, args, onError);
+              //
+              //    ** Attention intrepid developer **
+              //
+              //    To find out the stack of this task when it was scheduled onto
+              //    the run loop, add the following to your app.js:
+              //
+              //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
+              //
+              //    Once that is in place, when you are at a breakpoint and navigate
+              //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
+              //    which will be the captured stack when this job was scheduled.
+              //
+              invoke(target, method, args, onError, errorRecordedForStack);
             }
 
             queueIndex += 4;
           }
 
           queue._queueBeingFlushed = null;
-          if (numberOfQueueItems && after) { after(); }
+          if (numberOfQueueItems && after) {
+            after();
+          }
 
           if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
             queueNameIndex = priorQueueNameIndex;
-            continue outerloop;
+          } else {
+            queueNameIndex++;
           }
-
-          queueNameIndex++;
         }
       }
     };
@@ -712,60 +778,134 @@ define("backburner/deferred_action_queues",
       return -1;
     }
 
-    __exports__.DeferredActionQueues = DeferredActionQueues;
+    __exports__["default"] = DeferredActionQueues;
   });
-define("backburner/queue",
+enifed("backburner/platform",
   ["exports"],
   function(__exports__) {
     "use strict";
-    function Queue(daq, name, options) {
-      this.daq = daq;
+    // In IE 6-8, try/finally doesn't work without a catch.
+    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
+    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
+    var needsIETryCatchFix = (function(e,x){
+      try{ x(); }
+      catch(e) { } // jshint ignore:line
+      return !!e;
+    })();
+    __exports__.needsIETryCatchFix = needsIETryCatchFix;
+  });
+enifed("backburner/queue",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function Queue(name, options, globalOptions) {
       this.name = name;
-      this.globalOptions = options;
-      this.options = options[name];
+      this.globalOptions = globalOptions || {};
+      this.options = options;
       this._queue = [];
+      this.targetQueues = Object.create(null);
+      this._queueBeingFlushed = undefined;
     }
 
     Queue.prototype = {
-      daq: null,
-      name: null,
-      options: null,
-      onError: null,
-      _queue: null,
-
       push: function(target, method, args, stack) {
         var queue = this._queue;
         queue.push(target, method, args, stack);
-        return {queue: this, target: target, method: method};
+
+        return {
+          queue: this,
+          target: target,
+          method: method
+        };
       },
 
-      pushUnique: function(target, method, args, stack) {
-        var queue = this._queue, currentTarget, currentMethod, i, l;
+      pushUniqueWithoutGuid: function(target, method, args, stack) {
+        var queue = this._queue;
 
-        for (i = 0, l = queue.length; i < l; i += 4) {
-          currentTarget = queue[i];
-          currentMethod = queue[i+1];
+        for (var i = 0, l = queue.length; i < l; i += 4) {
+          var currentTarget = queue[i];
+          var currentMethod = queue[i+1];
 
           if (currentTarget === target && currentMethod === method) {
-            queue[i+2] = args; // replace args
+            queue[i+2] = args;  // replace args
             queue[i+3] = stack; // replace stack
-            return {queue: this, target: target, method: method};
+            return;
           }
         }
 
         queue.push(target, method, args, stack);
-        return {queue: this, target: target, method: method};
+      },
+
+      targetQueue: function(targetQueue, target, method, args, stack) {
+        var queue = this._queue;
+
+        for (var i = 0, l = targetQueue.length; i < l; i += 4) {
+          var currentMethod = targetQueue[i];
+          var currentIndex  = targetQueue[i + 1];
+
+          if (currentMethod === method) {
+            queue[currentIndex + 2] = args;  // replace args
+            queue[currentIndex + 3] = stack; // replace stack
+            return;
+          }
+        }
+
+        targetQueue.push(
+          method,
+          queue.push(target, method, args, stack) - 4
+        );
+      },
+
+      pushUniqueWithGuid: function(guid, target, method, args, stack) {
+        var hasLocalQueue = this.targetQueues[guid];
+
+        if (hasLocalQueue) {
+          this.targetQueue(hasLocalQueue, target, method, args, stack);
+        } else {
+          this.targetQueues[guid] = [
+            method,
+            this._queue.push(target, method, args, stack) - 4
+          ];
+        }
+
+        return {
+          queue: this,
+          target: target,
+          method: method
+        };
+      },
+
+      pushUnique: function(target, method, args, stack) {
+        var queue = this._queue, currentTarget, currentMethod, i, l;
+        var KEY = this.globalOptions.GUID_KEY;
+
+        if (target && KEY) {
+          var guid = target[KEY];
+          if (guid) {
+            return this.pushUniqueWithGuid(guid, target, method, args, stack);
+          }
+        }
+
+        this.pushUniqueWithoutGuid(target, method, args, stack);
+
+        return {
+          queue: this,
+          target: target,
+          method: method
+        };
       },
 
       // TODO: remove me, only being used for Ember.run.sync
       flush: function() {
-        var queue = this._queue,
-            globalOptions = this.globalOptions,
-            options = this.options,
-            before = options && options.before,
-            after = options && options.after,
-            onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]),
-            target, method, args, stack, i, l = queue.length;
+        var queue = this._queue;
+        var globalOptions = this.globalOptions;
+        var options = this.options;
+        var before = options && options.before;
+        var after = options && options.after;
+        var onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]);
+        var target, method, args, stack, i, l = queue.length;
+
+        this.targetQueues = Object.create(null);
 
         if (l && before) { before(); }
         for (i = 0; i < l; i += 4) {
@@ -810,12 +950,28 @@ define("backburner/queue",
 
       cancel: function(actionToCancel) {
         var queue = this._queue, currentTarget, currentMethod, i, l;
+        var target = actionToCancel.target;
+        var method = actionToCancel.method;
+        var GUID_KEY = this.globalOptions.GUID_KEY;
+
+        if (GUID_KEY && this.targetQueues && target) {
+          var targetQueue = this.targetQueues[target[GUID_KEY]];
+
+          if (targetQueue) {
+            for (i = 0, l = targetQueue.length; i < l; i++) {
+              if (targetQueue[i] === method) {
+                targetQueue.splice(i, 1);
+              }
+            }
+          }
+        }
 
         for (i = 0, l = queue.length; i < l; i += 4) {
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+          if (currentTarget === target &&
+              currentMethod === method) {
             queue.splice(i, 4);
             return true;
           }
@@ -831,7 +987,8 @@ define("backburner/queue",
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+          if (currentTarget === target &&
+              currentMethod === method) {
             // don't mess with array during flush
             // just nullify the method
             queue[i+1] = null;
@@ -841,44 +998,63 @@ define("backburner/queue",
       }
     };
 
-    __exports__.Queue = Queue;
+    __exports__["default"] = Queue;
   });
-define("backburner/utils",
+enifed("backburner/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
-    __exports__["default"] = {
-      each: function(collection, callback) {
-        for (var i = 0; i < collection.length; i++) {
-          callback(collection[i]);
-        }
-      },
+    var NUMBER = /\d+/;
 
-      isString: function(suspect) {
-        return typeof suspect === 'string';
-      },
-
-      isFunction: function(suspect) {
-        return typeof suspect === 'function';
-      },
-
-      isNumber: function(suspect) {
-        return typeof suspect === 'number';
+    function each(collection, callback) {
+      for (var i = 0; i < collection.length; i++) {
+        callback(collection[i]);
       }
-    };
-  });
+    }
 
-define("calculateVersion",
+    __exports__.each = each;// Date.now is not available in browsers < IE9
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/now#Compatibility
+    var now = Date.now || function() { return new Date().getTime(); };
+    __exports__.now = now;
+    function isString(suspect) {
+      return typeof suspect === 'string';
+    }
+
+    __exports__.isString = isString;function isFunction(suspect) {
+      return typeof suspect === 'function';
+    }
+
+    __exports__.isFunction = isFunction;function isNumber(suspect) {
+      return typeof suspect === 'number';
+    }
+
+    __exports__.isNumber = isNumber;function isCoercableNumber(number) {
+      return isNumber(number) || NUMBER.test(number);
+    }
+
+    __exports__.isCoercableNumber = isCoercableNumber;function wrapInTryCatch(func) {
+      return function () {
+        try {
+          return func.apply(this, arguments);
+        } catch (e) {
+          throw e;
+        }
+      };
+    }
+
+    __exports__.wrapInTryCatch = wrapInTryCatch;
+  });
+enifed("calculateVersion",
   [],
   function() {
     "use strict";
     'use strict';
 
-    var fs   = require('fs');
-    var path = require('path');
+    var fs   = eriuqer('fs');
+    var path = eriuqer('path');
 
     module.exports = function () {
-      var packageVersion = require('../package.json').version;
+      var packageVersion = eriuqer('../package.json').version;
       var output         = [packageVersion];
       var gitPath        = path.join(__dirname,'..','.git');
       var headFilePath   = path.join(gitPath, 'HEAD');
@@ -909,7 +1085,7 @@ define("calculateVersion",
       }
     };
   });
-define("container",
+enifed("container",
   ["container/container","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -936,13 +1112,14 @@ define("container",
 
     __exports__["default"] = Container;
   });
-define("container/container",
-  ["container/inheriting_dict","ember-metal/core","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("container/container",
+  ["ember-metal/core","ember-metal/keys","ember-metal/dictionary","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var InheritingDict = __dependency1__["default"];
-    var Ember = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
     // Ember.assert
+    var emberKeys = __dependency2__["default"];
+    var dictionary = __dependency3__["default"];
 
     // A lightweight container that helps to assemble and decouple components.
     // Public api for the container is still in flux.
@@ -953,18 +1130,19 @@ define("container/container",
 
       this.resolver = parent && parent.resolver || function() {};
 
-      this.registry = new InheritingDict(parent && parent.registry);
-      this.cache = new InheritingDict(parent && parent.cache);
-      this.factoryCache = new InheritingDict(parent && parent.factoryCache);
-      this.resolveCache = new InheritingDict(parent && parent.resolveCache);
-      this.typeInjections = new InheritingDict(parent && parent.typeInjections);
-      this.injections = {};
+      this.registry       = dictionary(parent ? parent.registry : null);
+      this.cache          = dictionary(parent ? parent.cache : null);
+      this.factoryCache   = dictionary(parent ? parent.factoryCache : null);
+      this.resolveCache   = dictionary(parent ? parent.resolveCache : null);
+      this.typeInjections = dictionary(parent ? parent.typeInjections : null);
+      this.injections     = dictionary(null);
+      this.normalizeCache = dictionary(null);
 
-      this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
-      this.factoryInjections = {};
+      this.factoryTypeInjections = dictionary(parent ? parent.factoryTypeInjections : null);
+      this.factoryInjections     = dictionary(null);
 
-      this._options = new InheritingDict(parent && parent._options);
-      this._typeOptions = new InheritingDict(parent && parent._typeOptions);
+      this._options     = dictionary(parent ? parent._options : null);
+      this._typeOptions = dictionary(parent ? parent._typeOptions : null);
     }
 
     Container.prototype = {
@@ -1085,12 +1263,12 @@ define("container/container",
 
         var normalizedName = this.normalize(fullName);
 
-        if (this.cache.has(normalizedName)) {
+        if (normalizedName in this.cache) {
           throw new Error('Cannot re-register: `' + fullName +'`, as it has already been looked up.');
         }
 
-        this.registry.set(normalizedName, factory);
-        this._options.set(normalizedName, options || {});
+        this.registry[normalizedName] = factory;
+        this._options[normalizedName] = (options || {});
       },
 
       /**
@@ -1114,11 +1292,11 @@ define("container/container",
 
         var normalizedName = this.normalize(fullName);
 
-        this.registry.remove(normalizedName);
-        this.cache.remove(normalizedName);
-        this.factoryCache.remove(normalizedName);
-        this.resolveCache.remove(normalizedName);
-        this._options.remove(normalizedName);
+        delete this.registry[normalizedName];
+        delete this.cache[normalizedName];
+        delete this.factoryCache[normalizedName];
+        delete this.resolveCache[normalizedName];
+        delete this._options[normalizedName];
       },
 
       /**
@@ -1177,12 +1355,25 @@ define("container/container",
       /**
         A hook to enable custom fullName normalization behaviour
 
+        @method normalizeFullName
+        @param {String} fullName
+        @return {string} normalized fullName
+      */
+      normalizeFullName: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        normalize a fullName based on the applications conventions
+
         @method normalize
         @param {String} fullName
         @return {string} normalized fullName
       */
       normalize: function(fullName) {
-        return fullName;
+        return this.normalizeCache[fullName] || (
+          this.normalizeCache[fullName] = this.normalizeFullName(fullName)
+        );
       },
 
       /**
@@ -1295,7 +1486,7 @@ define("container/container",
       optionsForType: function(type, options) {
         if (this.parent) { illegalChildOperation('optionsForType'); }
 
-        this._typeOptions.set(type, options);
+        this._typeOptions[type] = options;
       },
 
       /**
@@ -1344,12 +1535,14 @@ define("container/container",
       */
       typeInjection: function(type, property, fullName) {
         Ember.assert('fullName must be a proper full name', validateFullName(fullName));
+
         if (this.parent) { illegalChildOperation('typeInjection'); }
 
         var fullNameType = fullName.split(':')[0];
-        if(fullNameType === type) {
+        if (fullNameType === type) {
           throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s). Register the `' + fullName + '` as a different type and perform the typeInjection.');
         }
+
         addTypeInjection(this.typeInjections, type, property, fullName);
       },
 
@@ -1410,7 +1603,7 @@ define("container/container",
         Ember.assert('fullName must be a proper full name', validateFullName(fullName));
         var normalizedName = this.normalize(fullName);
 
-        if (this.cache.has(normalizedName)) {
+        if (this.cache[normalizedName]) {
           throw new Error("Attempted to register an injection for a type that has already been looked up. ('" + normalizedName + "', '" + property + "', '" + injectionName + "')");
         }
         addInjection(this.injections, normalizedName, property, normalizedInjectionName);
@@ -1515,7 +1708,7 @@ define("container/container",
 
         Ember.assert('fullName must be a proper full name', validateFullName(fullName));
 
-        if (this.factoryCache.has(normalizedName)) {
+        if (this.factoryCache[normalizedName]) {
           throw new Error('Attempted to register a factoryInjection for a type that has already ' +
             'been looked up. (\'' + normalizedName + '\', \'' + property + '\', \'' + injectionName + '\')');
         }
@@ -1557,17 +1750,17 @@ define("container/container",
     };
 
     function resolve(container, normalizedName) {
-      var cached = container.resolveCache.get(normalizedName);
+      var cached = container.resolveCache[normalizedName];
       if (cached) { return cached; }
 
-      var resolved = container.resolver(normalizedName) || container.registry.get(normalizedName);
-      container.resolveCache.set(normalizedName, resolved);
+      var resolved = container.resolver(normalizedName) || container.registry[normalizedName];
+      container.resolveCache[normalizedName] = resolved;
 
       return resolved;
     }
 
     function has(container, fullName){
-      if (container.cache.has(fullName)) {
+      if (container.cache[fullName]) {
         return true;
       }
 
@@ -1577,8 +1770,8 @@ define("container/container",
     function lookup(container, fullName, options) {
       options = options || {};
 
-      if (container.cache.has(fullName) && options.singleton !== false) {
-        return container.cache.get(fullName);
+      if (container.cache[fullName] && options.singleton !== false) {
+        return container.cache[fullName];
       }
 
       var value = instantiate(container, fullName);
@@ -1586,7 +1779,7 @@ define("container/container",
       if (value === undefined) { return; }
 
       if (isSingleton(container, fullName) && options.singleton !== false) {
-        container.cache.set(fullName, value);
+        container.cache[fullName] = value;
       }
 
       return value;
@@ -1624,14 +1817,14 @@ define("container/container",
     }
 
     function option(container, fullName, optionName) {
-      var options = container._options.get(fullName);
+      var options = container._options[fullName];
 
       if (options && options[optionName] !== undefined) {
         return options[optionName];
       }
 
       var type = fullName.split(':')[0];
-      options = container._typeOptions.get(type);
+      options = container._typeOptions[type];
 
       if (options) {
         return options[optionName];
@@ -1640,8 +1833,8 @@ define("container/container",
 
     function factoryFor(container, fullName) {
       var cache = container.factoryCache;
-      if (cache.has(fullName)) {
-        return cache.get(fullName);
+      if (cache[fullName]) {
+        return cache[fullName];
       }
       var factory = container.resolve(fullName);
       if (factory === undefined) { return; }
@@ -1650,6 +1843,7 @@ define("container/container",
       if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
         // TODO: think about a 'safe' merge style extension
         // for now just fallback to create time injection
+        cache[fullName] = factory;
         return factory;
       } else {
         var injections = injectionsFor(container, fullName);
@@ -1660,18 +1854,18 @@ define("container/container",
         var injectedFactory = factory.extend(injections);
         injectedFactory.reopenClass(factoryInjections);
 
-        cache.set(fullName, injectedFactory);
+        cache[fullName] = injectedFactory;
 
         return injectedFactory;
       }
     }
 
     function injectionsFor(container, fullName) {
-      var splitName = fullName.split(':'),
-        type = splitName[0],
-        injections = [];
+      var splitName = fullName.split(':');
+      var type = splitName[0];
+      var injections = [];
 
-      injections = injections.concat(container.typeInjections.get(type) || []);
+      injections = injections.concat(container.typeInjections[type] || []);
       injections = injections.concat(container.injections[fullName] || []);
 
       injections = buildInjections(container, injections);
@@ -1682,11 +1876,11 @@ define("container/container",
     }
 
     function factoryInjectionsFor(container, fullName) {
-      var splitName = fullName.split(':'),
-        type = splitName[0],
-        factoryInjections = [];
+      var splitName = fullName.split(':');
+      var type = splitName[0];
+      var factoryInjections = [];
 
-      factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
+      factoryInjections = factoryInjections.concat(container.factoryTypeInjections[type] || []);
       factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
 
       factoryInjections = buildInjections(container, factoryInjections);
@@ -1721,26 +1915,34 @@ define("container/container",
     }
 
     function eachDestroyable(container, callback) {
-      container.cache.eachLocal(function(key, value) {
-        if (option(container, key, 'instantiate') === false) { return; }
-        callback(value);
-      });
+      var cache = container.cache;
+      var keys = emberKeys(cache);
+      var key, value;
+
+      for (var i = 0, l = keys.length; i < l; i++) {
+        key = keys[i];
+        value = cache[key];
+
+        if (option(container, key, 'instantiate') !== false) {
+          callback(value);
+        }
+      }
     }
 
     function resetCache(container) {
-      container.cache.eachLocal(function(key, value) {
-        if (option(container, key, 'instantiate') === false) { return; }
+      eachDestroyable(container, function(value) {
         value.destroy();
       });
-      container.cache.dict = {};
+
+      container.cache.dict = dictionary(null);
     }
 
     function addTypeInjection(rules, type, property, fullName) {
-      var injections = rules.get(type);
+      var injections = rules[type];
 
       if (!injections) {
         injections = [];
-        rules.set(type, injections);
+        rules[type] = injections;
       }
 
       injections.push({
@@ -1759,126 +1961,15 @@ define("container/container",
 
     function addInjection(rules, factoryName, property, injectionName) {
       var injections = rules[factoryName] = rules[factoryName] || [];
-      injections.push({ property: property, fullName: injectionName });
+      injections.push({
+        property: property,
+        fullName: injectionName
+      });
     }
 
     __exports__["default"] = Container;
   });
-define("container/inheriting_dict",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    // A safe and simple inheriting object.
-    function InheritingDict(parent) {
-      this.parent = parent;
-      this.dict = {};
-    }
-
-    InheritingDict.prototype = {
-
-      /**
-        @property parent
-        @type InheritingDict
-        @default null
-      */
-
-      parent: null,
-
-      /**
-        Object used to store the current nodes data.
-
-        @property dict
-        @type Object
-        @default Object
-      */
-      dict: null,
-
-      /**
-        Retrieve the value given a key, if the value is present at the current
-        level use it, otherwise walk up the parent hierarchy and try again. If
-        no matching key is found, return undefined.
-
-        @method get
-        @param {String} key
-        @return {any}
-      */
-      get: function(key) {
-        var dict = this.dict;
-
-        if (dict.hasOwnProperty(key)) {
-          return dict[key];
-        }
-
-        if (this.parent) {
-          return this.parent.get(key);
-        }
-      },
-
-      /**
-        Set the given value for the given key, at the current level.
-
-        @method set
-        @param {String} key
-        @param {Any} value
-      */
-      set: function(key, value) {
-        this.dict[key] = value;
-      },
-
-      /**
-        Delete the given key
-
-        @method remove
-        @param {String} key
-      */
-      remove: function(key) {
-        delete this.dict[key];
-      },
-
-      /**
-        Check for the existence of given a key, if the key is present at the current
-        level return true, otherwise walk up the parent hierarchy and try again. If
-        no matching key is found, return false.
-
-        @method has
-        @param {String} key
-        @return {Boolean}
-      */
-      has: function(key) {
-        var dict = this.dict;
-
-        if (dict.hasOwnProperty(key)) {
-          return true;
-        }
-
-        if (this.parent) {
-          return this.parent.has(key);
-        }
-
-        return false;
-      },
-
-      /**
-        Iterate and invoke a callback for each local key-value pair.
-
-        @method eachLocal
-        @param {Function} callback
-        @param {Object} binding
-      */
-      eachLocal: function(callback, binding) {
-        var dict = this.dict;
-
-        for (var prop in dict) {
-          if (dict.hasOwnProperty(prop)) {
-            callback.call(binding, prop, dict[prop]);
-          }
-        }
-      }
-    };
-
-    __exports__["default"] = InheritingDict;
-  });
-define("ember-application",
+enifed("ember-application",
   ["ember-metal/core","ember-runtime/system/lazy_load","ember-application/system/dag","ember-application/system/resolver","ember-application/system/application","ember-application/ext/controller"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
@@ -1906,7 +1997,7 @@ define("ember-application",
 
     runLoadHooks('Ember.Application', Application);
   });
-define("ember-application/ext/controller",
+enifed("ember-application/ext/controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/utils","ember-metal/computed","ember-runtime/mixins/controller","ember-routing/system/controller_for","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -1927,7 +2018,8 @@ define("ember-application/ext/controller",
     var controllerFor = __dependency8__["default"];
 
     function verifyNeedsDependencies(controller, container, needs) {
-      var dependency, i, l, missing = [];
+      var dependency, i, l;
+      var missing = [];
 
       for (i=0, l=needs.length; i<l; i++) {
         dependency = needs[i];
@@ -1955,8 +2047,9 @@ define("ember-application/ext/controller",
         needs: get(controller, 'needs'),
         container: get(controller, 'container'),
         unknownProperty: function(controllerName) {
-          var needs = this.needs,
-            dependency, i, l;
+          var needs = this.needs;
+          var dependency, i, l;
+
           for (i=0, l=needs.length; i<l; i++) {
             dependency = needs[i];
             if (dependency === controllerName) {
@@ -2084,9 +2177,9 @@ define("ember-application/ext/controller",
 
     __exports__["default"] = ControllerMixin;
   });
-define("ember-application/system/application",
-  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-views/system/event_dispatcher","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-routing/system/cache","ember-metal/core","ember-handlebars-compiler","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __exports__) {
+enifed("ember-application/system/application",
+  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-handlebars/controls/select","ember-views/system/event_dispatcher","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-routing/system/cache","ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -2110,21 +2203,31 @@ define("ember-application/system/application",
     var EnumerableUtils = __dependency14__["default"];
     var ObjectController = __dependency15__["default"];
     var ArrayController = __dependency16__["default"];
-    var EventDispatcher = __dependency17__["default"];
+    var SelectView = __dependency17__["default"];
+    var EventDispatcher = __dependency18__["default"];
     //import ContainerDebugAdapter from "ember-extension-support/container_debug_adapter";
-    var jQuery = __dependency18__["default"];
-    var Route = __dependency19__["default"];
-    var Router = __dependency20__["default"];
-    var HashLocation = __dependency21__["default"];
-    var HistoryLocation = __dependency22__["default"];
-    var AutoLocation = __dependency23__["default"];
-    var NoneLocation = __dependency24__["default"];
-    var BucketCache = __dependency25__["default"];
+    var jQuery = __dependency19__["default"];
+    var Route = __dependency20__["default"];
+    var Router = __dependency21__["default"];
+    var HashLocation = __dependency22__["default"];
+    var HistoryLocation = __dependency23__["default"];
+    var AutoLocation = __dependency24__["default"];
+    var NoneLocation = __dependency25__["default"];
+    var BucketCache = __dependency26__["default"];
 
-    var K = __dependency26__.K;
-    var EmberHandlebars = __dependency27__["default"];
+    var K = __dependency27__.K;
+    var EmberHandlebars = __dependency28__["default"];
 
     var ContainerDebugAdapter;
+    function props(obj) {
+      var properties = [];
+
+      for (var key in obj) {
+        properties.push(key);
+      }
+
+      return properties;
+    }
 
     /**
       An instance of `Ember.Application` is the starting point for every Ember
@@ -2344,7 +2447,7 @@ define("ember-application/system/application",
 
         this.scheduleInitialize();
 
-        Ember.libraries.registerCoreLibrary('Handlebars', EmberHandlebars.VERSION);
+        Ember.libraries.registerCoreLibrary('Handlebars' + (EmberHandlebars.compile ? '' : '-runtime'), EmberHandlebars.VERSION);
         Ember.libraries.registerCoreLibrary('jQuery', jQuery().jquery);
 
         if ( Ember.LOG_VERSION ) {
@@ -2741,20 +2844,21 @@ define("ember-application/system/application",
         @method runInitializers
       */
       runInitializers: function() {
-        var initializers = get(this.constructor, 'initializers');
+        var initializersByName = get(this.constructor, 'initializers');
+        var initializers = props(initializersByName);
         var container = this.__container__;
         var graph = new DAG();
         var namespace = this;
         var name, initializer;
 
-        for (name in initializers) {
-          initializer = initializers[name];
+        for (var i = 0; i < initializers.length; i++) {
+          initializer = initializersByName[initializers[i]];
           graph.addEdges(initializer.name, initializer.initialize, initializer.before, initializer.after);
         }
 
         graph.topsort(function (vertex) {
           var initializer = vertex.value;
-          Ember.assert("No application initializer named '"+vertex.name+"'", initializer);
+          Ember.assert("No application initializer named '" + vertex.name + "'", initializer);
           initializer(container, namespace);
         });
       },
@@ -2864,7 +2968,7 @@ define("ember-application/system/application",
     });
 
     Application.reopenClass({
-      initializers: {},
+      initializers: create(null),
 
       /**
         Initializer receives an object which has the following attributes:
@@ -3032,9 +3136,9 @@ define("ember-application/system/application",
         var container = new Container();
 
         container.set = set;
-        container.resolver  = resolverFor(namespace);
-        container.normalize = container.resolver.normalize;
-        container.describe  = container.resolver.describe;
+        container.resolver = resolverFor(namespace);
+        container.normalizeFullName = container.resolver.normalize;
+        container.describe = container.resolver.describe;
         container.makeToString = container.resolver.makeToString;
 
         container.optionsForType('component', { singleton: false });
@@ -3047,6 +3151,9 @@ define("ember-application/system/application",
         container.register('controller:basic', Controller, { instantiate: false });
         container.register('controller:object', ObjectController, { instantiate: false });
         container.register('controller:array', ArrayController, { instantiate: false });
+
+        container.register('view:select', SelectView);
+
         container.register('route:basic', Route, { instantiate: false });
         container.register('event_dispatcher:main', EventDispatcher);
 
@@ -3137,7 +3244,7 @@ define("ember-application/system/application",
 
     __exports__["default"] = Application;
   });
-define("ember-application/system/dag",
+enifed("ember-application/system/dag",
   ["ember-metal/error","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -3180,7 +3287,22 @@ define("ember-application/system/dag",
      */
     function DAG() {
       this.names = [];
-      this.vertices = {};
+      this.vertices = Object.create(null);
+    }
+
+    /**
+     * DAG Vertex
+     *
+     * @class Vertex
+     * @constructor
+     */
+
+    function Vertex(name) {
+      this.name = name;
+      this.incoming = {};
+      this.incomingNames = [];
+      this.hasOutgoing = false;
+      this.value = null;
     }
 
     /**
@@ -3191,13 +3313,13 @@ define("ember-application/system/dag",
      * @param {String} name The name of the vertex to add
      */
     DAG.prototype.add = function(name) {
-      if (!name) { return; }
-      if (this.vertices.hasOwnProperty(name)) {
+      if (!name) {
+        throw new Error("Can't add Vertex without name");
+      }
+      if (this.vertices[name] !== undefined) {
         return this.vertices[name];
       }
-      var vertex = {
-        name: name, incoming: {}, incomingNames: [], hasOutgoing: false, value: null
-      };
+      var vertex = new Vertex(name);
       this.vertices[name] = vertex;
       this.names.push(name);
       return vertex;
@@ -3217,7 +3339,7 @@ define("ember-application/system/dag",
 
     /**
      * Connects the vertices with the given names, adding them to the graph if
-     * necesary, only if this does not produce is any circular dependency.
+     * necessary, only if this does not produce is any circular dependency.
      *
      * @private
      * @method addEdge
@@ -3228,7 +3350,8 @@ define("ember-application/system/dag",
       if (!fromName || !toName || fromName === toName) {
         return;
       }
-      var from = this.add(fromName), to = this.add(toName);
+      var from = this.add(fromName);
+      var to = this.add(toName);
       if (to.incoming.hasOwnProperty(fromName)) {
         return;
       }
@@ -3307,9 +3430,9 @@ define("ember-application/system/dag",
 
     __exports__["default"] = DAG;
   });
-define("ember-application/system/resolver",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+enifed("ember-application/system/resolver",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","ember-metal/dictionary","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -3414,6 +3537,7 @@ define("ember-application/system/resolver",
       @namespace Ember
       @extends Ember.Object
     */
+    var dictionary = __dependency8__["default"];
 
     __exports__["default"] = EmberObject.extend({
       /**
@@ -3424,10 +3548,13 @@ define("ember-application/system/resolver",
       */
       namespace: null,
 
+      init: function() {
+        this._parseNameCache = dictionary(null);
+      },
       normalize: function(fullName) {
-        var split = fullName.split(':', 2),
-            type = split[0],
-            name = split[1];
+        var split = fullName.split(':', 2);
+        var type = split[0];
+        var name = split[1];
 
         Ember.assert("Tried to normalize a container name without a colon (:) in it. You probably tried to lookup a name that did not contain a type, a colon, and a name. A proper lookup name would be `view:post`.", split.length === 2);
 
@@ -3435,11 +3562,15 @@ define("ember-application/system/resolver",
           var result = name;
 
           if (result.indexOf('.') > -1) {
-            result = result.replace(/\.(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+            result = result.replace(/\.(.)/g, function(m) {
+              return m.charAt(1).toUpperCase();
+            });
           }
 
           if (name.indexOf('_') > -1) {
-            result = result.replace(/_(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+            result = result.replace(/_(.)/g, function(m) {
+              return m.charAt(1).toUpperCase();
+            });
           }
 
           return type + ':' + result;
@@ -3459,9 +3590,9 @@ define("ember-application/system/resolver",
         @return {Object} the resolved factory
       */
       resolve: function(fullName) {
-        var parsedName = this.parseName(fullName),
-            resolveMethodName = parsedName.resolveMethodName,
-            resolved;
+        var parsedName = this.parseName(fullName);
+        var resolveMethodName = parsedName.resolveMethodName;
+        var resolved;
 
         if (!(parsedName.name && parsedName.type)) {
           throw new TypeError('Invalid fullName: `' + fullName + '`, must be of the form `type:name` ');
@@ -3490,12 +3621,19 @@ define("ember-application/system/resolver",
         @param {String} fullName the lookup string
         @method parseName
       */
+
       parseName: function(fullName) {
-        var nameParts = fullName.split(':'),
-            type = nameParts[0], fullNameWithoutType = nameParts[1],
-            name = fullNameWithoutType,
-            namespace = get(this, 'namespace'),
-            root = namespace;
+        return this._parseNameCache[fullName] || (
+          this._parseNameCache[fullName] = this._parseName(fullName)
+        );
+      },
+
+      _parseName: function(fullName) {
+        var nameParts = fullName.split(':');
+        var type = nameParts[0], fullNameWithoutType = nameParts[1];
+        var name = fullNameWithoutType;
+        var namespace = get(this, 'namespace');
+        var root = namespace;
 
         if (type !== 'template' && name.indexOf('/') !== -1) {
           var parts = name.split('/');
@@ -3534,7 +3672,10 @@ define("ember-application/system/resolver",
         }
 
         var description = parsedName.root + '.' + classify(parsedName.name);
-        if (parsedName.type !== 'model') { description += classify(parsedName.type); }
+
+        if (parsedName.type !== 'model') {
+          description += classify(parsedName.type);
+        }
 
         return description;
       },
@@ -3577,6 +3718,7 @@ define("ember-application/system/resolver",
           return Ember.TEMPLATES[templateName];
         }
       },
+
       /**
         Lookup the view using `resolveOther`
 
@@ -3589,6 +3731,7 @@ define("ember-application/system/resolver",
         this.useRouterNaming(parsedName);
         return this.resolveOther(parsedName);
       },
+
       /**
         Lookup the controller using `resolveOther`
 
@@ -3677,7 +3820,7 @@ define("ember-application/system/resolver",
       }
     });
   });
-define("ember-debug",
+enifed("ember-debug",
   ["ember-metal/core","ember-metal/error","ember-metal/logger"],
   function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
@@ -3776,7 +3919,9 @@ define("ember-debug",
       try { __fail__.fail(); } catch (e) { error = e; }
 
       if (Ember.LOG_STACKTRACE_ON_DEPRECATION && error.stack) {
-        var stack, stackStr = '';
+        var stack;
+        var stackStr = '';
+
         if (error['arguments']) {
           // Chrome
           stack = error.stack.replace(/^\s+at\s+/gm, '').
@@ -3868,7 +4013,7 @@ define("ember-debug",
       }
     }
   });
-define("ember-extension-support",
+enifed("ember-extension-support",
   ["ember-metal/core","ember-extension-support/data_adapter","ember-extension-support/container_debug_adapter"],
   function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
@@ -3887,7 +4032,7 @@ define("ember-extension-support",
     Ember.DataAdapter = DataAdapter;
     Ember.ContainerDebugAdapter = ContainerDebugAdapter;
   });
-define("ember-extension-support/container_debug_adapter",
+enifed("ember-extension-support/container_debug_adapter",
   ["ember-metal/core","ember-runtime/system/native_array","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -3964,7 +4109,7 @@ define("ember-extension-support/container_debug_adapter",
         classes in the resolver for a given type.
 
         @method canCatalogEntriesByType
-        @param {string} type The type. e.g. "model", "controller", "route"
+        @param {String} type The type. e.g. "model", "controller", "route"
         @return {boolean} whether a list is available for this type.
       */
       canCatalogEntriesByType: function(type) {
@@ -3976,7 +4121,7 @@ define("ember-extension-support/container_debug_adapter",
         Returns the available classes a given type.
 
         @method catalogEntriesByType
-        @param {string} type The type. e.g. "model", "controller", "route"
+        @param {String} type The type. e.g. "model", "controller", "route"
         @return {Array} An array of strings.
       */
       catalogEntriesByType: function(type) {
@@ -4000,7 +4145,7 @@ define("ember-extension-support/container_debug_adapter",
       }
     });
   });
-define("ember-extension-support/data_adapter",
+enifed("ember-extension-support/data_adapter",
   ["ember-metal/core","ember-metal/property_get","ember-metal/run_loop","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/native_array","ember-application/system/application","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -4138,8 +4283,10 @@ define("ember-extension-support/data_adapter",
         @return {Function} Method to call to remove all observers
       */
       watchModelTypes: function(typesAdded, typesUpdated) {
-        var modelTypes = this.getModelTypes(),
-            self = this, typesToSend, releaseMethods = emberA();
+        var modelTypes = this.getModelTypes();
+        var self = this;
+        var releaseMethods = emberA();
+        var typesToSend;
 
         typesToSend = modelTypes.map(function(type) {
           var klass = type.klass;
@@ -4280,7 +4427,8 @@ define("ember-extension-support/data_adapter",
       */
 
       observeModelType: function(type, typesUpdated) {
-        var self = this, records = this.getRecords(type);
+        var self = this;
+        var records = this.getRecords(type);
 
         var onChange = function() {
           typesUpdated([self.wrapModelType(type)]);
@@ -4320,8 +4468,9 @@ define("ember-extension-support/data_adapter",
           release: {Function} The function to remove observers
       */
       wrapModelType: function(type, name) {
-        var release, records = this.getRecords(type),
-            typeToSend, self = this;
+        var records = this.getRecords(type);
+        var self = this;
+        var release, typeToSend;
 
         typeToSend = {
           name: name || type.toString(),
@@ -4343,8 +4492,9 @@ define("ember-extension-support/data_adapter",
         @return {Array} Array of model types
       */
       getModelTypes: function() {
-        var types, self = this,
-            containerDebugAdapter = this.get('containerDebugAdapter');
+        var self = this;
+        var containerDebugAdapter = this.get('containerDebugAdapter');
+        var types;
 
         if (containerDebugAdapter.canCatalogEntriesByType('model')) {
           types = containerDebugAdapter.catalogEntriesByType('model');
@@ -4375,9 +4525,9 @@ define("ember-extension-support/data_adapter",
         @return {Array} Array of model type strings
       */
       _getObjectsOnNamespaces: function() {
-        var namespaces = emberA(Namespace.NAMESPACES),
-            types = emberA(),
-            self = this;
+        var namespaces = emberA(Namespace.NAMESPACES);
+        var types = emberA();
+        var self = this;
 
         namespaces.forEach(function(namespace) {
           for (var key in namespace) {
@@ -4420,7 +4570,9 @@ define("ember-extension-support/data_adapter",
         searchKeywords: {Array}
       */
       wrapRecord: function(record) {
-        var recordToSend = { object: record }, columnValues = {}, self = this;
+        var recordToSend = { object: record };
+        var columnValues = {};
+        var self = this;
 
         recordToSend.columnValues = this.getRecordColumnValues(record);
         recordToSend.searchKeywords = this.getRecordKeywords(record);
@@ -4493,17 +4645,21 @@ define("ember-extension-support/data_adapter",
       }
     });
   });
-define("ember-extension-support/initializers",
+enifed("ember-extension-support/initializers",
   [],
   function() {
     "use strict";
 
   });
-define("ember-handlebars-compiler",
+enifed("ember-handlebars-compiler",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
-    "use strict";
-    /* global Handlebars:true */
+        /* global Handlebars:true */
+
+    // Remove "use strict"; from transpiled module (in browser builds only) until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
 
     /**
     @module ember
@@ -4528,8 +4684,8 @@ define("ember-handlebars-compiler",
     // ES6Todo: when ember-debug is es6'ed import this.
     // var emberAssert = Ember.assert;
     var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars);
-    if (!Handlebars && typeof require === 'function') {
-      Handlebars = require('handlebars');
+    if (!Handlebars && typeof eriuqer === 'function') {
+      Handlebars = eriuqer('handlebars');
     }
 
     Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1. Include " +
@@ -4598,7 +4754,7 @@ define("ember-handlebars-compiler",
       Which is functionally equivalent to:
 
       ```handlebars
-      {{view App.CalendarView}}
+      {{view 'calendar'}}
       ```
 
       Options in the helper will be passed to the view in exactly the same
@@ -4711,14 +4867,14 @@ define("ember-handlebars-compiler",
     // This can go away once the following is closed:
     // https://github.com/wycats/handlebars.js/issues/634
 
-    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
-        BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/,
-        INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
+    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/;
+    var BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/;
+    var INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
 
     EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
-      var helperInvocation = source[source.length - 1],
-          helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
-          matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
+      var helperInvocation = source[source.length - 1];
+      var helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1];
+      var matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
 
       source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
     };
@@ -4771,12 +4927,12 @@ define("ember-handlebars-compiler",
       @method precompile
       @for Ember.Handlebars
       @static
-      @param {String} string The template to precompile
+      @param {String|Object} value The template to precompile or an Handlebars AST
       @param {Boolean} asObject optional parameter, defaulting to true, of whether or not the
                                 compiled template should be returned as an Object or a String
     */
-    EmberHandlebars.precompile = function(string, asObject) {
-      var ast = Handlebars.parse(string);
+    EmberHandlebars.precompile = function(value, asObject) {
+      var ast = Handlebars.parse(value);
 
       var options = {
         knownHelpers: {
@@ -4825,7 +4981,7 @@ define("ember-handlebars-compiler",
 
     __exports__["default"] = EmberHandlebars;
   });
-define("ember-handlebars",
+enifed("ember-handlebars",
   ["ember-handlebars-compiler","ember-metal/core","ember-runtime/system/lazy_load","ember-handlebars/loader","ember-handlebars/ext","ember-handlebars/string","ember-handlebars/helpers/shared","ember-handlebars/helpers/binding","ember-handlebars/helpers/collection","ember-handlebars/helpers/view","ember-handlebars/helpers/unbound","ember-handlebars/helpers/debug","ember-handlebars/helpers/each","ember-handlebars/helpers/template","ember-handlebars/helpers/partial","ember-handlebars/helpers/yield","ember-handlebars/helpers/loc","ember-handlebars/controls/checkbox","ember-handlebars/controls/select","ember-handlebars/controls/text_area","ember-handlebars/controls/text_field","ember-handlebars/controls/text_support","ember-handlebars/controls","ember-handlebars/component_lookup","ember-handlebars/views/handlebars_bound_view","ember-handlebars/views/metamorph_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __exports__) {
     "use strict";
@@ -4976,7 +5132,7 @@ define("ember-handlebars",
 
     __exports__["default"] = EmberHandlebars;
   });
-define("ember-handlebars/component_lookup",
+enifed("ember-handlebars/component_lookup",
   ["ember-runtime/system/object","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -4987,9 +5143,9 @@ define("ember-handlebars/component_lookup",
 
         container = container || this.container;
 
-        var fullName = 'component:' + name,
-            templateFullName = 'template:components/' + name,
-            templateRegistered = container && container.has(templateFullName);
+        var fullName = 'component:' + name;
+        var templateFullName = 'template:components/' + name;
+        var templateRegistered = container && container.has(templateFullName);
 
         if (templateRegistered) {
           container.injection(fullName, 'layout', templateFullName);
@@ -5011,7 +5167,7 @@ define("ember-handlebars/component_lookup",
 
     __exports__["default"] = ComponentLookup;
   });
-define("ember-handlebars/controls",
+enifed("ember-handlebars/controls",
   ["ember-handlebars/controls/checkbox","ember-handlebars/controls/text_field","ember-handlebars/controls/text_area","ember-metal/core","ember-handlebars-compiler","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -5102,7 +5258,7 @@ define("ember-handlebars/controls",
 
       The helper can send multiple actions based on user events.
 
-      The action property defines the action which is send when
+      The action property defines the action which is sent when
       the user presses the return key.
 
       ```handlebars
@@ -5118,6 +5274,7 @@ define("ember-handlebars/controls",
     * `focus-out`
     * `key-press`
 
+
       For example, if you desire an action to be sent when the input is blurred,
       you only need to setup the action name to the event name property.
 
@@ -5217,10 +5374,10 @@ define("ember-handlebars/controls",
     function inputHelper(options) {
       Ember.assert('You can only pass attributes to the `input` helper, not arguments', arguments.length < 2);
 
-      var hash = options.hash,
-          types = options.hashTypes,
-          inputType = _resolveOption(this, options, 'type'),
-          onEvent = hash.on;
+      var hash = options.hash;
+      var types = options.hashTypes;
+      var inputType = _resolveOption(this, options, 'type');
+      var onEvent = hash.on;
 
       if (inputType === 'checkbox') {
         delete hash.type;
@@ -5400,7 +5557,7 @@ define("ember-handlebars/controls",
       Internally, `{{textarea}}` creates an instance of `Ember.TextArea`, passing
       arguments from the helper to `Ember.TextArea`'s `create` method. You can
       extend the capabilities of text areas in your application by reopening this
-      class. For example, if you are building a Bootstrap project where `data-*` 
+      class. For example, if you are building a Bootstrap project where `data-*`
       attributes are used, you can globally add support for a `data-*` attribute
       on all `{{textarea}}`s' in your app by reopening `Ember.TextArea` or
       `Ember.TextSupport` and adding it to the `attributeBindings` concatenated
@@ -5425,15 +5582,15 @@ define("ember-handlebars/controls",
     function textareaHelper(options) {
       Ember.assert('You can only pass attributes to the `textarea` helper, not arguments', arguments.length < 2);
 
-      var hash = options.hash,
-          types = options.hashTypes;
+      var hash = options.hash;
+      var types = options.hashTypes;
 
       return helpers.view.call(this, TextArea, options);
     }
 
     __exports__.textareaHelper = textareaHelper;
   });
-define("ember-handlebars/controls/checkbox",
+enifed("ember-handlebars/controls/checkbox",
   ["ember-metal/property_get","ember-metal/property_set","ember-views/views/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -5509,7 +5666,7 @@ define("ember-handlebars/controls/checkbox",
       }
     });
   });
-define("ember-handlebars/controls/select",
+enifed("ember-handlebars/controls/select",
   ["ember-handlebars-compiler","ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -5557,8 +5714,8 @@ define("ember-handlebars/controls/select",
       },
 
       selected: computed(function() {
-        var content = get(this, 'content'),
-            selection = get(this, 'parentView.selection');
+        var content = get(this, 'content');
+        var selection = get(this, 'parentView.selection');
         if (get(this, 'parentView.multiple')) {
           return selection && indexOf(selection, content.valueOf()) > -1;
         } else {
@@ -5628,7 +5785,7 @@ define("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view Ember.Select content=names}}
+      {{view "select" content=names}}
       ```
 
       Would result in the following HTML:
@@ -5651,10 +5808,7 @@ define("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view Ember.Select
-             content=names
-             value=selectedName
-      }}
+      {{view "select" content=names value=selectedName}}
       ```
 
       Would result in the following HTML with the `<option>` for 'Tom' selected:
@@ -5693,7 +5847,7 @@ define("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"}}
@@ -5724,7 +5878,7 @@ define("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"
@@ -5757,15 +5911,12 @@ define("ember-handlebars/controls/select",
 
       App.ApplicationController = Ember.ObjectController.extend({
         selectedPerson: tom,
-        programmers: [
-          yehuda,
-          tom
-        ]
+        programmers: [ yehuda, tom ]
       });
       ```
 
       ```handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"
@@ -5794,15 +5945,12 @@ define("ember-handlebars/controls/select",
       ```javascript
       App.ApplicationController = Ember.ObjectController.extend({
         selectedProgrammer: null,
-        programmers: [
-          "Yehuda",
-          "Tom"
-        ]
+        programmers: ["Yehuda", "Tom"]
       });
       ```
 
       ``` handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              value=selectedProgrammer
       }}
@@ -5826,15 +5974,12 @@ define("ember-handlebars/controls/select",
       ```javascript
       App.ApplicationController = Ember.ObjectController.extend({
         selectedProgrammer: null,
-        programmers: [
-          "Yehuda",
-          "Tom"
-        ]
+        programmers: [ "Yehuda", "Tom" ]
       });
       ```
 
       ```handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              value=selectedProgrammer
              prompt="Please select a name"
@@ -5956,7 +6101,8 @@ define("ember-handlebars/controls/select",
         Otherwise, this should be a list of objects. For instance:
 
         ```javascript
-        Ember.Select.create({
+        var App = Ember.Application.create();
+        var App.MySelect = Ember.Select.extend({
           content: Ember.A([
               { id: 1, firstName: 'Yehuda' },
               { id: 2, firstName: 'Tom' }
@@ -6099,11 +6245,11 @@ define("ember-handlebars/controls/select",
       }),
 
       valueDidChange: observer('value', function() {
-        var content = get(this, 'content'),
-            value = get(this, 'value'),
-            valuePath = get(this, 'optionValuePath').replace(/^content\.?/, ''),
-            selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection')),
-            selection;
+        var content = get(this, 'content');
+        var value = get(this, 'value');
+        var valuePath = get(this, 'optionValuePath').replace(/^content\.?/, '');
+        var selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection'));
+        var selection;
 
         if (value !== selectedValue) {
           selection = content ? content.find(function(obj) {
@@ -6126,9 +6272,9 @@ define("ember-handlebars/controls/select",
       },
 
       _changeSingle: function() {
-        var selectedIndex = this.$()[0].selectedIndex,
-            content = get(this, 'content'),
-            prompt = get(this, 'prompt');
+        var selectedIndex = this.$()[0].selectedIndex;
+        var content = get(this, 'content');
+        var prompt = get(this, 'prompt');
 
         if (!content || !get(content, 'length')) { return; }
         if (prompt && selectedIndex === 0) { set(this, 'selection', null); return; }
@@ -6139,11 +6285,11 @@ define("ember-handlebars/controls/select",
 
 
       _changeMultiple: function() {
-        var options = this.$('option:selected'),
-            prompt = get(this, 'prompt'),
-            offset = prompt ? 1 : 0,
-            content = get(this, 'content'),
-            selection = get(this, 'selection');
+        var options = this.$('option:selected');
+        var prompt = get(this, 'prompt');
+        var offset = prompt ? 1 : 0;
+        var content = get(this, 'content');
+        var selection = get(this, 'selection');
 
         if (!content) { return; }
         if (options) {
@@ -6164,23 +6310,23 @@ define("ember-handlebars/controls/select",
         var el = this.get('element');
         if (!el) { return; }
 
-        var content = get(this, 'content'),
-            selection = get(this, 'selection'),
-            selectionIndex = content ? indexOf(content, selection) : -1,
-            prompt = get(this, 'prompt');
+        var content = get(this, 'content');
+        var selection = get(this, 'selection');
+        var selectionIndex = content ? indexOf(content, selection) : -1;
+        var prompt = get(this, 'prompt');
 
         if (prompt) { selectionIndex += 1; }
         if (el) { el.selectedIndex = selectionIndex; }
       },
 
       _selectionDidChangeMultiple: function() {
-        var content = get(this, 'content'),
-            selection = get(this, 'selection'),
-            selectedIndexes = content ? indexesOf(content, selection) : [-1],
-            prompt = get(this, 'prompt'),
-            offset = prompt ? 1 : 0,
-            options = this.$('option'),
-            adjusted;
+        var content = get(this, 'content');
+        var selection = get(this, 'selection');
+        var selectedIndexes = content ? indexesOf(content, selection) : [-1];
+        var prompt = get(this, 'prompt');
+        var offset = prompt ? 1 : 0;
+        var options = this.$('option');
+        var adjusted;
 
         if (options) {
           options.each(function() {
@@ -6202,7 +6348,7 @@ define("ember-handlebars/controls/select",
     __exports__.SelectOption = SelectOption;
     __exports__.SelectOptgroup = SelectOptgroup;
   });
-define("ember-handlebars/controls/text_area",
+enifed("ember-handlebars/controls/text_area",
   ["ember-metal/property_get","ember-views/views/component","ember-handlebars/controls/text_support","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6239,14 +6385,14 @@ define("ember-handlebars/controls/text_area",
       classNames: ['ember-text-area'],
 
       tagName: "textarea",
-      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap'],
+      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap', 'lang', 'dir'],
       rows: null,
       cols: null,
 
       _updateElementValue: observer('value', function() {
         // We do this check so cursor position doesn't get affected in IE
-        var value = get(this, 'value'),
-            $el = this.$();
+        var value = get(this, 'value');
+        var $el = this.$();
         if ($el && value !== $el.val()) {
           $el.val(value);
         }
@@ -6258,7 +6404,7 @@ define("ember-handlebars/controls/text_area",
       }
     });
   });
-define("ember-handlebars/controls/text_field",
+enifed("ember-handlebars/controls/text_field",
   ["ember-metal/property_get","ember-metal/property_set","ember-views/views/component","ember-handlebars/controls/text_support","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6298,7 +6444,7 @@ define("ember-handlebars/controls/text_field",
       attributeBindings: ['type', 'value', 'size', 'pattern', 'name', 'min', 'max',
                           'accept', 'autocomplete', 'autosave', 'formaction',
                           'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
-                          'height', 'inputmode', 'list', 'multiple', 'step',
+                          'height', 'inputmode', 'list', 'multiple', 'step', 'lang', 'dir',
                           'width'],
 
       /**
@@ -6359,7 +6505,7 @@ define("ember-handlebars/controls/text_field",
       max: null
     });
   });
-define("ember-handlebars/controls/text_support",
+enifed("ember-handlebars/controls/text_support",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/target_action_support","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6430,7 +6576,7 @@ define("ember-handlebars/controls/text_support",
       onEvent: 'enter',
 
       /**
-        Whether they `keyUp` event that triggers an `action` to be sent continues
+        Whether the `keyUp` event that triggers an `action` to be sent continues
         propagating to other views.
 
         By default, when the user presses the return key on their keyboard and
@@ -6498,7 +6644,7 @@ define("ember-handlebars/controls/text_support",
       },
 
       /**
-        Called when the text area is blurred. 
+        Called when the text area is blurred.
 
         Uses sendAction to send the `focus-out` action.
 
@@ -6533,9 +6679,9 @@ define("ember-handlebars/controls/text_support",
     // sendAction semantics for TextField are different from
     // the component semantics so this method normalizes them.
     function sendAction(eventName, view, event) {
-      var action = get(view, eventName),
-          on = get(view, 'onEvent'),
-          value = get(view, 'value');
+      var action = get(view, eventName);
+      var on = get(view, 'onEvent');
+      var value = get(view, 'value');
 
       // back-compat support for keyPress as an event name even though
       // it's also a method name that consumes the event (and therefore
@@ -6555,9 +6701,9 @@ define("ember-handlebars/controls/text_support",
 
     __exports__["default"] = TextSupport;
   });
-define("ember-handlebars/ext",
-  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/binding","ember-metal/error","ember-metal/mixin","ember-metal/is_empty","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+enifed("ember-handlebars/ext",
+  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/error","ember-metal/mixin","ember-views/views/view","ember-handlebars/views/metamorph_view","ember-metal/path_cache","ember-metal/is_empty","ember-metal/cache","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
@@ -6569,17 +6715,20 @@ define("ember-handlebars/ext",
     var helpers = EmberHandlebars.helpers;
 
     var get = __dependency4__.get;
-    var isGlobalPath = __dependency5__.isGlobalPath;
-    var EmberError = __dependency6__["default"];
-    var IS_BINDING = __dependency7__.IS_BINDING;
+    var EmberError = __dependency5__["default"];
+    var IS_BINDING = __dependency6__.IS_BINDING;
+
+    var View = __dependency7__["default"];
+    var _Metamorph = __dependency8__._Metamorph;
+    var detectIsGlobal = __dependency9__.isGlobal;
 
     // late bound via requireModule because of circular dependencies.
-    var resolveHelper,
-        SimpleHandlebarsView;
+    var resolveHelper, SimpleHandlebarsView;
 
-    var isEmpty = __dependency8__["default"];
+    var isEmpty = __dependency10__["default"];
 
-    var slice = [].slice, originalTemplate = EmberHandlebars.template;
+    var slice = [].slice;
+    var originalTemplate = EmberHandlebars.template;
 
     /**
       If a path starts with a reserved keyword, returns the root
@@ -6592,13 +6741,20 @@ define("ember-handlebars/ext",
       @param path {String}
       @param data {Hash}
     */
+
+    var Cache = __dependency11__["default"];
+
+    var FIRST_SEGMENT_CACHE = new Cache(1000, function(path){
+      return path.split('.', 1)[0];
+    });
+
     function normalizePath(root, path, data) {
-      var keywords = (data && data.keywords) || {},
-          keyword, isKeyword;
+      var keywords = (data && data.keywords) || {};
+      var keyword, isKeyword;
 
       // Get the first segment of the path. For example, if the
       // path is "foo.bar.baz", returns "foo".
-      keyword = path.split('.', 1)[0];
+      keyword = FIRST_SEGMENT_CACHE.get(path);
 
       // Test to see if the first path is a keyword that has been
       // passed along in the view's data hash. If so, we will treat
@@ -6619,7 +6775,11 @@ define("ember-handlebars/ext",
         }
       }
 
-      return { root: root, path: path, isKeyword: isKeyword };
+      return {
+        root: root,
+        path: path,
+        isKeyword: isKeyword
+      };
     }
 
 
@@ -6635,24 +6795,135 @@ define("ember-handlebars/ext",
       @param {Object} options The template's option hash
     */
     function handlebarsGet(root, path, options) {
-      var data = options && options.data,
-          normalizedPath = normalizePath(root, path, data),
-          value;
+      var data = options && options.data;
+      var normalizedPath = normalizePath(root, path, data);
+      var value;
 
-      
-        root = normalizedPath.root;
-        path = normalizedPath.path;
+      // In cases where the path begins with a keyword, change the
+      // root to the value represented by that keyword, and ensure
+      // the path is relative to it.
+      root = normalizedPath.root;
+      path = normalizedPath.path;
 
+      // Ember.get with a null root and GlobalPath will fall back to
+      // Ember.lookup, which is no longer allowed in templates.
+      //
+      // But when outputting a primitive, root will be the primitive
+      // and path a blank string. These primitives should pass through
+      // to `get`.
+      if (root || path === '') {
         value = get(root, path);
+      }
 
-        if (value === undefined && root !== Ember.lookup && isGlobalPath(path)) {
-          value = get(Ember.lookup, path);
+      if (detectIsGlobal(path)) {
+        if (value === undefined && root !== Ember.lookup) {
+          root = Ember.lookup;
+          value = get(root, path);
         }
-      
+        if (root === Ember.lookup || root === null) {
+          Ember.deprecate("Global lookup of "+path+" from a Handlebars template is deprecated.");
+        }
+      }
 
       return value;
     }
 
+    function lookupViewInContainer(container, path) {
+      Ember.assert("View requires a container to resolve views not passed in through the context", !!container);
+      return container.lookupFactory('view:'+path);
+    }
+
+    function lookupViewByClassName(path) {
+      var viewClass;
+      if (detectIsGlobal(path)) {
+        viewClass = get(path);
+        Ember.deprecate('Resolved the view "'+path+'" on the global context. Pass a view name to be looked up on the container instead, such as {{view "select"}}. http://emberjs.com/guides/deprecations#toc_global-lookup-of-views-since-1-8', !viewClass);
+        return viewClass;
+      }
+    }
+
+    /**
+      handlebarsGetView resolves a view based on strings passed into a template.
+      For example:
+
+      ```handlebars
+      {{view "some-view"}}
+      {{view view.someView}}
+      {{view App.SomeView}} {{! deprecated }}
+      ```
+
+      A value is first checked to be a string- non-strings are presumed to be
+      an object and returned. This handles the "access a view on a context"
+      case (line 2 in the above examples).
+
+      Next a string is normalized, then called on the context with `get`. If
+      there is still no value, a GlobalPath will be fetched from the global
+      context (raising a deprecation) and a localPath will be passed to the
+      container to be looked up.
+
+      @private
+      @for Ember.Handlebars
+      @param {Object} context The context of the template being rendered
+      @param {String} path The path to be lookedup
+      @param {Object} container The container
+      @param {Object} options The options from the template
+    */
+    function handlebarsGetView(context, path, container, options) {
+      var viewClass;
+      var data;
+      var pathType;
+      if (options) {
+        data      = options.data;
+        pathType  = options.types && options.types[0];
+      }
+
+      if ('string' === typeof path) {
+        if('STRING' === pathType && container) {
+          viewClass = lookupViewInContainer(container, path);
+          Ember.deprecate('Quoted view names must refer to a view in the container.', viewClass);
+
+        }
+
+        if(!viewClass) {
+          viewClass = lookupViewByClassName(path);
+        }
+
+        if(!viewClass) {
+          if (data) {
+            var normalizedPath = normalizePath(context, path, data);
+            context = normalizedPath.root;
+            path = normalizedPath.path;
+          }
+
+          // Only lookup view class on context if there is a context. If not,
+          // the global lookup path on get may kick in.
+          viewClass = context && get(context, path);
+
+          if(!viewClass) {
+            // try the container once more with the normalized path
+            viewClass = lookupViewInContainer(container, path);
+          }
+        }
+      } else {
+        viewClass = path;
+      }
+
+      // Sometimes a view's value is yet another path
+      if ('string' === typeof viewClass && data && data.view) {
+        viewClass = handlebarsGetView(data.view, viewClass, container, {
+          data: data,
+          types: ['ID']
+        });
+      }
+
+      Ember.assert(
+        fmt(path+" must be a subclass or an instance of Ember.View, not %@", [viewClass]),
+        View.detect(viewClass) || View.detectInstance(viewClass)
+      );
+
+      return viewClass;
+    }
+
     /**
       This method uses `Ember.Handlebars.get` to lookup a value, then ensures
       that the value is escaped properly.
@@ -6894,8 +7165,8 @@ define("ember-handlebars/ext",
       @param {String} dependentKeys*
     */
     function registerBoundHelper(name, fn) {
-      var boundHelperArgs = slice.call(arguments, 1),
-          boundFn = makeBoundHelper.apply(this, boundHelperArgs);
+      var boundHelperArgs = slice.call(arguments, 1);
+      var boundFn = makeBoundHelper.apply(this, boundHelperArgs);
       EmberHandlebars.registerHelper(name, boundFn);
     }
 
@@ -6930,21 +7201,21 @@ define("ember-handlebars/ext",
       var dependentKeys = slice.call(arguments, 1);
 
       function helper() {
-        var properties = slice.call(arguments, 0, -1),
-          numProperties = properties.length,
-          options = arguments[arguments.length - 1],
-          normalizedProperties = [],
-          data = options.data,
-          types = data.isUnbound ? slice.call(options.types, 1) : options.types,
-          hash = options.hash,
-          view = data.view,
-          contexts = options.contexts,
-          currentContext = (contexts && contexts.length) ? contexts[0] : this,
-          prefixPathForDependentKeys = '',
-          loc, len, hashOption,
-          boundOption, property,
-          normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
+        var properties = slice.call(arguments, 0, -1);
+        var numProperties = properties.length;
+        var options = arguments[arguments.length - 1];
+        var normalizedProperties = [];
+        var data = options.data;
+        var types = data.isUnbound ? slice.call(options.types, 1) : options.types;
+        var hash = options.hash;
         var hashTypes = options.hashTypes;
+        var view = data.view;
+        var contexts = options.contexts;
+        var currentContext = (contexts && contexts.length) ? contexts[0] : this;
+        var prefixPathForDependentKeys = '';
+        var loc, len, hashOption;
+        var boundOption, property;
+        var normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
 
         Ember.assert("registerBoundHelper-generated helpers do not support use with Handlebars blocks.", !options.fn);
 
@@ -6969,7 +7240,7 @@ define("ember-handlebars/ext",
             normalizedProperties.push(normalizedProp);
             watchedProperties.push(normalizedProp);
           } else {
-            if(data.isUnbound) {
+            if (data.isUnbound) {
               normalizedProperties.push({path: properties[loc]});
             }else {
               normalizedProperties.push(null);
@@ -6987,7 +7258,8 @@ define("ember-handlebars/ext",
 
         // Override SimpleHandlebarsView's method for generating the view's content.
         bindView.normalizedValue = function() {
-          var args = [], boundOption;
+          var args = [];
+          var boundOption;
 
           // Copy over bound hash options.
           for (boundOption in boundOptions) {
@@ -7034,9 +7306,9 @@ define("ember-handlebars/ext",
         }
 
         // Add dependent key observers to the first param
-        var normalized = normalizedProperties[0],
-            pathRoot = normalized.root,
-            path = normalized.path;
+        var normalized = normalizedProperties[0];
+        var pathRoot = normalized.root;
+        var path = normalized.path;
 
         if(!isEmpty(path)) {
           prefixPathForDependentKeys = path + '.';
@@ -7061,25 +7333,21 @@ define("ember-handlebars/ext",
       @param {String} options
     */
     function evaluateUnboundHelper(context, fn, normalizedProperties, options) {
-      var args = [],
-       hash = options.hash,
-       boundOptions = hash.boundOptions,
-       types = slice.call(options.types, 1),
-       loc,
-       len,
-       property,
-       propertyType,
-       boundOption;
+      var args = [];
+      var hash = options.hash;
+      var boundOptions = hash.boundOptions;
+      var types = slice.call(options.types, 1);
+      var loc, len, property, propertyType, boundOption;
 
       for (boundOption in boundOptions) {
         if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
         hash[boundOption] = handlebarsGet(context, boundOptions[boundOption], options);
       }
 
-      for(loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
+      for (loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
         property = normalizedProperties[loc];
         propertyType = types[loc];
-        if(propertyType === "ID") {
+        if (propertyType === "ID") {
           args.push(handlebarsGet(property.root, property.path, options));
         } else {
           args.push(property.path);
@@ -7107,11 +7375,12 @@ define("ember-handlebars/ext",
     __exports__.template = template;__exports__.normalizePath = normalizePath;
     __exports__.makeBoundHelper = makeBoundHelper;
     __exports__.handlebarsGet = handlebarsGet;
+    __exports__.handlebarsGetView = handlebarsGetView;
     __exports__.evaluateUnboundHelper = evaluateUnboundHelper;
   });
-define("ember-handlebars/helpers/binding",
-  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/string","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-runtime/keys","ember-handlebars/views/handlebars_bound_view","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
+enifed("ember-handlebars/helpers/binding",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/string","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-metal/keys","ember-metal/cache","ember-handlebars/views/handlebars_bound_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -7141,9 +7410,10 @@ define("ember-handlebars/helpers/binding",
     var isArray = __dependency5__.isArray;
     var handlebarsGetEscaped = __dependency16__.getEscaped;
     var keys = __dependency17__["default"];
+    var Cache = __dependency18__["default"];
 
-    var _HandlebarsBoundView = __dependency18__._HandlebarsBoundView;
-    var SimpleHandlebarsView = __dependency18__.SimpleHandlebarsView;
+    var _HandlebarsBoundView = __dependency19__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency19__.SimpleHandlebarsView;
 
     var normalizePath = __dependency16__.normalizePath;
     var handlebarsGet = __dependency16__.handlebarsGet;
@@ -7212,11 +7482,11 @@ define("ember-handlebars/helpers/binding",
     // Binds a property into the DOM. This will create a hook in DOM that the
     // KVO system will look for and update if the property changes.
     function bind(property, options, preserveContext, shouldDisplay, valueNormalizer, childProperties) {
-      var data = options.data,
-          fn = options.fn,
-          inverse = options.inverse,
-          view = data.view,
-          normalized, observer, i;
+      var data = options.data;
+      var fn = options.fn;
+      var inverse = options.inverse;
+      var view = data.view;
+      var normalized, observer, i;
 
       // we relied on the behavior of calling without
       // context to mean this === window, but when running
@@ -7225,84 +7495,78 @@ define("ember-handlebars/helpers/binding",
 
       normalized = normalizePath(currentContext, property, data);
 
-      // Set up observers for observable objects
-      if ('object' === typeof this) {
-        if (data.insideGroup) {
-          observer = function() {
-            while (view._contextView) {
-              view = view._contextView;
-            }
-            run.once(view, 'rerender');
-          };
-
-          var template, context, result = handlebarsGet(currentContext, property, options);
-
-          result = valueNormalizer ? valueNormalizer(result) : result;
-
-          context = preserveContext ? currentContext : result;
-          if (shouldDisplay(result)) {
-            template = fn;
-          } else if (inverse) {
-            template = inverse;
+      if (data.insideGroup) {
+        observer = function() {
+          while (view._contextView) {
+            view = view._contextView;
           }
+          run.once(view, 'rerender');
+        };
 
-          template(context, { data: options.data });
-        } else {
-          var viewClass = _HandlebarsBoundView;
-          var viewOptions = {
-            preserveContext: preserveContext,
-            shouldDisplayFunc: shouldDisplay,
-            valueNormalizerFunc: valueNormalizer,
-            displayTemplate: fn,
-            inverseTemplate: inverse,
-            path: property,
-            pathRoot: currentContext,
-            previousContext: currentContext,
-            isEscaped: !options.hash.unescaped,
-            templateData: options.data,
-            templateHash: options.hash,
-            helperName: options.helperName
-          };
+        var template, context;
+        var result = handlebarsGet(currentContext, property, options);
 
-          if (options.isWithHelper) {
-            viewClass = WithView;
-          }
+        result = valueNormalizer ? valueNormalizer(result) : result;
 
-          // Create the view that will wrap the output of this template/property
-          // and add it to the nearest view's childViews array.
-          // See the documentation of Ember._HandlebarsBoundView for more.
-          var bindView = view.createChildView(viewClass, viewOptions);
-
-          view.appendChild(bindView);
-
-          observer = function() {
-            run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
-          };
+        context = preserveContext ? currentContext : result;
+        if (shouldDisplay(result)) {
+          template = fn;
+        } else if (inverse) {
+          template = inverse;
         }
 
-        // Observes the given property on the context and
-        // tells the Ember._HandlebarsBoundView to re-render. If property
-        // is an empty string, we are printing the current context
-        // object ({{this}}) so updating it is not our responsibility.
-        if (normalized.path !== '') {
-          view.registerObserver(normalized.root, normalized.path, observer);
-          if (childProperties) {
-            for (i=0; i<childProperties.length; i++) {
-              view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
-            }
-          }
-        }
+        template(context, { data: options.data });
       } else {
-        // The object is not observable, so just render it out and
-        // be done with it.
-        data.buffer.push(handlebarsGetEscaped(currentContext, property, options));
+        var viewClass = _HandlebarsBoundView;
+        var viewOptions = {
+          preserveContext: preserveContext,
+          shouldDisplayFunc: shouldDisplay,
+          valueNormalizerFunc: valueNormalizer,
+          displayTemplate: fn,
+          inverseTemplate: inverse,
+          path: property,
+          pathRoot: currentContext,
+          previousContext: currentContext,
+          isEscaped: !options.hash.unescaped,
+          templateData: options.data,
+          templateHash: options.hash,
+          helperName: options.helperName
+        };
+
+        if (options.isWithHelper) {
+          viewClass = WithView;
+        }
+
+        // Create the view that will wrap the output of this template/property
+        // and add it to the nearest view's childViews array.
+        // See the documentation of Ember._HandlebarsBoundView for more.
+        var bindView = view.createChildView(viewClass, viewOptions);
+
+        view.appendChild(bindView);
+
+        observer = function() {
+          run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
+        };
+      }
+
+      // Observes the given property on the context and
+      // tells the Ember._HandlebarsBoundView to re-render. If property
+      // is an empty string, we are printing the current context
+      // object ({{this}}) so updating it is not our responsibility.
+      if (typeof this === 'object' && normalized.path !== '') {
+        view.registerObserver(normalized.root, normalized.path, observer);
+        if (childProperties) {
+          for (i=0; i<childProperties.length; i++) {
+            view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
+          }
+        }
       }
     }
 
     function simpleBind(currentContext, property, options) {
-      var data = options.data,
-          view = data.view,
-          normalized, observer, pathRoot, output;
+      var data = options.data;
+      var view = data.view;
+      var normalized, observer, pathRoot, output;
 
       normalized = normalizePath(currentContext, property, data);
       pathRoot = normalized.root;
@@ -7385,6 +7649,10 @@ define("ember-handlebars/helpers/binding",
       return helpers.bind.call(this, property, options);
     }
 
+    var ISNT_HELPER_CACHE = new Cache(1000, function(key) {
+      return key.indexOf('-') === -1;
+    });
+    __exports__.ISNT_HELPER_CACHE = ISNT_HELPER_CACHE;
     /**
       Used to lookup/resolve handlebars helpers. The lookup order is:
 
@@ -7405,7 +7673,7 @@ define("ember-handlebars/helpers/binding",
         return helpers[name];
       }
 
-      if (!container || name.indexOf('-') === -1) {
+      if (!container || ISNT_HELPER_CACHE.get(name)) {
         return;
       }
 
@@ -7486,7 +7754,6 @@ define("ember-handlebars/helpers/binding",
       return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, ['isTruthy', 'length']);
     }
 
-
     /**
       @private
 
@@ -7506,11 +7773,11 @@ define("ember-handlebars/helpers/binding",
       @since 1.4.0
     */
     function unboundIfHelper(property, fn) {
-      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this,
-          data = fn.data,
-          template = fn.fn,
-          inverse = fn.inverse,
-          normalized, propertyValue, result;
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
+      var data = fn.data;
+      var template = fn.fn;
+      var inverse = fn.inverse;
+      var normalized, propertyValue, result;
 
       normalized = normalizePath(context, property, data);
       propertyValue = handlebarsGet(context, property, fn);
@@ -7601,7 +7868,8 @@ define("ember-handlebars/helpers/binding",
       @return {String} HTML string
     */
     function withHelper(context, options) {
-      var bindContext, preserveContext, controller, helperName = 'with';
+      var bindContext, preserveContext, controller;
+      var helperName = 'with';
 
       if (arguments.length === 4) {
         var keywordName, path, rootPath, normalized, contextPath;
@@ -7691,7 +7959,9 @@ define("ember-handlebars/helpers/binding",
       Ember.assert("You must pass exactly one argument to the unless helper", arguments.length === 2);
       Ember.assert("You must pass a block to the unless helper", options.fn && options.fn !== Handlebars.VM.noop);
 
-      var fn = options.fn, inverse = options.inverse, helperName = 'unless';
+      var fn = options.fn;
+      var inverse = options.inverse;
+      var helperName = 'unless';
 
       if (context) {
         helperName += ' ' + context;
@@ -7864,15 +8134,15 @@ define("ember-handlebars/helpers/binding",
       // For each attribute passed, create an observer and emit the
       // current value of the property as an attribute.
       forEach.call(attrKeys, function(attr) {
-        var path = attrs[attr],
-            normalized;
+        var path = attrs[attr];
+        var normalized;
 
         Ember.assert(fmt("You must provide an expression as the value of bound attribute. You specified: %@=%@", [attr, path]), typeof path === 'string');
 
         normalized = normalizePath(ctx, path, options.data);
 
-        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options),
-            type = typeOf(value);
+        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options);
+        var type = typeOf(value);
 
         Ember.assert(fmt("Attributes must be numbers, strings or booleans, not %@", [value]), value === null || value === undefined || type === 'number' || type === 'string' || type === 'boolean');
 
@@ -7962,14 +8232,15 @@ define("ember-handlebars/helpers/binding",
       @return {Array} An array of class names to add
     */
     function bindClasses(context, classBindings, view, bindAttrId, options) {
-      var ret = [], newClass, value, elem;
+      var ret = [];
+      var newClass, value, elem;
 
       // Helper method to retrieve the property from the context and
       // determine which class string to return, based on whether it is
       // a Boolean or not.
       var classStringForPath = function(root, parsedPath, options) {
-        var val,
-            path = parsedPath.path;
+        var val;
+        var path = parsedPath.path;
 
         if (path === 'this') {
           val = root;
@@ -7990,13 +8261,11 @@ define("ember-handlebars/helpers/binding",
         // closes over this variable, so it knows which string to remove when
         // the property changes.
         var oldClass;
-
         var observer;
-
-        var parsedPath = View._parsePropertyPath(binding),
-            path = parsedPath.path,
-            pathRoot = context,
-            normalized;
+        var parsedPath = View._parsePropertyPath(binding);
+        var path = parsedPath.path;
+        var pathRoot = context;
+        var normalized;
 
         if (path !== '' && path !== 'this') {
           normalized = normalizePath(context, path, options.data);
@@ -8066,7 +8335,7 @@ define("ember-handlebars/helpers/binding",
     __exports__.bindAttrHelperDeprecated = bindAttrHelperDeprecated;
     __exports__.bindClasses = bindClasses;
   });
-define("ember-handlebars/helpers/collection",
+enifed("ember-handlebars/helpers/collection",
   ["ember-metal/core","ember-metal/utils","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-handlebars/ext","ember-handlebars/helpers/view","ember-metal/computed","ember-views/views/collection_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -8088,6 +8357,7 @@ define("ember-handlebars/helpers/collection",
     var fmt = __dependency4__.fmt;
     var get = __dependency5__.get;
     var handlebarsGet = __dependency6__.handlebarsGet;
+    var handlebarsGetView = __dependency6__.handlebarsGetView;
     var ViewHelper = __dependency7__.ViewHelper;
     var computed = __dependency8__.computed;
     var CollectionView = __dependency9__["default"];
@@ -8109,7 +8379,8 @@ define("ember-handlebars/helpers/collection",
       Given an empty `<body>` the following template:
 
       ```handlebars
-      {{#collection contentBinding="App.items"}}
+      {{! application.hbs }}
+      {{#collection content=model}}
         Hi {{view.content.name}}
       {{/collection}}
       ```
@@ -8117,44 +8388,45 @@ define("ember-handlebars/helpers/collection",
       And the following application code
 
       ```javascript
-      App = Ember.Application.create()
-      App.items = [
-        Ember.Object.create({name: 'Dave'}),
-        Ember.Object.create({name: 'Mary'}),
-        Ember.Object.create({name: 'Sara'})
-      ]
+      App = Ember.Application.create();
+      App.ApplicationRoute = Ember.Route.extend({
+        model: function(){
+          return [{name: 'Yehuda'},{name: 'Tom'},{name: 'Peter'}];
+        }
+      });
       ```
 
-      Will result in the HTML structure below
+      The following HTML will result:
 
       ```html
       <div class="ember-view">
-        <div class="ember-view">Hi Dave</div>
-        <div class="ember-view">Hi Mary</div>
-        <div class="ember-view">Hi Sara</div>
+        <div class="ember-view">Hi Yehuda</div>
+        <div class="ember-view">Hi Tom</div>
+        <div class="ember-view">Hi Peter</div>
       </div>
       ```
 
-      ### Blockless use in a collection
+      ### Non-block version of collection
 
-      If you provide an `itemViewClass` option that has its own `template` you can
+      If you provide an `itemViewClass` option that has its own `template` you may
       omit the block.
 
       The following template:
 
       ```handlebars
-      {{collection contentBinding="App.items" itemViewClass="App.AnItemView"}}
+      {{! application.hbs }}
+      {{collection content=model itemViewClass="an-item"}}
       ```
 
       And application code
 
       ```javascript
       App = Ember.Application.create();
-      App.items = [
-        Ember.Object.create({name: 'Dave'}),
-        Ember.Object.create({name: 'Mary'}),
-        Ember.Object.create({name: 'Sara'})
-      ];
+      App.ApplicationRoute = Ember.Route.extend({
+        model: function(){
+          return [{name: 'Yehuda'},{name: 'Tom'},{name: 'Peter'}];
+        }
+      });
 
       App.AnItemView = Ember.View.extend({
         template: Ember.Handlebars.compile("Greetings {{view.content.name}}")
@@ -8165,9 +8437,9 @@ define("ember-handlebars/helpers/collection",
 
       ```html
       <div class="ember-view">
-        <div class="ember-view">Greetings Dave</div>
-        <div class="ember-view">Greetings Mary</div>
-        <div class="ember-view">Greetings Sara</div>
+        <div class="ember-view">Greetings Yehuda</div>
+        <div class="ember-view">Greetings Tom</div>
+        <div class="ember-view">Greetings Peter</div>
       </div>
       ```
 
@@ -8178,11 +8450,13 @@ define("ember-handlebars/helpers/collection",
       the helper by passing it as the first argument:
 
       ```handlebars
-      {{#collection App.MyCustomCollectionClass contentBinding="App.items"}}
+      {{#collection "my-custom-collection" content=model}}
         Hi {{view.content.name}}
       {{/collection}}
       ```
 
+      This example would look for the class `App.MyCustomCollection`.
+
       ### Forwarded `item.*`-named Options
 
       As with the `{{view}}`, helper options passed to the `{{collection}}` will be
@@ -8191,7 +8465,7 @@ define("ember-handlebars/helpers/collection",
       item (note the camelcasing):
 
       ```handlebars
-      {{#collection contentBinding="App.items"
+      {{#collection content=model
                     itemTagName="p"
                     itemClassNames="greeting"}}
         Howdy {{view.content.name}}
@@ -8202,9 +8476,9 @@ define("ember-handlebars/helpers/collection",
 
       ```html
       <div class="ember-view">
-        <p class="ember-view greeting">Howdy Dave</p>
-        <p class="ember-view greeting">Howdy Mary</p>
-        <p class="ember-view greeting">Howdy Sara</p>
+        <p class="ember-view greeting">Howdy Yehuda</p>
+        <p class="ember-view greeting">Howdy Tom</p>
+        <p class="ember-view greeting">Howdy Peter</p>
       </div>
       ```
 
@@ -8227,48 +8501,39 @@ define("ember-handlebars/helpers/collection",
         Ember.assert("You cannot pass more than one argument to the collection helper", arguments.length === 2);
       }
 
-      var fn = options.fn;
-      var data = options.data;
-      var inverse = options.inverse;
-      var view = options.data.view;
+      var fn        = options.fn,
+          data      = options.data,
+          inverse   = options.inverse,
+          view      = options.data.view,
+          // This should be deterministic, and should probably come from a
+          // parent view and not the controller.
+          container = (view.controller && view.controller.container ? view.controller.container : view.container);
 
-
-      var controller, container;
       // If passed a path string, convert that into an object.
       // Otherwise, just default to the standard class.
       var collectionClass;
       if (path) {
-        controller = data.keywords.controller;
-        container = controller && controller.container;
-        collectionClass = handlebarsGet(this, path, options) || container.lookupFactory('view:' + path);
+        collectionClass = handlebarsGetView(this, path, container, options);
         Ember.assert(fmt("%@ #collection: Could not find collection class %@", [data.view, path]), !!collectionClass);
       }
       else {
         collectionClass = CollectionView;
       }
 
-      var hash = options.hash, itemHash = {}, match;
+      var hash = options.hash;
+      var itemHash = {};
+      var match;
 
       // Extract item view class if provided else default to the standard class
-      var collectionPrototype = collectionClass.proto(), itemViewClass;
+      var collectionPrototype = collectionClass.proto();
+      var itemViewClass;
 
       if (hash.itemView) {
-        controller = data.keywords.controller;
-        Ember.assert('You specified an itemView, but the current context has no ' +
-                     'container to look the itemView up in. This probably means ' +
-                     'that you created a view manually, instead of through the ' +
-                     'container. Instead, use container.lookup("view:viewName"), ' +
-                     'which will properly instantiate your view.',
-                     controller && controller.container);
-        container = controller.container;
-        itemViewClass = container.lookupFactory('view:' + hash.itemView);
-        Ember.assert('You specified the itemView ' + hash.itemView + ", but it was " +
-                     "not found at " + container.describe("view:" + hash.itemView) +
-                     " (and it was not registered in the container)", !!itemViewClass);
+        itemViewClass = handlebarsGetView(this, hash.itemView, container, options);
       } else if (hash.itemViewClass) {
-        itemViewClass = handlebarsGet(collectionPrototype, hash.itemViewClass, options);
+        itemViewClass = handlebarsGetView(collectionPrototype, hash.itemViewClass, container, options);
       } else {
-        itemViewClass = collectionPrototype.itemViewClass;
+        itemViewClass = handlebarsGetView(collectionPrototype, collectionPrototype.itemViewClass, container, options);
       }
 
       Ember.assert(fmt("%@ #collection: Could not find itemViewClass %@", [data.view, itemViewClass]), !!itemViewClass);
@@ -8305,7 +8570,7 @@ define("ember-handlebars/helpers/collection",
               tagName: itemHash.tagName
         });
       } else if (hash.emptyViewClass) {
-        emptyViewClass = handlebarsGet(this, hash.emptyViewClass, options);
+        emptyViewClass = handlebarsGetView(this, hash.emptyViewClass, container, options);
       }
       if (emptyViewClass) { hash.emptyView = emptyViewClass; }
 
@@ -8325,7 +8590,7 @@ define("ember-handlebars/helpers/collection",
 
     __exports__["default"] = collectionHelper;
   });
-define("ember-handlebars/helpers/debug",
+enifed("ember-handlebars/helpers/debug",
   ["ember-metal/core","ember-metal/utils","ember-metal/logger","ember-metal/property_get","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -8359,18 +8624,18 @@ define("ember-handlebars/helpers/debug",
       @param {String} property
     */
     function logHelper() {
-      var params = a_slice.call(arguments, 0, -1),
-          options = arguments[arguments.length - 1],
-          logger = Logger.log,
-          values = [],
-          allowPrimitives = true;
+      var params = a_slice.call(arguments, 0, -1);
+      var options = arguments[arguments.length - 1];
+      var logger = Logger.log;
+      var values = [];
+      var allowPrimitives = true;
 
       for (var i = 0; i < params.length; i++) {
         var type = options.types[i];
 
         if (type === 'ID' || !allowPrimitives) {
-          var context = (options.contexts && options.contexts[i]) || this,
-              normalized = normalizePath(context, params[i], options.data);
+          var context = (options.contexts && options.contexts[i]) || this;
+          var normalized = normalizePath(context, params[i], options.data);
 
           if (normalized.path === 'this') {
             values.push(normalized.root);
@@ -8432,7 +8697,7 @@ define("ember-handlebars/helpers/debug",
     __exports__.logHelper = logHelper;
     __exports__.debuggerHelper = debuggerHelper;
   });
-define("ember-handlebars/helpers/each",
+enifed("ember-handlebars/helpers/each",
   ["ember-metal/core","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-metal/property_set","ember-views/views/collection_view","ember-metal/binding","ember-runtime/mixins/controller","ember-runtime/controllers/array_controller","ember-runtime/mixins/array","ember-runtime/copy","ember-metal/run_loop","ember-metal/events","ember-handlebars/ext","ember-metal/computed","ember-metal/observer","ember-handlebars/views/metamorph_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
     "use strict";
@@ -8443,7 +8708,6 @@ define("ember-handlebars/helpers/each",
     */
     var Ember = __dependency1__["default"];
     // Ember.assert;, Ember.K
-    // var emberAssert = Ember.assert,
     var K = Ember.K;
 
     var EmberHandlebars = __dependency2__["default"];
@@ -8569,29 +8833,9 @@ define("ember-handlebars/helpers/each",
       }
     });
 
-    // Defeatureify doesn't seem to like nested functions that need to be removed
-    function _addMetamorphCheck() {
-      EachView.reopen({
-        _checkMetamorph: on('didInsertElement', function() {
-          Ember.assert("The metamorph tags, " +
-                       this.morph.start + " and " + this.morph.end +
-                       ", have different parents.\nThe browser has fixed your template to output valid HTML (for example, check that you have properly closed all tags and have used a TBODY tag when creating a table with '{{#each}}')",
-            document.getElementById( this.morph.start ).parentNode ===
-            document.getElementById( this.morph.end ).parentNode
-          );
-        })
-      });
-    }
-
-    // until ember-debug is es6ed
-    var runInDebug = function(f){ f(); };
-    runInDebug( function() {
-      _addMetamorphCheck();
-    });
-
     var GroupedEach = EmberHandlebars.GroupedEach = function(context, path, options) {
-      var self = this,
-          normalized = EmberHandlebars.normalizePath(context, path, options.data);
+      var self = this;
+      var normalized = EmberHandlebars.normalizePath(context, path, options.data);
 
       this.context = context;
       this.path = path;
@@ -8662,11 +8906,11 @@ define("ember-handlebars/helpers/each",
       render: function() {
         if (!this.content) { return; }
 
-        var content = this.content,
-            contentLength = get(content, 'length'),
-            options = this.options,
-            data = options.data,
-            template = this.template;
+        var content = this.content;
+        var contentLength = get(content, 'length');
+        var options = this.options;
+        var data = options.data;
+        var template = this.template;
 
         data.insideEach = true;
         for (var i = 0; i < contentLength; i++) {
@@ -8696,131 +8940,161 @@ define("ember-handlebars/helpers/each",
     };
 
     /**
-      The `{{#each}}` helper loops over elements in a collection, rendering its
-      block once for each item. It is an extension of the base Handlebars `{{#each}}`
-      helper:
+      The `{{#each}}` helper loops over elements in a collection. It is an extension
+      of the base Handlebars `{{#each}}` helper.
+
+      The default behavior of `{{#each}}` is to yield its inner block once for every
+      item in an array. Each yield will provide the item as the context of the block.
 
       ```javascript
-      Developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
+      var developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
       ```
 
       ```handlebars
-      {{#each Developers}}
+      {{#each developers}}
         {{name}}
+        {{! `this` is each developer }}
       {{/each}}
       ```
 
-      `{{each}}` supports an alternative syntax with element naming:
+      `{{#each}}` supports an alternative syntax with element naming. This preserves
+      context of the yielded block:
 
       ```handlebars
-      {{#each person in Developers}}
+      {{#each person in developers}}
         {{person.name}}
+        {{! `this` is whatever it was outside the #each }}
       {{/each}}
       ```
 
-      When looping over objects that do not have properties, `{{this}}` can be used
-      to render the object:
+      The same rules apply to arrays of primitives, but the items may need to be
+      references with `{{this}}`.
 
       ```javascript
-      DeveloperNames = ['Yehuda', 'Tom', 'Paul']
+      var developerNames = ['Yehuda', 'Tom', 'Paul']
       ```
 
       ```handlebars
-      {{#each DeveloperNames}}
+      {{#each developerNames}}
         {{this}}
       {{/each}}
       ```
+
       ### {{else}} condition
+
       `{{#each}}` can have a matching `{{else}}`. The contents of this block will render
       if the collection is empty.
 
       ```
-      {{#each person in Developers}}
+      {{#each person in developers}}
         {{person.name}}
       {{else}}
         <p>Sorry, nobody is available for this task.</p>
       {{/each}}
       ```
-      ### Specifying a View class for items
-      If you provide an `itemViewClass` option that references a view class
-      with its own `template` you can omit the block.
+
+      ### Specifying an alternative view for each item
+
+      `itemViewClass` can control which view will be used during the render of each
+      item's template.
 
       The following template:
 
       ```handlebars
-      {{#view App.MyView }}
-        {{each view.items itemViewClass="App.AnItemView"}}
-      {{/view}}
+      <ul>
+      {{#each developers itemViewClass="person"}}
+        {{name}}
+      {{/each}}
+      </ul>
       ```
 
-      And application code
+      Will use the following view for each item
 
       ```javascript
-      App = Ember.Application.create({
-        MyView: Ember.View.extend({
-          items: [
-            Ember.Object.create({name: 'Dave'}),
-            Ember.Object.create({name: 'Mary'}),
-            Ember.Object.create({name: 'Sara'})
-          ]
-        })
-      });
-
-      App.AnItemView = Ember.View.extend({
-        template: Ember.Handlebars.compile("Greetings {{name}}")
+      App.PersonView = Ember.View.extend({
+        tagName: 'li'
       });
       ```
 
-      Will result in the HTML structure below
+      Resulting in HTML output that looks like the following:
 
       ```html
-      <div class="ember-view">
-        <div class="ember-view">Greetings Dave</div>
-        <div class="ember-view">Greetings Mary</div>
-        <div class="ember-view">Greetings Sara</div>
-      </div>
+      <ul>
+        <li class="ember-view">Yehuda</li>
+        <li class="ember-view">Tom</li>
+        <li class="ember-view">Paul</li>
+      </ul>
       ```
 
-      If an `itemViewClass` is defined on the helper, and therefore the helper is not
-      being used as a block, an `emptyViewClass` can also be provided optionally.
-      The `emptyViewClass` will match the behavior of the `{{else}}` condition
-      described above. That is, the `emptyViewClass` will render if the collection
-      is empty.
-
-      ### Representing each item with a Controller.
-      By default the controller lookup within an `{{#each}}` block will be
-      the controller of the template where the `{{#each}}` was used. If each
-      item needs to be presented by a custom controller you can provide a
-      `itemController` option which references a controller by lookup name.
-      Each item in the loop will be wrapped in an instance of this controller
-      and the item itself will be set to the `model` property of that controller.
-
-      This is useful in cases where properties of model objects need transformation
-      or synthesis for display:
+      `itemViewClass` also enables a non-block form of `{{each}}`. The view
+      must {{#crossLink "Ember.View/toc_templates"}}provide its own template{{/crossLink}},
+      and then the block should be dropped. An example that outputs the same HTML
+      as the previous one:
 
       ```javascript
-      App.DeveloperController = Ember.ObjectController.extend({
+      App.PersonView = Ember.View.extend({
+        tagName: 'li',
+        template: '{{name}}'
+      });
+      ```
+
+      ```handlebars
+      <ul>
+        {{each developers itemViewClass="person"}}
+      </ul>
+      ```
+
+      ### Specifying an alternative view for no items (else)
+
+      The `emptyViewClass` option provides the same flexibility to the `{{else}}`
+      case of the each helper.
+
+      ```javascript
+      App.NoPeopleView = Ember.View.extend({
+        tagName: 'li',
+        template: 'No person is available, sorry'
+      });
+      ```
+
+      ```handlebars
+      <ul>
+      {{#each developers emptyViewClass="no-people"}}
+        <li>{{name}}</li>
+      {{/each}}
+      </ul>
+      ```
+
+      ### Wrapping each item in a controller
+
+      Controllers in Ember manage state and decorate data. In many cases,
+      providing a controller for each item in a list can be useful.
+      Specifically, an {{#crossLink "Ember.ObjectController"}}Ember.ObjectController{{/crossLink}}
+      should probably be used. Item controllers are passed the item they
+      will present as a `model` property, and an object controller will
+      proxy property lookups to `model` for us.
+
+      This allows state and decoration to be added to the controller
+      while any other property lookups are delegated to the model. An example:
+
+      ```javascript
+      App.RecruitController = Ember.ObjectController.extend({
         isAvailableForHire: function() {
-          return !this.get('model.isEmployed') && this.get('model.isSeekingWork');
+          return !this.get('isEmployed') && this.get('isSeekingWork');
         }.property('isEmployed', 'isSeekingWork')
       })
       ```
 
       ```handlebars
-      {{#each person in developers itemController="developer"}}
+      {{#each person in developers itemController="recruit"}}
         {{person.name}} {{#if person.isAvailableForHire}}Hire me!{{/if}}
       {{/each}}
       ```
 
-      Each itemController will receive a reference to the current controller as
-      a `parentController` property.
-
       ### (Experimental) Grouped Each
 
-      When used in conjunction with the experimental [group helper](https://github.com/emberjs/group-helper),
-      you can inform Handlebars to re-render an entire group of items instead of
-      re-rendering them one at a time (in the event that they are changed en masse
-      or an item is added/removed).
+      If a list's membership often changes, but properties of items in that
+      group rarely change, a significant improvement in template rendering
+      time can be achieved by using the experimental [group helper](https://github.com/emberjs/group-helper).
 
       ```handlebars
       {{#group}}
@@ -8830,33 +9104,32 @@ define("ember-handlebars/helpers/each",
       {{/group}}
       ```
 
-      This can be faster than the normal way that Handlebars re-renders items
-      in some cases.
+      When the membership of `people` changes, or when any property changes, the entire
+      `{{#group}}` block will be re-rendered.
 
-      If for some reason you have a group with more than one `#each`, you can make
-      one of the collections be updated in normal (non-grouped) fashion by setting
-      the option `groupedRows=true` (counter-intuitive, I know).
-
-      For example,
+      An `{{#each}}` inside the `{{#group}}` helper can opt-out of the special group
+      behavior by passing the `groupedRows` option. For example:
 
       ```handlebars
-      {{dealershipName}}
-
       {{#group}}
         {{#each dealers}}
+          {{! uses group's special behavior }}
           {{firstName}} {{lastName}}
         {{/each}}
 
         {{#each car in cars groupedRows=true}}
+          {{! does not use group's special behavior }}
           {{car.make}} {{car.model}} {{car.color}}
         {{/each}}
       {{/group}}
       ```
-      Any change to `dealershipName` or the `dealers` collection will cause the
-      entire group to be re-rendered. However, changes to the `cars` collection
-      will be re-rendered individually (as normal).
 
-      Note that `group` behavior is also disabled by specifying an `itemViewClass`.
+      Any change to the `dealers` collection will cause the entire group to be re-rendered.
+      Changes to the `cars` collection will be re-rendered individually, as they are with
+      normal `{{#each}}` usage.
+
+      `{{#group}}` is implemented with an `itemViewClass`, so specifying an `itemViewClass`
+      on an `{{#each}}` will also disable the special re-rendering behavior.
 
       @method each
       @for Ember.Handlebars.helpers
@@ -8864,11 +9137,13 @@ define("ember-handlebars/helpers/each",
       @param [path] {String} path
       @param [options] {Object} Handlebars key/value pairs of options
       @param [options.itemViewClass] {String} a path to a view class used for each item
+      @param [options.emptyViewClass] {String} a path to a view class used for each item
       @param [options.itemController] {String} name of a controller to be created for each item
       @param [options.groupedRows] {boolean} enable normal item-by-item rendering when inside a `#group` helper
     */
     function eachHelper(path, options) {
-      var ctx, helperName = 'each';
+      var ctx;
+      var helperName = 'each';
 
       if (arguments.length === 4) {
         Ember.assert("If you pass more than one argument to the each helper, it must be in the form #each foo in bar", arguments[1] === "in");
@@ -8904,8 +9179,7 @@ define("ember-handlebars/helpers/each",
       if (options.data.insideGroup && !options.hash.groupedRows && !options.hash.itemViewClass) {
         new GroupedEach(ctx, path, options).render();
       } else {
-        // ES6TODO: figure out how to do this without global lookup.
-        return helpers.collection.call(ctx, 'Ember.Handlebars.EachView', options);
+        return helpers.collection.call(ctx, EmberHandlebars.EachView, options);
       }
     }
 
@@ -8913,7 +9187,7 @@ define("ember-handlebars/helpers/each",
     __exports__.GroupedEach = GroupedEach;
     __exports__.eachHelper = eachHelper;
   });
-define("ember-handlebars/helpers/loc",
+enifed("ember-handlebars/helpers/loc",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -8924,26 +9198,31 @@ define("ember-handlebars/helpers/loc",
     @submodule ember-handlebars
     */
 
-    // ES6TODO:
-    // Pretty sure this can be expressed as
-    // var locHelper EmberStringUtils.loc ?
-
     /**
       Calls [Ember.String.loc](/api/classes/Ember.String.html#method_loc) with the
       provided string.
 
-      This is a convenient way to localize text. For example:
+      This is a convenient way to localize text within a template:
 
-      ```html
-      <script type="text/x-handlebars" data-template-name="home">
-        {{loc "welcome"}}
-      </script>
+      ```javascript
+      Ember.STRINGS = {
+        '_welcome_': 'Bonjour'
+      };
       ```
 
-      Take note that `"welcome"` is a string and not an object
-      reference.
+      ```handlebars
+      <div class='message'>
+        {{loc '_welcome_'}}
+      </div>
+      ```
 
-      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to 
+      ```html
+      <div class='message'>
+        Bonjour
+      </div>
+      ```
+
+      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to
       set up localized string references.
 
       @method loc
@@ -8951,11 +9230,9 @@ define("ember-handlebars/helpers/loc",
       @param {String} str The string to format
       @see {Ember.String#loc}
     */
-    __exports__["default"] = function locHelper(str) {
-      return loc(str);
-    }
+    __exports__["default"] = loc;
   });
-define("ember-handlebars/helpers/partial",
+enifed("ember-handlebars/helpers/partial",
   ["ember-metal/core","ember-metal/is_none","ember-handlebars/ext","ember-handlebars/helpers/binding","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -9066,17 +9343,17 @@ define("ember-handlebars/helpers/partial",
       template(context, { data: options.data });
     }
   });
-define("ember-handlebars/helpers/shared",
+enifed("ember-handlebars/helpers/shared",
   ["ember-handlebars/ext","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
     var handlebarsGet = __dependency1__.handlebarsGet;
 
     __exports__["default"] = function resolvePaths(options) {
-      var ret = [],
-          contexts = options.contexts,
-          roots = options.roots,
-          data = options.data;
+      var ret = [];
+      var contexts = options.contexts;
+      var roots = options.roots;
+      var data = options.data;
 
       for (var i=0, l=contexts.length; i<l; i++) {
         ret.push(handlebarsGet(roots[i], contexts[i], { data: data }));
@@ -9085,12 +9362,12 @@ define("ember-handlebars/helpers/shared",
       return ret;
     }
   });
-define("ember-handlebars/helpers/template",
+enifed("ember-handlebars/helpers/template",
   ["ember-metal/core","ember-handlebars-compiler","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    // var emberDeprecate = Ember.deprecate;
+    // Ember.deprecate;
 
     var EmberHandlebars = __dependency2__["default"];
     var helpers = EmberHandlebars.helpers;
@@ -9100,43 +9377,6 @@ define("ember-handlebars/helpers/template",
     */
 
     /**
-      `template` allows you to render a template from inside another template.
-      This allows you to re-use the same template in multiple places. For example:
-
-      ```html
-      <script type="text/x-handlebars" data-template-name="logged_in_user">
-        {{#with loggedInUser}}
-          Last Login: {{lastLogin}}
-          User Info: {{template "user_info"}}
-        {{/with}}
-      </script>
-      ```
-
-      ```html
-      <script type="text/x-handlebars" data-template-name="user_info">
-        Name: <em>{{name}}</em>
-        Karma: <em>{{karma}}</em>
-      </script>
-      ```
-
-      ```handlebars
-      {{#if isUser}}
-        {{template "user_info"}}
-      {{else}}
-        {{template "unlogged_user_info"}}
-      {{/if}}
-      ```
-
-      This helper looks for templates in the global `Ember.TEMPLATES` hash. If you
-      add `<script>` tags to your page with the `data-template-name` attribute set,
-      they will be compiled and placed in this hash automatically.
-
-      You can also manually register templates by adding them to the hash:
-
-      ```javascript
-      Ember.TEMPLATES["my_cool_template"] = Ember.Handlebars.compile('<b>{{user}}</b>');
-      ```
-
       @deprecated
       @method template
       @for Ember.Handlebars.helpers
@@ -9150,7 +9390,7 @@ define("ember-handlebars/helpers/template",
       return helpers.partial.apply(this, arguments);
     }
   });
-define("ember-handlebars/helpers/unbound",
+enifed("ember-handlebars/helpers/unbound",
   ["ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -9190,9 +9430,9 @@ define("ember-handlebars/helpers/unbound",
       @return {String} HTML string
     */
     __exports__["default"] = function unboundHelper(property, fn) {
-      var options = arguments[arguments.length - 1],
-          container = options.data.view.container,
-          helper, context, out, ctx;
+      var options = arguments[arguments.length - 1];
+      var container = options.data.view.container;
+      var helper, context, out, ctx;
 
       ctx = this;
       if (arguments.length > 2) {
@@ -9208,9 +9448,9 @@ define("ember-handlebars/helpers/unbound",
       return handlebarsGet(context, property, fn);
     }
   });
-define("ember-handlebars/helpers/view",
-  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-handlebars/ext","ember-runtime/system/string","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+enifed("ember-handlebars/helpers/view",
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-metal/keys","ember-handlebars/ext","ember-runtime/system/string","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     /*globals Handlebars */
 
@@ -9230,17 +9470,19 @@ define("ember-handlebars/helpers/view",
     var jQuery = __dependency6__["default"];
     var View = __dependency7__["default"];
     var isGlobalPath = __dependency8__.isGlobalPath;
-    var normalizePath = __dependency9__.normalizePath;
-    var handlebarsGet = __dependency9__.handlebarsGet;
-    var EmberString = __dependency10__["default"];
+    var keys = __dependency9__["default"];
+    var normalizePath = __dependency10__.normalizePath;
+    var handlebarsGet = __dependency10__.handlebarsGet;
+    var handlebarsGetView = __dependency10__.handlebarsGetView;
+    var EmberString = __dependency11__["default"];
 
 
-    var LOWERCASE_A_Z = /^[a-z]/,
-        VIEW_PREFIX = /^view\./;
+    var LOWERCASE_A_Z = /^[a-z]/;
+    var VIEW_PREFIX = /^view\./;
 
     function makeBindings(thisContext, options) {
-      var hash = options.hash,
-          hashType = options.hashTypes;
+      var hash = options.hash;
+      var hashType = options.hashTypes;
 
       for (var prop in hash) {
         if (hashType[prop] === 'ID') {
@@ -9268,74 +9510,72 @@ define("ember-handlebars/helpers/view",
     }
 
     var ViewHelper = EmberObject.create({
-
       propertiesFromHTMLOptions: function(options) {
-        var hash = options.hash, data = options.data;
-        var extensions = {},
-            classes = hash['class'],
-            dup = false;
+        var hash    = options.hash;
+        var data    = options.data;
+        var classes = hash['class'];
+
+        var extensions = {
+          helperName: options.helperName || ''
+        };
 
         if (hash.id) {
           extensions.elementId = hash.id;
-          dup = true;
         }
 
         if (hash.tag) {
           extensions.tagName = hash.tag;
-          dup = true;
         }
 
         if (classes) {
           classes = classes.split(' ');
           extensions.classNames = classes;
-          dup = true;
         }
 
         if (hash.classBinding) {
           extensions.classNameBindings = hash.classBinding.split(' ');
-          dup = true;
         }
 
         if (hash.classNameBindings) {
-          if (extensions.classNameBindings === undefined) extensions.classNameBindings = [];
+          if (extensions.classNameBindings === undefined) {
+            extensions.classNameBindings = [];
+          }
           extensions.classNameBindings = extensions.classNameBindings.concat(hash.classNameBindings.split(' '));
-          dup = true;
         }
 
         if (hash.attributeBindings) {
           Ember.assert("Setting 'attributeBindings' via Handlebars is not allowed. Please subclass Ember.View and set it there instead.");
           extensions.attributeBindings = null;
-          dup = true;
-        }
-
-        if (dup) {
-          hash = jQuery.extend({}, hash);
-          delete hash.id;
-          delete hash.tag;
-          delete hash['class'];
-          delete hash.classBinding;
         }
 
         // Set the proper context for all bindings passed to the helper. This applies to regular attribute bindings
         // as well as class name bindings. If the bindings are local, make them relative to the current context
         // instead of the view.
         var path;
+        var hashKeys = keys(hash);
 
-        // Evaluate the context of regular attribute bindings:
-        for (var prop in hash) {
-          if (!hash.hasOwnProperty(prop)) { continue; }
+        for (var i = 0, l = hashKeys.length; i < l; i++) {
+          var prop      = hashKeys[i];
+          var isBinding = IS_BINDING.test(prop);
+
+          if (prop !== 'classNameBindings') {
+            extensions[prop] = hash[prop];
+          }
 
           // Test if the property ends in "Binding"
-          if (IS_BINDING.test(prop) && typeof hash[prop] === 'string') {
+          if (isBinding && typeof extensions[prop] === 'string') {
             path = this.contextualizeBindingPath(hash[prop], data);
-            if (path) { hash[prop] = path; }
+            if (path) {
+              extensions[prop] = path;
+            }
           }
         }
 
-        // Evaluate the context of class name bindings:
         if (extensions.classNameBindings) {
-          for (var b in extensions.classNameBindings) {
-            var full = extensions.classNameBindings[b];
+          // Evaluate the context of class name bindings:
+          for (var j = 0, k = extensions.classNameBindings.length; j < k; j++) {
+            var full = extensions.classNameBindings[j];
+
             if (typeof full === 'string') {
               // Contextualize the path of classNameBinding so this:
               //
@@ -9345,15 +9585,17 @@ define("ember-handlebars/helpers/view",
               //
               //     classNameBinding="_parentView.context.isGreen:green"
               var parsedPath = View._parsePropertyPath(full);
-              if(parsedPath.path !== '') {
-                path = this.contextualizeBindingPath(parsedPath.path, data); 
-                if (path) { extensions.classNameBindings[b] = path + parsedPath.classNames; }
+              if (parsedPath.path !== '') {
+                path = this.contextualizeBindingPath(parsedPath.path, data);
+                if (path) {
+                  extensions.classNameBindings[j] = path + parsedPath.classNames;
+                }
               }
             }
           }
         }
 
-        return jQuery.extend(hash, extensions);
+        return extensions;
       },
 
       // Transform bindings from the current context to a context that can be evaluated within the view.
@@ -9375,43 +9617,25 @@ define("ember-handlebars/helpers/view",
       },
 
       helper: function(thisContext, path, options) {
-        var data = options.data,
-            fn = options.fn,
-            newView;
+        var data = options.data;
+        var fn   = options.fn;
+        var newView;
+        var newViewProto;
 
         makeBindings(thisContext, options);
 
-        if ('string' === typeof path) {
-          var lookup;
-          // TODO: this is a lame conditional, this should likely change
-          // but something along these lines will likely need to be added
-          // as deprecation warnings
-          //
-          if (options.types[0] === 'STRING' && LOWERCASE_A_Z.test(path) && !VIEW_PREFIX.test(path)) {
-            lookup = path;
-          } else {
-            newView = handlebarsGet(thisContext, path, options);
-            if (typeof newView === 'string') {
-              lookup = newView;
-            }
-          }
+        var container = this.container || (data && data.view && data.view.container);
+        newView = handlebarsGetView(thisContext, path, container, options);
 
-          if (lookup) {
-            Ember.assert("View requires a container", !!data.view.container);
-            newView = data.view.container.lookupFactory('view:' + lookup);
-          }
-
-          Ember.assert("Unable to find view at path '" + path + "'", !!newView);
+        if (View.detectInstance(newView)) {
+          newViewProto = newView;
         } else {
-          newView = path;
+          newViewProto = newView.proto();
         }
 
-        Ember.assert(EmberString.fmt('You must pass a view to the #view helper, not %@ (%@)', [path, newView]), View.detect(newView) || View.detectInstance(newView));
-
         var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
         var currentView = data.view;
         viewOptions.templateData = data;
-        var newViewProto = newView.proto ? newView.proto() : newView;
 
         if (fn) {
           Ember.assert("You cannot provide a template block if you also specified a templateName", !get(viewOptions, 'templateName') && !get(newViewProto, 'templateName'));
@@ -9424,9 +9648,33 @@ define("ember-handlebars/helpers/view",
           viewOptions._context = thisContext;
         }
 
-        // for instrumentation
-        if (options.helperName) {
-          viewOptions.helperName = options.helperName;
+        currentView.appendChild(newView, viewOptions);
+      },
+
+      instanceHelper: function(thisContext, newView, options) {
+        var data = options.data;
+        var fn   = options.fn;
+
+        makeBindings(thisContext, options);
+
+        Ember.assert(
+          'Only a instance of a view may be passed to the ViewHelper.instanceHelper',
+          View.detectInstance(newView)
+        );
+
+        var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
+        var currentView = data.view;
+        viewOptions.templateData = data;
+
+        if (fn) {
+          Ember.assert("You cannot provide a template block if you also specified a templateName", !get(viewOptions, 'templateName') && !get(newView, 'templateName'));
+          viewOptions.template = fn;
+        }
+
+        // We only want to override the `_context` computed property if there is
+        // no specified controller. See View#_context for more information.
+        if (!newView.controller && !newView.controllerBinding && !viewOptions.controller && !viewOptions.controllerBinding) {
+          viewOptions._context = thisContext;
         }
 
         currentView.appendChild(newView, viewOptions);
@@ -9537,7 +9785,7 @@ define("ember-handlebars/helpers/view",
       specify a path to a custom view class.
 
       ```handlebars
-      {{#view "MyApp.CustomView"}}
+      {{#view "custom"}}{{! will look up App.CustomView }}
         hello.
       {{/view}}
       ```
@@ -9551,7 +9799,7 @@ define("ember-handlebars/helpers/view",
         innerViewClass: Ember.View.extend({
           classNames: ['a-custom-view-class-as-property']
         }),
-        template: Ember.Handlebars.compile('{{#view "view.innerViewClass"}} hi {{/view}}')
+        template: Ember.Handlebars.compile('{{#view view.innerViewClass}} hi {{/view}}')
       });
 
       MyApp.OuterView.create().appendTo('body');
@@ -9574,8 +9822,21 @@ define("ember-handlebars/helpers/view",
       supplying a block. Attempts to use both a `templateName` option and supply a
       block will throw an error.
 
+      ```javascript
+      var App = Ember.Application.create();
+      App.WithTemplateDefinedView = Ember.View.extend({
+        templateName: 'defined-template'
+      });
+      ```
+
       ```handlebars
-      {{view "MyApp.ViewWithATemplateDefined"}}
+      {{! application.hbs }}
+      {{view 'with-template-defined'}}
+      ```
+
+      ```handlebars
+      {{! defined-template.hbs }}
+      Some content for the defined template view.
       ```
 
       ### `viewName` property
@@ -9605,8 +9866,11 @@ define("ember-handlebars/helpers/view",
       // and get an instance of the registered `view:toplevel`
       if (path && path.data && path.data.isRenderData) {
         options = path;
-        Ember.assert('{{view}} helper requires parent view to have a container but none was found. This usually happens when you are manually-managing views.', !!options.data.view.container);
-        path = options.data.view.container.lookupFactory('view:toplevel');
+        if (options.data && options.data.view && options.data.view.container) {
+          path = options.data.view.container.lookupFactory('view:toplevel');
+        } else {
+          path = View;
+        }
       }
 
       options.helperName = options.helperName || 'view';
@@ -9616,7 +9880,7 @@ define("ember-handlebars/helpers/view",
 
     __exports__.viewHelper = viewHelper;
   });
-define("ember-handlebars/helpers/yield",
+enifed("ember-handlebars/helpers/yield",
   ["ember-metal/core","ember-metal/property_get","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -9728,7 +9992,7 @@ define("ember-handlebars/helpers/yield",
       view._yield(this, options);
     }
   });
-define("ember-handlebars/loader",
+enifed("ember-handlebars/loader",
   ["ember-handlebars/component_lookup","ember-views/system/jquery","ember-metal/error","ember-runtime/system/lazy_load","ember-handlebars-compiler","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -9772,12 +10036,12 @@ define("ember-handlebars/loader",
 
         var compile = (script.attr('type') === 'text/x-raw-handlebars') ?
                       jQuery.proxy(Handlebars.compile, Handlebars) :
-                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars),
-          // Get the name of the script, used by Ember.View's templateName property.
-          // First look for data-template-name attribute, then fall back to its
-          // id if no name is found.
-          templateName = script.attr('data-template-name') || script.attr('id') || 'application',
-          template = compile(script.html());
+                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars);
+        // Get the name of the script, used by Ember.View's templateName property.
+        // First look for data-template-name attribute, then fall back to its
+        // id if no name is found.
+        var templateName = script.attr('data-template-name') || script.attr('id') || 'application';
+        var template = compile(script.html());
 
         // Check if template of same name already exists
         if (Ember.TEMPLATES[templateName] !== undefined) {
@@ -9826,7 +10090,7 @@ define("ember-handlebars/loader",
 
     __exports__["default"] = bootstrap;
   });
-define("ember-handlebars/string",
+enifed("ember-handlebars/string",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -9848,6 +10112,13 @@ define("ember-handlebars/string",
       @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
     */
     function htmlSafe(str) {
+      if (str === undefined || str === null) {
+        return "";
+      }
+
+      if (typeof str !== 'string') {
+        str = ''+str;
+      }
       return new Handlebars.SafeString(str);
     }
 
@@ -9874,9 +10145,9 @@ define("ember-handlebars/string",
 
     __exports__["default"] = htmlSafe;
   });
-define("ember-handlebars/views/handlebars_bound_view",
-  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-views/views/view","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+enifed("ember-handlebars/views/handlebars_bound_view",
+  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-views/views/view","ember-handlebars/string","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
     /*globals Handlebars, Metamorph:true */
     /*jshint newcap:false*/
@@ -9895,34 +10166,33 @@ define("ember-handlebars/views/handlebars_bound_view",
     // Ember.K
     var K = Ember.K;
 
-    var Metamorph = requireModule('metamorph');
-
     var EmberError = __dependency3__["default"];
     var get = __dependency4__.get;
     var set = __dependency5__.set;
     var merge = __dependency6__["default"];
     var run = __dependency7__["default"];
-    var computed = __dependency8__.computed;
-    var View = __dependency9__["default"];
+    var View = __dependency8__["default"];
+    var htmlSafe = __dependency9__["default"];
     var cloneStates = __dependency10__.cloneStates;
     var states = __dependency10__.states;
     var viewStates = states;
 
     var _MetamorphView = __dependency11__["default"];
     var handlebarsGet = __dependency12__.handlebarsGet;
+    var uuid = __dependency13__.uuid;
 
     function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {
       this.path = path;
       this.pathRoot = pathRoot;
       this.isEscaped = isEscaped;
       this.templateData = templateData;
-
+      this[Ember.GUID_KEY] = uuid();
       this._lastNormalizedValue = undefined;
-      this.morph = Metamorph();
       this.state = 'preRender';
       this.updateId = null;
       this._parentView = null;
       this.buffer = null;
+      this._morph = null;
     }
 
     SimpleHandlebarsView.prototype = {
@@ -9948,6 +10218,7 @@ define("ember-handlebars/views/handlebars_bound_view",
       normalizedValue: function() {
         var path = this.path;
         var pathRoot = this.pathRoot;
+        var escape = this.isEscaped;
         var result, templateData;
 
         // Use the pathRoot as the result if no path is provided. This
@@ -9961,35 +10232,19 @@ define("ember-handlebars/views/handlebars_bound_view",
           result = handlebarsGet(pathRoot, path, { data: templateData });
         }
 
-        return result;
-      },
-
-      renderToBuffer: function(buffer) {
-        var string = '';
-
-        string += this.morph.startTag();
-        string += this.render();
-        string += this.morph.endTag();
-
-        buffer.push(string);
-      },
-
-      render: function(value) {
-        // If not invoked via a triple-mustache ({{{foo}}}), escape
-        // the content of the template.
-        var escape = this.isEscaped;
-        var result = value || this.normalizedValue();
-        this._lastNormalizedValue = result;
-        if (result === null || result === undefined) {
-          result = "";
-        } else if (!(result instanceof SafeString)) {
-          result = String(result);
+        if (!escape && !(result instanceof SafeString)) {
+          result = htmlSafe(result);
         }
 
-        if (escape) { result = Handlebars.Utils.escapeExpression(result); }
         return result;
       },
 
+      render: function(buffer) {
+        var value = this.normalizedValue();
+        this._lastNormalizedValue = value;
+        buffer._element = value;
+      },
+
       rerender: function() {
         switch(this.state) {
           case 'preRender':
@@ -10002,15 +10257,16 @@ define("ember-handlebars/views/handlebars_bound_view",
             this.updateId = run.scheduleOnce('render', this, 'update');
             break;
         }
-
         return this;
       },
 
       update: function () {
         this.updateId = null;
         var value = this.normalizedValue();
+        // doesn't diff SafeString instances
         if (value !== this._lastNormalizedValue) {
-          this.morph.html(this.render(value));
+          this._lastNormalizedValue = value;
+          this._morph.update(value);
         }
       },
 
@@ -10133,10 +10389,10 @@ define("ember-handlebars/views/handlebars_bound_view",
       pathRoot: null,
 
       normalizedValue: function() {
-        var path = get(this, 'path'),
-            pathRoot  = get(this, 'pathRoot'),
-            valueNormalizer = get(this, 'valueNormalizerFunc'),
-            result, templateData;
+        var path = get(this, 'path');
+        var pathRoot  = get(this, 'pathRoot');
+        var valueNormalizer = get(this, 'valueNormalizerFunc');
+        var result, templateData;
 
         // Use the pathRoot as the result if no path is provided. This
         // happens if the path is `this`, which gets normalized into
@@ -10178,14 +10434,15 @@ define("ember-handlebars/views/handlebars_bound_view",
         // the content of the template.
         var escape = get(this, 'isEscaped');
 
-        var shouldDisplay = get(this, 'shouldDisplayFunc'),
-            preserveContext = get(this, 'preserveContext'),
-            context = get(this, 'previousContext');
+        var shouldDisplay = get(this, 'shouldDisplayFunc');
+        var preserveContext = get(this, 'preserveContext');
+        var context = get(this, 'previousContext');
 
-        var inverseTemplate = get(this, 'inverseTemplate'),
-            displayTemplate = get(this, 'displayTemplate');
+        var inverseTemplate = get(this, 'inverseTemplate');
+        var displayTemplate = get(this, 'displayTemplate');
 
         var result = this.normalizedValue();
+
         this._lastNormalizedValue = result;
 
         // First, test the conditional to see if we should
@@ -10235,93 +10492,30 @@ define("ember-handlebars/views/handlebars_bound_view",
     __exports__._HandlebarsBoundView = _HandlebarsBoundView;
     __exports__.SimpleHandlebarsView = SimpleHandlebarsView;
   });
-define("ember-handlebars/views/metamorph_view",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+enifed("ember-handlebars/views/metamorph_view",
+  ["ember-metal/core","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /* global Metamorph:true */
 
     /*jshint newcap:false*/
     var Ember = __dependency1__["default"];
     // Ember.deprecate
-    // var emberDeprecate = Ember.deprecate;
 
-    var get = __dependency2__.get;
-    var set = __dependency3__["default"];
-
-    var CoreView = __dependency4__["default"];
-    var View = __dependency5__["default"];
-    var Mixin = __dependency6__.Mixin;
-    var run = __dependency7__["default"];
+    var CoreView = __dependency2__["default"];
+    var View = __dependency3__["default"];
+    var Mixin = __dependency4__.Mixin;
+    var run = __dependency5__["default"];
 
     /**
     @module ember
     @submodule ember-handlebars
     */
 
-    var Metamorph = requireModule('metamorph');
-
     function notifyMutationListeners() {
       run.once(View, 'notifyMutationListeners');
     }
 
-    // DOMManager should just abstract dom manipulation between jquery and metamorph
-    var DOMManager = {
-      remove: function(view) {
-        view.morph.remove();
-        notifyMutationListeners();
-      },
-
-      prepend: function(view, html) {
-        view.morph.prepend(html);
-        notifyMutationListeners();
-      },
-
-      after: function(view, html) {
-        view.morph.after(html);
-        notifyMutationListeners();
-      },
-
-      html: function(view, html) {
-        view.morph.html(html);
-        notifyMutationListeners();
-      },
-
-      // This is messed up.
-      replace: function(view) {
-        var morph = view.morph;
-
-        view._transitionTo('preRender');
-
-        run.schedule('render', this, function renderMetamorphView() {
-          if (view.isDestroying) { return; }
-
-          view.clearRenderedChildren();
-          var buffer = view.renderToBuffer();
-
-          view.invokeRecursively(function(view) {
-            view.propertyWillChange('element');
-          });
-          view.triggerRecursively('willInsertElement');
-
-          morph.replaceWith(buffer.string());
-          view._transitionTo('inDOM');
-
-          view.invokeRecursively(function(view) {
-            view.propertyDidChange('element');
-          });
-          view.triggerRecursively('didInsertElement');
-
-          notifyMutationListeners();
-        });
-      },
-
-      empty: function(view) {
-        view.morph.html("");
-        notifyMutationListeners();
-      }
-    };
-
     // The `morph` and `outerHTML` properties are internal only
     // and not observable.
 
@@ -10338,31 +10532,10 @@ define("ember-handlebars/views/metamorph_view",
 
       init: function() {
         this._super();
-        this.morph = Metamorph();
         Ember.deprecate('Supplying a tagName to Metamorph views is unreliable and is deprecated. You may be setting the tagName on a Handlebars helper that creates a Metamorph.', !this.tagName);
-      },
-
-      beforeRender: function(buffer) {
-        buffer.push(this.morph.startTag());
-        buffer.pushOpeningTag();
-      },
-
-      afterRender: function(buffer) {
-        buffer.pushClosingTag();
-        buffer.push(this.morph.endTag());
-      },
-
-      createElement: function() {
-        var buffer = this.renderToBuffer();
-        this.outerHTML = buffer.string();
-        this.clearBuffer();
-      },
-
-      domManager: DOMManager
+      }
     });
     __exports__._Metamorph = _Metamorph;
-    var _wrapMap = Metamorph._wrapMap;
-    __exports__._wrapMap = _wrapMap;
     /**
       @class _MetamorphView
       @namespace Ember
@@ -10382,9 +10555,308 @@ define("ember-handlebars/views/metamorph_view",
     var _SimpleMetamorphView = CoreView.extend(_Metamorph);
     __exports__._SimpleMetamorphView = _SimpleMetamorphView;__exports__["default"] = View.extend(_Metamorph);
   });
-define("ember-metal",
-  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __exports__) {
+enifed("ember-metal-views",
+  ["ember-metal-views/renderer","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Renderer = __dependency1__["default"];
+    __exports__.Renderer = Renderer;
+  });
+enifed("ember-metal-views/renderer",
+  ["morph","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var DOMHelper = __dependency1__.DOMHelper;
+
+    function Renderer() {
+      this._uuid = 0;
+      this._views = new Array(2000);
+      this._queue = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
+      this._parents = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
+      this._elements = new Array(17);
+      this._inserts = {};
+      this._dom = new DOMHelper();
+    }
+
+    function Renderer_renderTree(_view, _parentView, _insertAt) {
+      var views = this._views;
+      views[0] = _view;
+      var insertAt = _insertAt === undefined ? -1 : _insertAt;
+      var index = 0;
+      var total = 1;
+      var levelBase = _parentView ? _parentView._level+1 : 0;
+
+      var root = _parentView == null ? _view : _parentView._root;
+
+      // if root view has a _morph assigned
+      var willInsert = !!root._morph;
+
+      var queue = this._queue;
+      queue[0] = 0;
+      var length = 1;
+
+      var parentIndex = -1;
+      var parents = this._parents;
+      var parent = _parentView || null;
+      var elements = this._elements;
+      var element = null;
+      var contextualElement = null;
+      var level = 0;
+
+      var view = _view;
+      var children, i, l, child;
+      while (length) {
+        elements[level] = element;
+        if (!view._morph) {
+          // ensure props we add are in same order
+          view._morph = null;
+        }
+        view._root = root;
+        this.uuid(view);
+        view._level = levelBase + level;
+        if (view._elementCreated) {
+          this.remove(view, false, true);
+        }
+
+        this.willCreateElement(view);
+
+        contextualElement = view._morph && view._morph.contextualElement;
+        if (!contextualElement && parent && parent._childViewsMorph) {
+          contextualElement = parent._childViewsMorph.contextualElement;
+        }
+        if (!contextualElement && view._didCreateElementWithoutMorph) {
+          // This code path is only used by createElement and rerender when createElement
+          // was previously called on a view.
+          contextualElement = document.body;
+        }
+        Ember.assert("Required contextualElement for view "+_view+" is missing", contextualElement);
+        element = this.createElement(view, contextualElement);
+
+        parents[level++] = parentIndex;
+        parentIndex = index;
+        parent = view;
+
+        // enqueue for end
+        queue[length++] = index;
+        // enqueue children
+        children = this.childViews(view);
+        if (children) {
+          for (i=children.length-1;i>=0;i--) {
+            child = children[i];
+            index = total++;
+            views[index] = child;
+            queue[length++] = index;
+            view = child;
+          }
+        }
+
+        index = queue[--length];
+        view = views[index];
+
+        while (parentIndex === index) {
+          level--;
+          view._elementCreated = true;
+          this.didCreateElement(view);
+          if (willInsert) {
+            this.willInsertElement(view);
+          }
+
+          if (level === 0) {
+            length--;
+            break;
+          }
+
+          parentIndex = parents[level];
+          parent = parentIndex === -1 ? _parentView : views[parentIndex];
+          this.insertElement(view, parent, element, -1);
+          index = queue[--length];
+          view = views[index];
+          element = elements[level];
+          elements[level] = null;
+        }
+      }
+
+      this.insertElement(view, _parentView, element, insertAt);
+
+      for (i=total-1;i>=0;i--) {
+        if (willInsert) {
+          views[i]._elementInserted = true;
+          this.didInsertElement(views[i]);
+        }
+        views[i] = null;
+      }
+
+      return element;
+    }
+
+    Renderer.prototype.uuid = function Renderer_uuid(view) {
+      if (view._uuid === undefined) {
+        view._uuid = ++this._uuid;
+        view._renderer = this;
+      } // else assert(view._renderer === this)
+      return view._uuid;
+    };
+
+    Renderer.prototype.scheduleInsert =
+      function Renderer_scheduleInsert(view, morph) {
+        if (view._morph || view._elementCreated) {
+          throw new Error("You cannot insert a View that has already been rendered");
+        }
+        Ember.assert("You cannot insert a View without a morph", morph);
+        view._morph = morph;
+        var viewId = this.uuid(view);
+        this._inserts[viewId] = this.scheduleRender(this, function() {
+          this._inserts[viewId] = null;
+          this.renderTree(view);
+        });
+      };
+
+    Renderer.prototype.appendTo =
+      function Renderer_appendTo(view, target) {
+        var morph = this._dom.appendMorph(target);
+        this.scheduleInsert(view, morph);
+      };
+
+    Renderer.prototype.replaceIn =
+      function Renderer_replaceIn(view, target) {
+        var morph = this._dom.createMorph(target, null, null);
+        this.scheduleInsert(view, morph);
+      };
+
+    function Renderer_remove(_view, shouldDestroy, reset) {
+      var viewId = this.uuid(_view);
+
+      if (this._inserts[viewId]) {
+        this.cancelRender(this._inserts[viewId]);
+        this._inserts[viewId] = undefined;
+      }
+
+      if (!_view._elementCreated) {
+        return;
+      }
+
+      var removeQueue = [];
+      var destroyQueue = [];
+      var morph = _view._morph;
+      var  idx, len, view, staticChildren, queue,
+        childViews, i, l, parentView;
+
+      removeQueue.push(_view);
+
+      for (idx=0; idx<removeQueue.length; idx++) {
+        view = removeQueue[idx];
+
+        if (!shouldDestroy && view._childViewsMorph) {
+          queue = removeQueue;
+        } else {
+          queue = destroyQueue;
+        }
+
+        this.beforeRemove(removeQueue[idx]);
+
+        childViews = view._childViews;
+        if (childViews) {
+          for (i=0,l=childViews.length; i<l; i++) {
+            queue.push(childViews[i]);
+          }
+        }
+      }
+
+      for (idx=0; idx<destroyQueue.length; idx++) {
+        view = destroyQueue[idx];
+
+        this.beforeRemove(destroyQueue[idx]);
+
+        childViews = view._childViews;
+        if (childViews) {
+          for (i=0,l=childViews.length; i<l; i++) {
+            destroyQueue.push(childViews[i]);
+          }
+        }
+      }
+
+      // destroy DOM from root insertion
+      if (morph && !reset) {
+        morph.destroy();
+      }
+
+      for (idx=0, len=removeQueue.length; idx < len; idx++) {
+        this.afterRemove(removeQueue[idx], false);
+      }
+
+      for (idx=0, len=destroyQueue.length; idx < len; idx++) {
+        this.afterRemove(destroyQueue[idx], true);
+      }
+
+      if (reset) {
+        _view._morph = morph;
+      }
+    }
+
+    function Renderer_insertElement(view, parentView, element, index) {
+      if (element === null || element === undefined) return;
+      if (view._morph) {
+        view._morph.update(element);
+      } else if (parentView) {
+        if (index === -1) {
+          view._morph = parentView._childViewsMorph.append(element);
+        } else {
+          view._morph = parentView._childViewsMorph.insert(index, element);
+        }
+      }
+    }
+
+    function Renderer_beforeRemove(view) {
+      if (view._elementCreated) {
+        this.willDestroyElement(view);
+      }
+      if (view._elementInserted) {
+        this.willRemoveElement(view);
+      }
+    }
+
+    function Renderer_afterRemove(view, shouldDestroy) {
+      view._elementInserted = false;
+      view._morph = null;
+      view._childViewsMorph = null;
+      if (view._elementCreated) {
+        view._elementCreated = false;
+        this.didDestroyElement(view);
+      }
+      if (shouldDestroy) {
+        this.destroyView(view);
+      }
+    }
+
+    Renderer.prototype.remove = Renderer_remove;
+    Renderer.prototype.destroy = function (view) {
+      this.remove(view, true);
+    };
+
+    Renderer.prototype.renderTree = Renderer_renderTree;
+    Renderer.prototype.insertElement = Renderer_insertElement;
+    Renderer.prototype.beforeRemove = Renderer_beforeRemove;
+    Renderer.prototype.afterRemove = Renderer_afterRemove;
+
+    /// HOOKS
+    var noop = function () {};
+
+    Renderer.prototype.willCreateElement = noop; // inBuffer
+    Renderer.prototype.createElement = noop; // renderToBuffer or createElement
+    Renderer.prototype.didCreateElement = noop; // hasElement
+    Renderer.prototype.willInsertElement = noop; // will place into DOM
+    Renderer.prototype.didInsertElement = noop; // inDOM // placed into DOM
+    Renderer.prototype.willRemoveElement = noop; // removed from DOM  willDestroyElement currently paired with didInsertElement
+    Renderer.prototype.willDestroyElement = noop; // willClearRender (currently balanced with render) this is now paired with createElement
+    Renderer.prototype.didDestroyElement = noop; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
+    Renderer.prototype.destroyView = noop;
+    Renderer.prototype.childViews = noop;
+
+    __exports__["default"] = Renderer;
+  });
+enifed("ember-metal",
+  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/cache","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","ember-metal/is_present","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __exports__) {
     "use strict";
     /**
     Ember Metal
@@ -10402,7 +10874,6 @@ define("ember-metal",
     var reset = __dependency3__.reset;
     var generateGuid = __dependency4__.generateGuid;
     var GUID_KEY = __dependency4__.GUID_KEY;
-    var GUID_PREFIX = __dependency4__.GUID_PREFIX;
     var guidFor = __dependency4__.guidFor;
     var META_DESC = __dependency4__.META_DESC;
     var EMPTY_META = __dependency4__.EMPTY_META;
@@ -10424,100 +10895,103 @@ define("ember-metal",
     var uuid = __dependency4__.uuid;
     var EmberError = __dependency5__["default"];
     var EnumerableUtils = __dependency6__["default"];
+    var Cache = __dependency7__["default"];
+    var create = __dependency8__.create;
+    var hasPropertyAccessors = __dependency8__.hasPropertyAccessors;
+    var filter = __dependency9__.filter;
+    var forEach = __dependency9__.forEach;
+    var indexOf = __dependency9__.indexOf;
+    var map = __dependency9__.map;
+    var Logger = __dependency10__["default"];
 
-    var create = __dependency7__.create;
-    var platform = __dependency7__.platform;
-    var map = __dependency8__.map;
-    var forEach = __dependency8__.forEach;
-    var filter = __dependency8__.filter;
-    var indexOf = __dependency8__.indexOf;
-    var Logger = __dependency9__["default"];
+    var get = __dependency11__.get;
+    var getWithDefault = __dependency11__.getWithDefault;
+    var normalizeTuple = __dependency11__.normalizeTuple;
+    var _getPath = __dependency11__._getPath;
 
-    var get = __dependency10__.get;
-    var getWithDefault = __dependency10__.getWithDefault;
-    var normalizeTuple = __dependency10__.normalizeTuple;
-    var _getPath = __dependency10__._getPath;
+    var on = __dependency12__.on;
+    var addListener = __dependency12__.addListener;
+    var removeListener = __dependency12__.removeListener;
+    var suspendListener = __dependency12__.suspendListener;
+    var suspendListeners = __dependency12__.suspendListeners;
+    var sendEvent = __dependency12__.sendEvent;
+    var hasListeners = __dependency12__.hasListeners;
+    var watchedEvents = __dependency12__.watchedEvents;
+    var listenersFor = __dependency12__.listenersFor;
+    var listenersDiff = __dependency12__.listenersDiff;
+    var listenersUnion = __dependency12__.listenersUnion;
 
-    var on = __dependency11__.on;
-    var addListener = __dependency11__.addListener;
-    var removeListener = __dependency11__.removeListener;
-    var suspendListener = __dependency11__.suspendListener;
-    var suspendListeners = __dependency11__.suspendListeners;
-    var sendEvent = __dependency11__.sendEvent;
-    var hasListeners = __dependency11__.hasListeners;
-    var watchedEvents = __dependency11__.watchedEvents;
-    var listenersFor = __dependency11__.listenersFor;
-    var listenersDiff = __dependency11__.listenersDiff;
-    var listenersUnion = __dependency11__.listenersUnion;
+    var ObserverSet = __dependency13__["default"];
 
-    var ObserverSet = __dependency12__["default"];
+    var propertyWillChange = __dependency14__.propertyWillChange;
+    var propertyDidChange = __dependency14__.propertyDidChange;
+    var overrideChains = __dependency14__.overrideChains;
+    var beginPropertyChanges = __dependency14__.beginPropertyChanges;
+    var endPropertyChanges = __dependency14__.endPropertyChanges;
+    var changeProperties = __dependency14__.changeProperties;
 
-    var propertyWillChange = __dependency13__.propertyWillChange;
-    var propertyDidChange = __dependency13__.propertyDidChange;
-    var overrideChains = __dependency13__.overrideChains;
-    var beginPropertyChanges = __dependency13__.beginPropertyChanges;
-    var endPropertyChanges = __dependency13__.endPropertyChanges;
-    var changeProperties = __dependency13__.changeProperties;
+    var Descriptor = __dependency15__.Descriptor;
+    var defineProperty = __dependency15__.defineProperty;
+    var set = __dependency16__.set;
+    var trySet = __dependency16__.trySet;
 
-    var Descriptor = __dependency14__.Descriptor;
-    var defineProperty = __dependency14__.defineProperty;
-    var set = __dependency15__.set;
-    var trySet = __dependency15__.trySet;
-
-    var OrderedSet = __dependency16__.OrderedSet;
-    var Map = __dependency16__.Map;
-    var MapWithDefault = __dependency16__.MapWithDefault;
-    var getProperties = __dependency17__["default"];
-    var setProperties = __dependency18__["default"];
-    var watchKey = __dependency19__.watchKey;
-    var unwatchKey = __dependency19__.unwatchKey;
-    var flushPendingChains = __dependency20__.flushPendingChains;
-    var removeChainWatcher = __dependency20__.removeChainWatcher;
-    var ChainNode = __dependency20__.ChainNode;
-    var finishChains = __dependency20__.finishChains;
-    var watchPath = __dependency21__.watchPath;
-    var unwatchPath = __dependency21__.unwatchPath;
-    var watch = __dependency22__.watch;
-    var isWatching = __dependency22__.isWatching;
-    var unwatch = __dependency22__.unwatch;
-    var rewatch = __dependency22__.rewatch;
-    var destroy = __dependency22__.destroy;
-    var expandProperties = __dependency23__["default"];
-    var ComputedProperty = __dependency24__.ComputedProperty;
-    var computed = __dependency24__.computed;
-    var cacheFor = __dependency24__.cacheFor;
+    var OrderedSet = __dependency17__.OrderedSet;
+    var Map = __dependency17__.Map;
+    var MapWithDefault = __dependency17__.MapWithDefault;
+    var getProperties = __dependency18__["default"];
+    var setProperties = __dependency19__["default"];
+    var watchKey = __dependency20__.watchKey;
+    var unwatchKey = __dependency20__.unwatchKey;
+    var flushPendingChains = __dependency21__.flushPendingChains;
+    var removeChainWatcher = __dependency21__.removeChainWatcher;
+    var ChainNode = __dependency21__.ChainNode;
+    var finishChains = __dependency21__.finishChains;
+    var watchPath = __dependency22__.watchPath;
+    var unwatchPath = __dependency22__.unwatchPath;
+    var watch = __dependency23__.watch;
+    var isWatching = __dependency23__.isWatching;
+    var unwatch = __dependency23__.unwatch;
+    var rewatch = __dependency23__.rewatch;
+    var destroy = __dependency23__.destroy;
+    var expandProperties = __dependency24__["default"];
+    var ComputedProperty = __dependency25__.ComputedProperty;
+    var computed = __dependency25__.computed;
+    var cacheFor = __dependency25__.cacheFor;
 
     // side effect of defining the computed.* macros
 
-    var addObserver = __dependency26__.addObserver;
-    var observersFor = __dependency26__.observersFor;
-    var removeObserver = __dependency26__.removeObserver;
-    var addBeforeObserver = __dependency26__.addBeforeObserver;
-    var _suspendBeforeObserver = __dependency26__._suspendBeforeObserver;
-    var _suspendObserver = __dependency26__._suspendObserver;
-    var _suspendBeforeObservers = __dependency26__._suspendBeforeObservers;
-    var _suspendObservers = __dependency26__._suspendObservers;
-    var beforeObserversFor = __dependency26__.beforeObserversFor;
-    var removeBeforeObserver = __dependency26__.removeBeforeObserver;
-    var IS_BINDING = __dependency27__.IS_BINDING;
-    var mixin = __dependency27__.mixin;
-    var Mixin = __dependency27__.Mixin;
-    var required = __dependency27__.required;
-    var aliasMethod = __dependency27__.aliasMethod;
-    var observer = __dependency27__.observer;
-    var immediateObserver = __dependency27__.immediateObserver;
-    var beforeObserver = __dependency27__.beforeObserver;
-    var Binding = __dependency28__.Binding;
-    var isGlobalPath = __dependency28__.isGlobalPath;
-    var bind = __dependency28__.bind;
-    var oneWay = __dependency28__.oneWay;
-    var run = __dependency29__["default"];
-    var libraries = __dependency30__["default"];
-    var isNone = __dependency31__.isNone;
-    var none = __dependency31__.none;
-    var isEmpty = __dependency32__.isEmpty;
-    var empty = __dependency32__.empty;
-    var isBlank = __dependency33__["default"];
+    var addObserver = __dependency27__.addObserver;
+    var observersFor = __dependency27__.observersFor;
+    var removeObserver = __dependency27__.removeObserver;
+    var addBeforeObserver = __dependency27__.addBeforeObserver;
+    var _suspendBeforeObserver = __dependency27__._suspendBeforeObserver;
+    var _suspendObserver = __dependency27__._suspendObserver;
+    var _suspendBeforeObservers = __dependency27__._suspendBeforeObservers;
+    var _suspendObservers = __dependency27__._suspendObservers;
+    var beforeObserversFor = __dependency27__.beforeObserversFor;
+    var removeBeforeObserver = __dependency27__.removeBeforeObserver;
+    var IS_BINDING = __dependency28__.IS_BINDING;
+    var mixin = __dependency28__.mixin;
+    var Mixin = __dependency28__.Mixin;
+    var required = __dependency28__.required;
+    var aliasMethod = __dependency28__.aliasMethod;
+    var observer = __dependency28__.observer;
+    var immediateObserver = __dependency28__.immediateObserver;
+    var beforeObserver = __dependency28__.beforeObserver;
+    var Binding = __dependency29__.Binding;
+    var isGlobalPath = __dependency29__.isGlobalPath;
+    var bind = __dependency29__.bind;
+    var oneWay = __dependency29__.oneWay;
+    var run = __dependency30__["default"];
+    var libraries = __dependency31__["default"];
+    var isNone = __dependency32__.isNone;
+    var none = __dependency32__.none;
+    var isEmpty = __dependency33__.isEmpty;
+    var empty = __dependency33__.empty;
+    var isBlank = __dependency34__["default"];
+    var isPresent = __dependency35__["default"];
+    var keys = __dependency36__["default"];
+
     // END IMPORTS
 
     // BEGIN EXPORTS
@@ -10530,11 +11004,16 @@ define("ember-metal",
     Ember.instrument = instrument;
     Ember.subscribe = subscribe;
 
+    Ember._Cache = Cache;
+
     Ember.generateGuid    = generateGuid;
     Ember.GUID_KEY        = GUID_KEY;
-    Ember.GUID_PREFIX     = GUID_PREFIX;
     Ember.create          = create;
-    Ember.platform        = platform;
+    Ember.keys            = keys;
+    Ember.platform        = {
+      defineProperty: defineProperty,
+      hasPropertyAccessors: hasPropertyAccessors
+    };
 
     var EmberArrayPolyfills = Ember.ArrayPolyfills = {};
 
@@ -10668,6 +11147,10 @@ define("ember-metal",
 
     Ember.isBlank = isBlank;
 
+    
+      Ember.isPresent = isPresent;
+    
+
     Ember.merge = merge;
 
     /**
@@ -10701,7 +11184,7 @@ define("ember-metal",
 
     __exports__["default"] = Ember;
   });
-define("ember-metal/alias",
+enifed("ember-metal/alias",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/properties","ember-metal/computed","ember-metal/platform","ember-metal/utils","ember-metal/dependent_keys","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -10781,7 +11264,7 @@ define("ember-metal/alias",
     AliasedProperty.prototype._meta = undefined;
     AliasedProperty.prototype.meta = ComputedProperty.prototype.meta;
   });
-define("ember-metal/array",
+enifed("ember-metal/array",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -10798,22 +11281,26 @@ define("ember-metal/array",
       return func && Function.prototype.toString.call(func).indexOf('[native code]') > -1;
     };
 
+    var defineNativeShim = function(nativeFunc, shim) {
+      if (isNativeFunc(nativeFunc)) {
+        return nativeFunc;
+      }
+      return shim;
+    };
+
     // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/map
-    var map = isNativeFunc(ArrayPrototype.map) ? ArrayPrototype.map : function(fun /*, thisp */) {
+    var map = defineNativeShim(ArrayPrototype.map, function(fun /*, thisp */) {
       //"use strict";
 
-      if (this === void 0 || this === null) {
+      if (this === void 0 || this === null || typeof fun !== "function") {
         throw new TypeError();
       }
 
       var t = Object(this);
       var len = t.length >>> 0;
-      if (typeof fun !== "function") {
-        throw new TypeError();
-      }
-
       var res = new Array(len);
       var thisp = arguments[1];
+
       for (var i = 0; i < len; i++) {
         if (i in t) {
           res[i] = fun.call(thisp, t[i], i, t);
@@ -10821,44 +11308,61 @@ define("ember-metal/array",
       }
 
       return res;
-    };
+    });
 
     // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
-    var forEach = isNativeFunc(ArrayPrototype.forEach) ? ArrayPrototype.forEach : function(fun /*, thisp */) {
+    var forEach = defineNativeShim(ArrayPrototype.forEach, function(fun /*, thisp */) {
       //"use strict";
 
-      if (this === void 0 || this === null) {
+      if (this === void 0 || this === null || typeof fun !== "function") {
         throw new TypeError();
       }
 
       var t = Object(this);
       var len = t.length >>> 0;
-      if (typeof fun !== "function") {
-        throw new TypeError();
-      }
-
       var thisp = arguments[1];
+
       for (var i = 0; i < len; i++) {
         if (i in t) {
           fun.call(thisp, t[i], i, t);
         }
       }
-    };
+    });
+
+    var indexOf = defineNativeShim(ArrayPrototype.indexOf, function (obj, fromIndex) {
+      if (fromIndex === null || fromIndex === undefined) {
+        fromIndex = 0;
+      }
+      else if (fromIndex < 0) {
+        fromIndex = Math.max(0, this.length + fromIndex);
+      }
 
-    var indexOf = isNativeFunc(ArrayPrototype.indexOf) ? ArrayPrototype.indexOf : function (obj, fromIndex) {
-      if (fromIndex === null || fromIndex === undefined) { fromIndex = 0; }
-      else if (fromIndex < 0) { fromIndex = Math.max(0, this.length + fromIndex); }
       for (var i = fromIndex, j = this.length; i < j; i++) {
-        if (this[i] === obj) { return i; }
+        if (this[i] === obj) {
+          return i;
+        }
       }
       return -1;
-    };
+    });
 
-    var filter = isNativeFunc(ArrayPrototype.filter) ? ArrayPrototype.filter : function (fn, context) {
-      var i,
-      value,
-      result = [],
-      length = this.length;
+    var lastIndexOf = defineNativeShim(ArrayPrototype.lastIndexOf, function(obj, fromIndex) {
+        var len = this.length;
+        var idx;
+
+        if (fromIndex === undefined) fromIndex = len-1;
+        else fromIndex = (fromIndex < 0) ? Math.ceil(fromIndex) : Math.floor(fromIndex);
+        if (fromIndex < 0) fromIndex += len;
+
+        for(idx = fromIndex;idx>=0;idx--) {
+          if (this[idx] === obj) return idx ;
+        }
+        return -1;
+    });
+
+    var filter = defineNativeShim(ArrayPrototype.filter, function (fn, context) {
+      var i, value;
+      var result = [];
+      var length = this.length;
 
       for (i = 0; i < length; i++) {
         if (this.hasOwnProperty(i)) {
@@ -10869,25 +11373,14 @@ define("ember-metal/array",
         }
       }
       return result;
-    };
-
+    });
 
     if (Ember.SHIM_ES5) {
-      if (!ArrayPrototype.map) {
-        ArrayPrototype.map = map;
-      }
-
-      if (!ArrayPrototype.forEach) {
-        ArrayPrototype.forEach = forEach;
-      }
-
-      if (!ArrayPrototype.filter) {
-        ArrayPrototype.filter = filter;
-      }
-
-      if (!ArrayPrototype.indexOf) {
-        ArrayPrototype.indexOf = indexOf;
-      }
+      ArrayPrototype.map = ArrayPrototype.map || map;
+      ArrayPrototype.forEach = ArrayPrototype.forEach || forEach;
+      ArrayPrototype.filter = ArrayPrototype.filter || filter;
+      ArrayPrototype.indexOf = ArrayPrototype.indexOf || indexOf;
+      ArrayPrototype.lastIndexOf = ArrayPrototype.lastIndexOf || lastIndexOf;
     }
 
     /**
@@ -10900,9 +11393,10 @@ define("ember-metal/array",
     __exports__.forEach = forEach;
     __exports__.filter = filter;
     __exports__.indexOf = indexOf;
+    __exports__.lastIndexOf = lastIndexOf;
   });
-define("ember-metal/binding",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/map","ember-metal/observer","ember-metal/run_loop","exports"],
+enifed("ember-metal/binding",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/run_loop","ember-metal/path_cache","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -10911,11 +11405,12 @@ define("ember-metal/binding",
     var set = __dependency3__.set;
     var trySet = __dependency3__.trySet;
     var guidFor = __dependency4__.guidFor;
-    var Map = __dependency5__.Map;
-    var addObserver = __dependency6__.addObserver;
-    var removeObserver = __dependency6__.removeObserver;
-    var _suspendObserver = __dependency6__._suspendObserver;
-    var run = __dependency7__["default"];
+    var addObserver = __dependency5__.addObserver;
+    var removeObserver = __dependency5__.removeObserver;
+    var _suspendObserver = __dependency5__._suspendObserver;
+    var run = __dependency6__["default"];
+    var isGlobalPath = __dependency7__.isGlobal;
+
 
     // ES6TODO: where is Ember.lookup defined?
     /**
@@ -10938,8 +11433,6 @@ define("ember-metal/binding",
     */
     Ember.LOG_BINDINGS = false || !!Ember.ENV.LOG_BINDINGS;
 
-    var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
-
     /**
       Returns true if the provided path is global (e.g., `MyApp.fooController.bar`)
       instead of local (`foo.bar.baz`).
@@ -10950,9 +11443,6 @@ define("ember-metal/binding",
       @param {String} path
       @return Boolean
     */
-    function isGlobalPath(path) {
-      return IS_GLOBAL.test(path);
-    }
 
     function getWithGlobals(obj, path) {
       return get(isGlobalPath(path) ? Ember.lookup : obj, path);
@@ -10963,10 +11453,9 @@ define("ember-metal/binding",
     //
 
     function Binding(toPath, fromPath) {
-      this._direction = 'fwd';
+      this._direction = undefined;
       this._from = fromPath;
       this._to   = toPath;
-      this._directionMap = Map.create();
       this._readyToSync = undefined;
       this._oneWay = undefined;
     }
@@ -11068,7 +11557,8 @@ define("ember-metal/binding",
       connect: function(obj) {
         Ember.assert('Must pass a valid object to Ember.Binding.connect()', !!obj);
 
-        var fromPath = this._from, toPath = this._to;
+        var fromPath = this._from;
+        var toPath = this._to;
         trySet(obj, toPath, getWithGlobals(obj, fromPath));
 
         // add an observer on the object to be notified when the binding should be updated
@@ -11121,19 +11611,18 @@ define("ember-metal/binding",
       },
 
       _scheduleSync: function(obj, dir) {
-        var directionMap = this._directionMap;
-        var existingDir = directionMap.get(obj);
+        var existingDir = this._direction;
 
         // if we haven't scheduled the binding yet, schedule it
-        if (!existingDir) {
+        if (existingDir === undefined) {
           run.schedule('sync', this, this._sync, obj);
-          directionMap.set(obj, dir);
+          this._direction  = dir;
         }
 
         // If both a 'back' and 'fwd' sync have been scheduled on the same object,
         // default to a 'fwd' sync so that it remains deterministic.
         if (existingDir === 'back' && dir === 'fwd') {
-          directionMap.set(obj, 'fwd');
+          this._direction = 'fwd';
         }
       },
 
@@ -11145,12 +11634,12 @@ define("ember-metal/binding",
 
         // get the direction of the binding for the object we are
         // synchronizing from
-        var directionMap = this._directionMap;
-        var direction = directionMap.get(obj);
+        var direction = this._direction;
 
-        var fromPath = this._from, toPath = this._to;
+        var fromPath = this._from;
+        var toPath = this._to;
 
-        directionMap.remove(obj);
+        this._direction = undefined;
 
         // if we're synchronizing from the remote object...
         if (direction === 'fwd') {
@@ -11195,9 +11684,9 @@ define("ember-metal/binding",
         @method from
         @static
       */
-      from: function() {
-        var C = this, binding = new C();
-        return binding.from.apply(binding, arguments);
+      from: function(from) {
+        var C = this;
+        return new C(undefined, from);
       },
 
       /*
@@ -11206,9 +11695,9 @@ define("ember-metal/binding",
         @method to
         @static
       */
-      to: function() {
-        var C = this, binding = new C();
-        return binding.to.apply(binding, arguments);
+      to: function(to) {
+        var C = this;
+        return new C(to, undefined);
       },
 
       /**
@@ -11228,8 +11717,8 @@ define("ember-metal/binding",
         @return {Ember.Binding} `this`
       */
       oneWay: function(from, flag) {
-        var C = this, binding = new C(null, from);
-        return binding.oneWay(flag);
+        var C = this;
+        return new C(undefined, from).oneWay(flag);
       }
 
     });
@@ -11399,7 +11888,67 @@ define("ember-metal/binding",
     __exports__.oneWay = oneWay;__exports__.Binding = Binding;
     __exports__.isGlobalPath = isGlobalPath;
   });
-define("ember-metal/chains",
+enifed("ember-metal/cache",
+  ["ember-metal/dictionary","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var dictionary = __dependency1__["default"];
+    __exports__["default"] = Cache;
+
+    function Cache(limit, func) {
+      this.store  = dictionary(null);
+      this.size   = 0;
+      this.misses = 0;
+      this.hits   = 0;
+      this.limit  = limit;
+      this.func   = func;
+    }
+
+    var FALSE     = function() { };
+    var ZERO      = function() { };
+    var UNDEFINED = function() { };
+    var NULL      = function() { };
+
+    Cache.prototype = {
+      set: function(key, value) {
+        if (this.limit > this.size) {
+          this.size ++;
+          if (value === undefined) {
+            this.store[key] = UNDEFINED;
+          } else {
+            this.store[key] = value;
+          }
+        }
+
+        return value;
+      },
+
+      get: function(key) {
+        var value = this.store[key];
+
+        if (value === undefined) {
+          this.misses ++;
+          value = this.set(key, this.func(key));
+        } else if (value === UNDEFINED) {
+          this.hits ++;
+          value = undefined;
+        } else {
+          this.hits ++;
+          // nothing to translate
+        }
+
+        return value;
+      },
+
+      purge: function() {
+        this.store  = dictionary(null);
+        this.size   = 0;
+        this.hits   = 0;
+        this.misses = 0;
+      }
+    };
+  });
+enifed("ember-metal/chains",
   ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/array","ember-metal/watch_key","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -11408,14 +11957,13 @@ define("ember-metal/chains",
     var get = __dependency2__.get;
     var normalizeTuple = __dependency2__.normalizeTuple;
     var meta = __dependency3__.meta;
-    var META_KEY = __dependency3__.META_KEY;
     var forEach = __dependency4__.forEach;
     var watchKey = __dependency5__.watchKey;
     var unwatchKey = __dependency5__.unwatchKey;
 
-    var metaFor = meta,
-        warn = Ember.warn,
-        FIRST_KEY = /^([^\.]+)/;
+    var metaFor = meta;
+    var warn = Ember.warn;
+    var FIRST_KEY = /^([^\.]+)/;
 
     function firstKey(path) {
       return path.match(FIRST_KEY)[0];
@@ -11440,7 +11988,8 @@ define("ember-metal/chains",
     __exports__.flushPendingChains = flushPendingChains;function addChainWatcher(obj, keyName, node) {
       if (!obj || ('object' !== typeof obj)) { return; } // nothing to do
 
-      var m = metaFor(obj), nodes = m.chainWatchers;
+      var m = metaFor(obj);
+      var nodes = m.chainWatchers;
 
       if (!m.hasOwnProperty('chainWatchers')) {
         nodes = m.chainWatchers = {};
@@ -11454,7 +12003,7 @@ define("ember-metal/chains",
     function removeChainWatcher(obj, keyName, node) {
       if (!obj || 'object' !== typeof obj) { return; } // nothing to do
 
-      var m = obj[META_KEY];
+      var m = obj['__ember_meta__'];
       if (m && !m.hasOwnProperty('chainWatchers')) { return; } // nothing to do
 
       var nodes = m && m.chainWatchers;
@@ -11508,7 +12057,7 @@ define("ember-metal/chains",
     function lazyGet(obj, key) {
       if (!obj) return undefined;
 
-      var meta = obj[META_KEY];
+      var meta = obj['__ember_meta__'];
       // check if object meant only to be a prototype
       if (meta && meta.proto === obj) return undefined;
 
@@ -11545,8 +12094,10 @@ define("ember-metal/chains",
 
     // copies a top level object only
     ChainNodePrototype.copy = function(obj) {
-      var ret = new ChainNode(null, null, obj),
-          paths = this._paths, path;
+      var ret = new ChainNode(null, null, obj);
+      var paths = this._paths;
+      var path;
+
       for (path in paths) {
         if (paths[path] <= 0) { continue; } // this check will also catch non-number vals.
         ret.add(path);
@@ -11616,7 +12167,8 @@ define("ember-metal/chains",
     ChainNodePrototype.count = 0;
 
     ChainNodePrototype.chain = function(key, path, src) {
-      var chains = this._chains, node;
+      var chains = this._chains;
+      var node;
       if (!chains) { chains = this._chains = {}; }
 
       node = chains[key];
@@ -11632,7 +12184,8 @@ define("ember-metal/chains",
     };
 
     ChainNodePrototype.unchain = function(key, path) {
-      var chains = this._chains, node = chains[key];
+      var chains = this._chains;
+      var node = chains[key];
 
       // unchain rest of path first...
       if (path && path.length>1) {
@@ -11728,12 +12281,26 @@ define("ember-metal/chains",
 
     function finishChains(obj) {
       // We only create meta if we really have to
-      var m = obj[META_KEY], chains = m && m.chains;
-      if (chains) {
-        if (chains.value() !== obj) {
+      var m = obj['__ember_meta__'],
+        chains, chainWatchers, chainNodes;
+      if (m) {
+        // finish any current chains node watchers that reference obj
+        chainWatchers = m.chainWatchers;
+        if (chainWatchers) {
+          for(var key in chainWatchers) {
+            if (!chainWatchers.hasOwnProperty(key)) { continue; }
+            chainNodes = chainWatchers[key];
+            if (chainNodes) {
+              for (var i=0,l=chainNodes.length;i<l;i++) {
+                chainNodes[i].didChange(null);
+              }
+            }
+          }
+        }
+        // copy chains from prototype
+        chains = m.chains;
+        if (chains && chains.value() !== obj) {
           metaFor(obj).chains = chains = chains.copy(obj);
-        } else {
-          chains.didChange(null);
         }
       }
     }
@@ -11741,7 +12308,7 @@ define("ember-metal/chains",
     __exports__.finishChains = finishChains;__exports__.removeChainWatcher = removeChainWatcher;
     __exports__.ChainNode = ChainNode;
   });
-define("ember-metal/computed",
+enifed("ember-metal/computed",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/expand_properties","ember-metal/error","ember-metal/properties","ember-metal/property_events","ember-metal/dependent_keys","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -11749,7 +12316,6 @@ define("ember-metal/computed",
     var get = __dependency2__.get;
     var set = __dependency3__.set;
     var meta = __dependency4__.meta;
-    var META_KEY = __dependency4__.META_KEY;
     var inspect = __dependency4__.inspect;
     var expandProperties = __dependency5__["default"];
     var EmberError = __dependency6__["default"];
@@ -11767,8 +12333,8 @@ define("ember-metal/computed",
     Ember.warn("The CP_DEFAULT_CACHEABLE flag has been removed and computed properties are always cached by default. Use `volatile` if you don't want caching.", Ember.ENV.CP_DEFAULT_CACHEABLE !== false);
 
 
-    var metaFor = meta,
-        a_slice = [].slice;
+    var metaFor = meta;
+    var a_slice = [].slice;
 
     function UNDEFINED() { }
 
@@ -12100,81 +12666,124 @@ define("ember-metal/computed",
       Generally speaking if you intend for your computed property to be set
       your backing function should accept either two or three arguments.
 
+      ```javascript
+      var Person = Ember.Object.extend({
+        // these will be supplied by `create`
+        firstName: null,
+        lastName: null,
+
+        fullName: function(key, value, oldValue) {
+          // getter
+          if (arguments.length === 1) {
+            var firstName = this.get('firstName');
+            var lastName = this.get('lastName');
+
+            return firstName + ' ' + lastName;
+
+          // setter
+          } else {
+            var name = value.split(' ');
+
+            this.set('firstName', name[0]);
+            this.set('lastName', name[1]);
+
+            return value;
+          }
+        }.property('firstName', 'lastName')
+      });
+
+      var person = Person.create();
+
+      person.set('fullName', 'Peter Wagenet');
+      person.get('firstName'); // 'Peter'
+      person.get('lastName');  // 'Wagenet'
+      ```
+
       @method set
       @param {String} keyName The key being accessed.
       @param {Object} newValue The new value being assigned.
       @param {String} oldValue The old value being replaced.
       @return {Object} The return value of the function backing the CP.
     */
-    ComputedPropertyPrototype.set = function(obj, keyName, value) {
-      var cacheable = this._cacheable,
-          func = this.func,
-          meta = metaFor(obj, cacheable),
-          oldSuspended = this._suspended,
-          hadCachedValue = false,
-          cache = meta.cache,
-          funcArgLength, cachedValue, ret;
+    ComputedPropertyPrototype.set = function computedPropertySetWithSuspend(obj, keyName, value) {
+      var oldSuspended = this._suspended;
+
+      this._suspended = obj;
+
+      try {
+        this._set(obj, keyName, value);
+      } finally {
+        this._suspended = oldSuspended;
+      }
+    };
+
+    ComputedPropertyPrototype._set = function computedPropertySet(obj, keyName, value) {
+      var cacheable      = this._cacheable;
+      var func           = this.func;
+      var meta           = metaFor(obj, cacheable);
+      var cache          = meta.cache;
+      var hadCachedValue = false;
+
+      var funcArgLength, cachedValue, ret;
 
       if (this._readOnly) {
         throw new EmberError('Cannot set read-only property "' + keyName + '" on object: ' + inspect(obj));
       }
 
-      this._suspended = obj;
-
-      try {
-
-        if (cacheable && cache[keyName] !== undefined) {
-          if(cache[keyName] !== UNDEFINED) {
-            cachedValue = cache[keyName];
-          }
-
-          hadCachedValue = true;
+      if (cacheable && cache[keyName] !== undefined) {
+        if(cache[keyName] !== UNDEFINED) {
+          cachedValue = cache[keyName];
         }
 
-        // Check if the CP has been wrapped. If it has, use the
-        // length from the wrapped function.
-
-        funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
-
-        // For backwards-compatibility with computed properties
-        // that check for arguments.length === 2 to determine if
-        // they are being get or set, only pass the old cached
-        // value if the computed property opts into a third
-        // argument.
-        if (funcArgLength === 3) {
-          ret = func.call(obj, keyName, value, cachedValue);
-        } else if (funcArgLength === 2) {
-          ret = func.call(obj, keyName, value);
-        } else {
-          defineProperty(obj, keyName, null, cachedValue);
-          set(obj, keyName, value);
-          return;
-        }
-
-        if (hadCachedValue && cachedValue === ret) { return; }
-
-        var watched = meta.watching[keyName];
-        if (watched) { propertyWillChange(obj, keyName); }
-
-        if (hadCachedValue) {
-          cache[keyName] = undefined;
-        }
-
-        if (cacheable) {
-          if (!hadCachedValue) {
-            addDependentKeys(this, obj, keyName, meta);
-          }
-          if (ret === undefined) {
-            cache[keyName] = UNDEFINED;
-          } else {
-            cache[keyName] = ret;
-          }
-        }
-
-        if (watched) { propertyDidChange(obj, keyName); }
-      } finally {
-        this._suspended = oldSuspended;
+        hadCachedValue = true;
       }
+
+      // Check if the CP has been wrapped. If it has, use the
+      // length from the wrapped function.
+
+      funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
+
+      // For backwards-compatibility with computed properties
+      // that check for arguments.length === 2 to determine if
+      // they are being get or set, only pass the old cached
+      // value if the computed property opts into a third
+      // argument.
+      if (funcArgLength === 3) {
+        ret = func.call(obj, keyName, value, cachedValue);
+      } else if (funcArgLength === 2) {
+        ret = func.call(obj, keyName, value);
+      } else {
+        defineProperty(obj, keyName, null, cachedValue);
+        set(obj, keyName, value);
+        return;
+      }
+
+      if (hadCachedValue && cachedValue === ret) { return; }
+
+      var watched = meta.watching[keyName];
+      if (watched) {
+        propertyWillChange(obj, keyName);
+      }
+
+      if (hadCachedValue) {
+        cache[keyName] = undefined;
+      }
+
+      if (cacheable) {
+        if (!hadCachedValue) {
+          addDependentKeys(this, obj, keyName, meta);
+        }
+        if (ret === undefined) {
+          cache[keyName] = UNDEFINED;
+        } else {
+          cache[keyName] = ret;
+        }
+      }
+
+      if (watched) {
+        propertyDidChange(obj, keyName);
+      }
+
       return ret;
     };
 
@@ -12201,9 +12810,45 @@ define("ember-metal/computed",
       The function should accept two parameters, key and value. If value is not
       undefined you should set the value first. In either case return the
       current value of the property.
+      
+      A computed property defined in this way might look like this:
+
+      ```js
+      var Person = Ember.Object.extend({
+        firstName: 'Betty',
+        lastName: 'Jones',
+
+        fullName: Ember.computed('firstName', 'lastName', function(key, value) {
+          return this.get('firstName') + ' ' + this.get('lastName');
+        })
+      });
+
+      var client = Person.create();
+
+      client.get('fullName'); // 'Betty Jones'
+      
+      client.set('lastName', 'Fuller');
+      client.get('fullName'); // 'Betty Fuller'
+      ```
+
+      _Note: This is the prefered way to define computed properties when writing third-party
+      libraries that depend on or use Ember, since there is no guarantee that the user
+      will have prototype extensions enabled._
+
+      You might use this method if you disabled
+      [Prototype Extensions](http://emberjs.com/guides/configuring-ember/disabling-prototype-extensions/).
+      The alternative syntax might look like this
+      (if prototype extensions are enabled, which is the default behavior):
+
+      ```js
+      fullName: function () {
+        return this.get('firstName') + ' ' + this.get('lastName');
+      }.property('firstName', 'lastName')
+      ```
 
       @method computed
       @for Ember
+      @param {String} [dependentKeys*] Optional dependent keys that trigger this computed property.
       @param {Function} func The computed property function.
       @return {Ember.ComputedProperty} property descriptor instance
     */
@@ -12242,9 +12887,9 @@ define("ember-metal/computed",
       @return {Object} the cached value
     */
     function cacheFor(obj, key) {
-      var meta = obj[META_KEY],
-          cache = meta && meta.cache,
-          ret = cache && cache[key];
+      var meta = obj['__ember_meta__'];
+      var cache = meta && meta.cache;
+      var ret = cache && cache[key];
 
       if (ret === UNDEFINED) { return undefined; }
       return ret;
@@ -12272,7 +12917,7 @@ define("ember-metal/computed",
     __exports__.computed = computed;
     __exports__.cacheFor = cacheFor;
   });
-define("ember-metal/computed_macros",
+enifed("ember-metal/computed_macros",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_empty","ember-metal/is_none","ember-metal/alias"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
@@ -12536,7 +13181,7 @@ define("ember-metal/computed_macros",
     });
 
     /**
-      A computed property that returns true if the provied dependent property
+      A computed property that returns true if the provided dependent property
       is greater than the provided value.
 
       Example
@@ -12560,7 +13205,7 @@ define("ember-metal/computed_macros",
       @param {String} dependentKey
       @param {Number} value
       @return {Ember.ComputedProperty} computed property which returns true if
-      the original value for property is greater then given value.
+      the original value for property is greater than given value.
     */
     registerComputed('gt', function(dependentKey, value) {
       return get(this, dependentKey) > value;
@@ -12653,7 +13298,7 @@ define("ember-metal/computed_macros",
       @param {String} dependentKey
       @param {Number} value
       @return {Ember.ComputedProperty} computed property which returns true if
-      the original value for property is less or equal then given value.
+      the original value for property is less or equal than given value.
     */
     registerComputed('lte', function(dependentKey, value) {
       return get(this, dependentKey) <= value;
@@ -12783,7 +13428,7 @@ define("ember-metal/computed_macros",
       @for Ember
       @param {String} dependentKey*
       @return {Ember.ComputedProperty} computed property which maps
-      values of all passed properties in to an array.
+      values of all passed in properties to an array.
     */
     registerComputedWithProperties('collect', function(properties) {
       var res = [];
@@ -12863,19 +13508,17 @@ define("ember-metal/computed_macros",
       return alias(dependentKey).oneWay();
     };
 
-    
-      /**
-        This is a more semantically meaningful alias of `computed.oneWay`,
-        whose name is somewhat ambiguous as to which direction the data flows.
+    /**
+      This is a more semantically meaningful alias of `computed.oneWay`,
+      whose name is somewhat ambiguous as to which direction the data flows.
 
-        @method computed.reads
-        @for Ember
-        @param {String} dependentKey
-        @return {Ember.ComputedProperty} computed property which creates a
-          one way computed property to the original value for property.
-       */
-      computed.reads = computed.oneWay;
-    
+      @method computed.reads
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which creates a
+        one way computed property to the original value for property.
+     */
+    computed.reads = computed.oneWay;
 
     /**
       Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
@@ -12939,10 +13582,13 @@ define("ember-metal/computed_macros",
       @param {String} defaultPath
       @return {Ember.ComputedProperty} computed property which acts like
       a standard getter and setter, but defaults to the value from `defaultPath`.
+      @deprecated Use `Ember.computed.oneWay` or custom CP with default instead.
     */
     // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
     computed.defaultTo = function(defaultPath) {
       return computed(function(key, newValue, cachedValue) {
+        Ember.deprecate('Usage of Ember.computed.defaultTo is deprecated, use `Ember.computed.oneWay` instead.');
+
         if (arguments.length === 1) {
           return get(this, defaultPath);
         }
@@ -12976,7 +13622,7 @@ define("ember-metal/computed_macros",
       });
     };
   });
-define("ember-metal/core",
+enifed("ember-metal/core",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -13004,7 +13650,7 @@ define("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.7.1
+      @version 1.8.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -13031,10 +13677,10 @@ define("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.7.1'
+      @default '1.8.1'
       @static
     */
-    Ember.VERSION = '1.7.1';
+    Ember.VERSION = '1.8.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -13191,15 +13837,15 @@ define("ember-metal/core",
 
     __exports__["default"] = Ember;
   });
-define("ember-metal/dependent_keys",
+enifed("ember-metal/dependent_keys",
   ["ember-metal/platform","ember-metal/watching","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
-        // Remove "use strict"; from transpiled module (in browser builds only) until
+        // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
     //
     // REMOVE_USE_STRICT: true
 
-    var create = __dependency1__.create;
+    var o_create = __dependency1__.create;
     var watch = __dependency2__.watch;
     var unwatch = __dependency2__.unwatch;
 
@@ -13207,8 +13853,6 @@ define("ember-metal/dependent_keys",
     @module ember-metal
     */
 
-    var o_create = create;
-
     // ..........................................................
     // DEPENDENT KEYS
     //
@@ -13282,7 +13926,69 @@ define("ember-metal/dependent_keys",
 
     __exports__.removeDependentKeys = removeDependentKeys;
   });
-define("ember-metal/enumerable_utils",
+enifed("ember-metal/deprecate_property",
+  ["ember-metal/core","ember-metal/platform","ember-metal/properties","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    var Ember = __dependency1__["default"];
+    var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
+    var defineProperty = __dependency3__.defineProperty;
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+
+
+    /**
+      Used internally to allow changing properties in a backwards compatible way, and print a helpful
+      deprecation warning.
+
+      @method deprecateProperty
+      @param {Object} object The object to add the deprecated property to.
+      @param {String} deprecatedKey The property to add (and print deprecation warnings upon accessing).
+      @param {String} newKey The property that will be aliased.
+      @private
+      @since 1.7.0
+    */
+
+    function deprecateProperty(object, deprecatedKey, newKey) {
+      function deprecate() {
+        Ember.deprecate('Usage of `' + deprecatedKey + '` is deprecated, use `' + newKey + '` instead.');
+      }
+
+      if (hasPropertyAccessors) {
+        defineProperty(object, deprecatedKey, {
+            configurable: true,
+            enumerable: false,
+            set: function(value) { deprecate(); set(this, newKey, value); },
+            get: function() { deprecate(); return get(this, newKey); }
+        });
+      }
+    }
+
+    __exports__.deprecateProperty = deprecateProperty;
+  });
+enifed("ember-metal/dictionary",
+  ["ember-metal/platform","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+
+    // the delete is meant to hint at runtimes that this object should remain in
+    // dictionary mode. This is clearly a runtime specific hack, but currently it
+    // appears worthwile in some usecases. Please note, these deletes do increase
+    // the cost of creation dramatically over a plain Object.create. And as this
+    // only makes sense for long-lived dictionaries that aren't instantiated often.
+    __exports__["default"] = function makeDictionary(parent) {
+      var dict = create(parent);
+      dict['_dict'] = null;
+      delete dict['_dict'];
+      return dict;
+    }
+  });
+enifed("ember-metal/enumerable_utils",
   ["ember-metal/array","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -13314,7 +14020,7 @@ define("ember-metal/enumerable_utils",
      * @return {Array} An array of mapped values.
      */
     function map(obj, callback, thisArg) {
-      return obj.map ? obj.map.call(obj, callback, thisArg) : _map.call(obj, callback, thisArg);
+      return obj.map ? obj.map(callback, thisArg) : _map.call(obj, callback, thisArg);
     }
 
     __exports__.map = map;/**
@@ -13328,7 +14034,7 @@ define("ember-metal/enumerable_utils",
      *
      */
     function forEach(obj, callback, thisArg) {
-      return obj.forEach ? obj.forEach.call(obj, callback, thisArg) : a_forEach.call(obj, callback, thisArg);
+      return obj.forEach ? obj.forEach(callback, thisArg) : a_forEach.call(obj, callback, thisArg);
     }
 
     __exports__.forEach = forEach;/**
@@ -13344,7 +14050,7 @@ define("ember-metal/enumerable_utils",
      * @since 1.4.0
      */
     function filter(obj, callback, thisArg) {
-      return obj.filter ? obj.filter.call(obj, callback, thisArg) : _filter.call(obj, callback, thisArg);
+      return obj.filter ? obj.filter(callback, thisArg) : _filter.call(obj, callback, thisArg);
     }
 
     __exports__.filter = filter;/**
@@ -13358,7 +14064,7 @@ define("ember-metal/enumerable_utils",
      *
      */
     function indexOf(obj, element, index) {
-      return obj.indexOf ? obj.indexOf.call(obj, element, index) : _indexOf.call(obj, element, index);
+      return obj.indexOf ? obj.indexOf(element, index) : _indexOf.call(obj, element, index);
     }
 
     __exports__.indexOf = indexOf;/**
@@ -13417,9 +14123,13 @@ define("ember-metal/enumerable_utils",
     }
 
     __exports__.removeObject = removeObject;function _replace(array, idx, amt, objects) {
-      var args = [].concat(objects), chunk, ret = [],
-          // https://code.google.com/p/chromium/issues/detail?id=56588
-          size = 60000, start = idx, ends = amt, count;
+      var args = [].concat(objects);
+      var ret = [];
+      // https://code.google.com/p/chromium/issues/detail?id=56588
+      var size = 60000;
+      var start = idx;
+      var ends = amt;
+      var count, chunk;
 
       while (args.length) {
         count = ends > size ? size : ends;
@@ -13518,7 +14228,7 @@ define("ember-metal/enumerable_utils",
       replace: replace
     };
   });
-define("ember-metal/error",
+enifed("ember-metal/error",
   ["ember-metal/platform","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -13565,7 +14275,7 @@ define("ember-metal/error",
 
     __exports__["default"] = EmberError;
   });
-define("ember-metal/events",
+enifed("ember-metal/events",
   ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -13578,16 +14288,17 @@ define("ember-metal/events",
     */
     var Ember = __dependency1__["default"];
     var meta = __dependency2__.meta;
-    var META_KEY = __dependency2__.META_KEY;
     var tryFinally = __dependency2__.tryFinally;
     var apply = __dependency2__.apply;
     var applyStr = __dependency2__.applyStr;
     var create = __dependency3__.create;
 
-    var a_slice = [].slice,
-        metaFor = meta,
-        /* listener flags */
-        ONCE = 1, SUSPENDED = 2;
+    var a_slice = [].slice;
+    var metaFor = meta;
+
+    /* listener flags */
+    var ONCE = 1;
+    var SUSPENDED = 2;
 
 
     /*
@@ -13622,8 +14333,8 @@ define("ember-metal/events",
     }
 
     function actionsFor(obj, eventName) {
-      var meta = metaFor(obj, true),
-          actions;
+      var meta = metaFor(obj, true);
+      var actions;
 
       if (!meta.listeners) { meta.listeners = {}; }
 
@@ -13645,15 +14356,15 @@ define("ember-metal/events",
     }
 
     function listenersUnion(obj, eventName, otherActions) {
-      var meta = obj[META_KEY],
-          actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj['__ember_meta__'];
+      var actions = meta && meta.listeners && meta.listeners[eventName];
 
       if (!actions) { return; }
       for (var i = actions.length - 3; i >= 0; i -= 3) {
-        var target = actions[i],
-            method = actions[i+1],
-            flags = actions[i+2],
-            actionIndex = indexOf(otherActions, target, method);
+        var target = actions[i];
+        var method = actions[i+1];
+        var flags = actions[i+2];
+        var actionIndex = indexOf(otherActions, target, method);
 
         if (actionIndex === -1) {
           otherActions.push(target, method, flags);
@@ -13662,16 +14373,16 @@ define("ember-metal/events",
     }
 
     __exports__.listenersUnion = listenersUnion;function listenersDiff(obj, eventName, otherActions) {
-      var meta = obj[META_KEY],
-          actions = meta && meta.listeners && meta.listeners[eventName],
-          diffActions = [];
+      var meta = obj['__ember_meta__'];
+      var actions = meta && meta.listeners && meta.listeners[eventName];
+      var diffActions = [];
 
       if (!actions) { return; }
       for (var i = actions.length - 3; i >= 0; i -= 3) {
-        var target = actions[i],
-            method = actions[i+1],
-            flags = actions[i+2],
-            actionIndex = indexOf(otherActions, target, method);
+        var target = actions[i];
+        var method = actions[i+1];
+        var flags = actions[i+2];
+        var actionIndex = indexOf(otherActions, target, method);
 
         if (actionIndex !== -1) { continue; }
 
@@ -13701,9 +14412,9 @@ define("ember-metal/events",
         target = null;
       }
 
-      var actions = actionsFor(obj, eventName),
-          actionIndex = indexOf(actions, target, method),
-          flags = 0;
+      var actions = actionsFor(obj, eventName);
+      var actionIndex = indexOf(actions, target, method);
+      var flags = 0;
 
       if (once) flags |= ONCE;
 
@@ -13737,8 +14448,8 @@ define("ember-metal/events",
       }
 
       function _removeListener(target, method) {
-        var actions = actionsFor(obj, eventName),
-            actionIndex = indexOf(actions, target, method);
+        var actions = actionsFor(obj, eventName);
+        var actionIndex = indexOf(actions, target, method);
 
         // action doesn't exist, give up silently
         if (actionIndex === -1) { return; }
@@ -13753,8 +14464,8 @@ define("ember-metal/events",
       if (method) {
         _removeListener(target, method);
       } else {
-        var meta = obj[META_KEY],
-            actions = meta && meta.listeners && meta.listeners[eventName];
+        var meta = obj['__ember_meta__'];
+        var actions = meta && meta.listeners && meta.listeners[eventName];
 
         if (!actions) { return; }
         for (var i = actions.length - 3; i >= 0; i -= 3) {
@@ -13787,8 +14498,8 @@ define("ember-metal/events",
         target = null;
       }
 
-      var actions = actionsFor(obj, eventName),
-          actionIndex = indexOf(actions, target, method);
+      var actions = actionsFor(obj, eventName);
+      var actionIndex = indexOf(actions, target, method);
 
       if (actionIndex !== -1) {
         actions[actionIndex+2] |= SUSPENDED; // mark the action as suspended
@@ -13819,9 +14530,9 @@ define("ember-metal/events",
         target = null;
       }
 
-      var suspendedActions = [],
-          actionsList = [],
-          eventName, actions, i, l;
+      var suspendedActions = [];
+      var actionsList = [];
+      var eventName, actions, i, l;
 
       for (i=0, l=eventNames.length; i<l; i++) {
         eventName = eventNames[i];
@@ -13856,7 +14567,7 @@ define("ember-metal/events",
       @param obj
     */
     function watchedEvents(obj) {
-      var listeners = obj[META_KEY].listeners, ret = [];
+      var listeners = obj['__ember_meta__'].listeners, ret = [];
 
       if (listeners) {
         for(var eventName in listeners) {
@@ -13887,7 +14598,7 @@ define("ember-metal/events",
       }
 
       if (!actions) {
-        var meta = obj[META_KEY];
+        var meta = obj['__ember_meta__'];
         actions = meta && meta.listeners && meta.listeners[eventName];
       }
 
@@ -13924,8 +14635,8 @@ define("ember-metal/events",
       @param {String} eventName
     */
     function hasListeners(obj, eventName) {
-      var meta = obj[META_KEY],
-          actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj['__ember_meta__'];
+      var actions = meta && meta.listeners && meta.listeners[eventName];
 
       return !!(actions && actions.length);
     }
@@ -13939,14 +14650,14 @@ define("ember-metal/events",
     */
     function listenersFor(obj, eventName) {
       var ret = [];
-      var meta = obj[META_KEY],
-          actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj['__ember_meta__'];
+      var actions = meta && meta.listeners && meta.listeners[eventName];
 
       if (!actions) { return ret; }
 
       for (var i = 0, l = actions.length; i < l; i += 3) {
-        var target = actions[i],
-            method = actions[i+1];
+        var target = actions[i];
+        var method = actions[i+1];
         ret.push([target, method]);
       }
 
@@ -13977,58 +14688,68 @@ define("ember-metal/events",
       @return func
     */
     function on(){
-      var func = a_slice.call(arguments, -1)[0],
-          events = a_slice.call(arguments, 0, -1);
+      var func = a_slice.call(arguments, -1)[0];
+      var events = a_slice.call(arguments, 0, -1);
       func.__ember_listens__ = events;
       return func;
     }
 
     __exports__.on = on;__exports__.removeListener = removeListener;
   });
-define("ember-metal/expand_properties",
-  ["ember-metal/error","ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-metal/expand_properties",
+  ["ember-metal/core","ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var EmberError = __dependency1__["default"];
-    var forEach = __dependency2__.forEach;
+    var Ember = __dependency1__["default"];
+    var EmberError = __dependency2__["default"];
+    var forEach = __dependency3__.forEach;
 
     /**
       @module ember-metal
       */
 
     var BRACE_EXPANSION = /^((?:[^\.]*\.)*)\{(.*)\}$/;
+    var SPLIT_REGEX = /\{|\}/;
 
     /**
       Expands `pattern`, invoking `callback` for each expansion.
 
       The only pattern supported is brace-expansion, anything else will be passed
-      once to `callback` directly. Brace expansion can only appear at the end of a
-      pattern, for an example see the last call below.
+      once to `callback` directly.
 
       Example
+
       ```js
       function echo(arg){ console.log(arg); }
 
-      Ember.expandProperties('foo.bar', echo);        //=> 'foo.bar'
-      Ember.expandProperties('{foo,bar}', echo);      //=> 'foo', 'bar'
-      Ember.expandProperties('foo.{bar,baz}', echo);  //=> 'foo.bar', 'foo.baz'
-      Ember.expandProperties('{foo,bar}.baz', echo);  //=> '{foo,bar}.baz'
+      Ember.expandProperties('foo.bar', echo);              //=> 'foo.bar'
+      Ember.expandProperties('{foo,bar}', echo);            //=> 'foo', 'bar'
+      Ember.expandProperties('foo.{bar,baz}', echo);        //=> 'foo.bar', 'foo.baz'
+      Ember.expandProperties('{foo,bar}.baz', echo);        //=> '{foo,bar}.baz'
+      Ember.expandProperties('foo.{bar,baz}.@each', echo)   //=> 'foo.bar.@each', 'foo.baz.@each'
+      Ember.expandProperties('{foo,bar}.{spam,eggs}', echo) //=> 'foo.spam', 'foo.eggs', 'bar.spam', 'bar.eggs'
+      Ember.expandProperties('{foo}.bar.{baz}')             //=> 'foo.bar.baz'
       ```
 
       @method
       @private
-      @param {string} pattern The property pattern to expand.
-      @param {function} callback The callback to invoke.  It is invoked once per
+      @param {String} pattern The property pattern to expand.
+      @param {Function} callback The callback to invoke.  It is invoked once per
       expansion, and is passed the expansion.
       */
     __exports__["default"] = function expandProperties(pattern, callback) {
-      var match, prefix, list;
-
       if (pattern.indexOf(' ') > -1) {
-        throw new EmberError('Brace expanded properties cannot contain spaces, ' + 
+        throw new EmberError('Brace expanded properties cannot contain spaces, ' +
           'e.g. `user.{firstName, lastName}` should be `user.{firstName,lastName}`');
       }
 
+      
+        return newExpandProperties(pattern, callback);
+          }
+
+    function oldExpandProperties(pattern, callback) {
+      var match, prefix, list;
+
       if (match = BRACE_EXPANSION.exec(pattern)) {
         prefix = match[1];
         list = match[2];
@@ -14040,8 +14761,41 @@ define("ember-metal/expand_properties",
         callback(pattern);
       }
     }
+
+    function newExpandProperties(pattern, callback) {
+      if ('string' === Ember.typeOf(pattern)) {
+        var parts = pattern.split(SPLIT_REGEX);
+        var properties = [parts];
+
+        forEach(parts, function(part, index) {
+          if (part.indexOf(',') >= 0) {
+            properties = duplicateAndReplace(properties, part.split(','), index);
+          }
+        });
+
+        forEach(properties, function(property) {
+          callback(property.join(''));
+        });
+      } else {
+        callback(pattern);
+      }
+    }
+
+    function duplicateAndReplace(properties, currentParts, index) {
+      var all = [];
+
+      forEach(properties, function(property) {
+        forEach(currentParts, function(part) {
+          var current = property.slice(0);
+          current[index] = part;
+          all.push(current);
+        });
+      });
+
+      return all;
+    }
   });
-define("ember-metal/get_properties",
+enifed("ember-metal/get_properties",
   ["ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14070,9 +14824,9 @@ define("ember-metal/get_properties",
       @return {Hash}
     */
     __exports__["default"] = function getProperties(obj) {
-      var ret = {},
-          propertyNames = arguments,
-          i = 1;
+      var ret = {};
+      var propertyNames = arguments;
+      var i = 1;
 
       if (arguments.length === 2 && typeOf(arguments[1]) === 'array') {
         i = 0;
@@ -14084,7 +14838,7 @@ define("ember-metal/get_properties",
       return ret;
     }
   });
-define("ember-metal/instrumentation",
+enifed("ember-metal/instrumentation",
   ["ember-metal/core","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14137,10 +14891,12 @@ define("ember-metal/instrumentation",
       @namespace Ember
       @static
     */
-    var subscribers = [], cache = {};
+    var subscribers = [];
+    __exports__.subscribers = subscribers;var cache = {};
 
     var populateListeners = function(name) {
-      var listeners = [], subscriber;
+      var listeners = [];
+      var subscriber;
 
       for (var i=0, l=subscribers.length; i<l; i++) {
         subscriber = subscribers[i];
@@ -14171,56 +14927,72 @@ define("ember-metal/instrumentation",
       @param {Function} callback Function that you're instrumenting.
       @param {Object} binding Context that instrument function is called with.
     */
-    function instrument(name, payload, callback, binding) {
-      var listeners = cache[name], timeName, ret;
-
-      // ES6TODO: Docs. What is this?
-      if (Ember.STRUCTURED_PROFILE) {
-        timeName = name + ": " + payload.object;
-        console.time(timeName);
+    function instrument(name, _payload, callback, binding) {
+      if (subscribers.length === 0) {
+        return callback.call(binding);
       }
+      var payload = _payload || {};
+      var finalizer = _instrumentStart(name, function () {
+        return payload;
+      });
+      if (finalizer) {
+        var tryable = function _instrumenTryable() {
+          return callback.call(binding);
+        };
+        var catchable = function _instrumentCatchable(e) {
+          payload.exception = e;
+        };
+        return tryCatchFinally(tryable, catchable, finalizer);
+      } else {
+        return callback.call(binding);
+      }
+    }
+
+    __exports__.instrument = instrument;// private for now
+    function _instrumentStart(name, _payload) {
+      var listeners = cache[name];
 
       if (!listeners) {
         listeners = populateListeners(name);
       }
 
       if (listeners.length === 0) {
-        ret = callback.call(binding);
-        if (Ember.STRUCTURED_PROFILE) { console.timeEnd(timeName); }
-        return ret;
+        return;
       }
 
-      var beforeValues = [], listener, i, l;
+      var payload = _payload();
 
-      function tryable() {
+      var STRUCTURED_PROFILE = Ember.STRUCTURED_PROFILE;
+      var timeName;
+      if (STRUCTURED_PROFILE) {
+        timeName = name + ": " + payload.object;
+        console.time(timeName);
+      }
+
+      var l = listeners.length;
+      var beforeValues = new Array(l);
+      var i, listener;
+      var timestamp = time();
+      for (i=0; i<l; i++) {
+        listener = listeners[i];
+        beforeValues[i] = listener.before(name, timestamp, payload);
+      }
+
+      return function _instrumentEnd() {
+        var i, l, listener;
+        var timestamp = time();
         for (i=0, l=listeners.length; i<l; i++) {
           listener = listeners[i];
-          beforeValues[i] = listener.before(name, time(), payload);
+          listener.after(name, timestamp, payload, beforeValues[i]);
         }
 
-        return callback.call(binding);
-      }
-
-      function catchable(e) {
-        payload = payload || {};
-        payload.exception = e;
-      }
-
-      function finalizer() {
-        for (i=0, l=listeners.length; i<l; i++) {
-          listener = listeners[i];
-          listener.after(name, time(), payload, beforeValues[i]);
-        }
-
-        if (Ember.STRUCTURED_PROFILE) {
+        if (STRUCTURED_PROFILE) {
           console.timeEnd(timeName);
         }
-      }
-
-      return tryCatchFinally(tryable, catchable, finalizer);
+      };
     }
 
-    __exports__.instrument = instrument;/**
+    __exports__._instrumentStart = _instrumentStart;/**
       Subscribes to a particular event or instrumented block of code.
 
       @method subscribe
@@ -14286,13 +15058,13 @@ define("ember-metal/instrumentation",
       @namespace Ember.Instrumentation
     */
     function reset() {
-      subscribers = [];
+      subscribers.length = 0;
       cache = {};
     }
 
     __exports__.reset = reset;
   });
-define("ember-metal/is_blank",
+enifed("ember-metal/is_blank",
   ["ember-metal/core","ember-metal/is_empty","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14327,7 +15099,7 @@ define("ember-metal/is_blank",
       return isEmpty(obj) || (typeof obj === 'string' && obj.match(/\S/) === null);
     }
   });
-define("ember-metal/is_empty",
+enifed("ember-metal/is_empty",
   ["ember-metal/core","ember-metal/property_get","ember-metal/is_none","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -14340,7 +15112,7 @@ define("ember-metal/is_empty",
       Verifies that a value is `null` or an empty string, empty array,
       or empty function.
 
-      Constrains the rules on `Ember.isNone` by returning false for empty
+      Constrains the rules on `Ember.isNone` by returning true for empty
       string and empty arrays.
 
       ```javascript
@@ -14359,7 +15131,36 @@ define("ember-metal/is_empty",
       @return {Boolean}
     */
     function isEmpty(obj) {
-      return isNone(obj) || (obj.length === 0 && typeof obj !== 'function') || (typeof obj === 'object' && get(obj, 'length') === 0);
+      var none = isNone(obj);
+      if (none) {
+        return none;
+      }
+
+      if (typeof obj.size === 'number') {
+        return !obj.size;
+      }
+
+      var objectType = typeof obj;
+
+      if (objectType === 'object') {
+        var size = get(obj, 'size');
+        if (typeof size === 'number') {
+          return !size;
+        }
+      }
+
+      if (typeof obj.length === 'number' && objectType !== 'function') {
+        return !obj.length;
+      }
+
+      if (objectType === 'object') {
+        var length = get(obj, 'length');
+        if (typeof length === 'number') {
+          return !length;
+        }
+      }
+
+      return false;
     }
 
     var empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", isEmpty);
@@ -14368,7 +15169,7 @@ define("ember-metal/is_empty",
     __exports__.isEmpty = isEmpty;
     __exports__.empty = empty;
   });
-define("ember-metal/is_none",
+enifed("ember-metal/is_none",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -14403,7 +15204,109 @@ define("ember-metal/is_none",
     __exports__["default"] = isNone;
     __exports__.isNone = isNone;
   });
-define("ember-metal/libraries",
+enifed("ember-metal/is_present",
+  ["ember-metal/is_blank","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var isBlank = __dependency1__["default"];
+    var isPresent;
+
+    
+      /**
+        A value is present if it not `isBlank`.
+
+        ```javascript
+        Ember.isPresent();                // false
+        Ember.isPresent(null);            // false
+        Ember.isPresent(undefined);       // false
+        Ember.isPresent('');              // false
+        Ember.isPresent([]);              // false
+        Ember.isPresent('\n\t');          // false
+        Ember.isPresent('  ');            // false
+        Ember.isPresent({});              // true
+        Ember.isPresent('\n\t Hello');    // true
+        Ember.isPresent('Hello world');   // true
+        Ember.isPresent([1,2,3]);         // true
+        ```
+
+        @method isPresent
+        @for Ember
+        @param {Object} obj Value to test
+        @return {Boolean}
+        @since 1.7.0
+        */
+      isPresent = function isPresent(obj) {
+        return !isBlank(obj);
+      };
+    
+
+    __exports__["default"] = isPresent;
+  });
+enifed("ember-metal/keys",
+  ["ember-metal/platform","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var canDefineNonEnumerableProperties = __dependency1__.canDefineNonEnumerableProperties;
+
+    /**
+      Returns all of the keys defined on an object or hash. This is useful
+      when inspecting objects for debugging. On browsers that support it, this
+      uses the native `Object.keys` implementation.
+
+      @method keys
+      @for Ember
+      @param {Object} obj
+      @return {Array} Array containing keys of obj
+    */
+    var keys = Object.keys;
+
+    if (!keys || !canDefineNonEnumerableProperties) {
+      // modified from
+      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
+      keys = (function () {
+        var hasOwnProperty = Object.prototype.hasOwnProperty,
+            hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),
+            dontEnums = [
+              'toString',
+              'toLocaleString',
+              'valueOf',
+              'hasOwnProperty',
+              'isPrototypeOf',
+              'propertyIsEnumerable',
+              'constructor'
+            ],
+            dontEnumsLength = dontEnums.length;
+
+        return function keys(obj) {
+          if (typeof obj !== 'object' && (typeof obj !== 'function' || obj === null)) {
+            throw new TypeError('Object.keys called on non-object');
+          }
+
+          var result = [], prop, i;
+
+          for (prop in obj) {
+            if (prop !== '_super' &&
+              prop.lastIndexOf('__',0) !== 0 &&
+              hasOwnProperty.call(obj, prop)) {
+              result.push(prop);
+            }
+          }
+
+          if (hasDontEnumBug) {
+            for (i = 0; i < dontEnumsLength; i++) {
+              if (hasOwnProperty.call(obj, dontEnums[i])) {
+                result.push(dontEnums[i]);
+              }
+            }
+          }
+          return result;
+        };
+      }());
+    }
+
+    __exports__["default"] = keys;
+  });
+enifed("ember-metal/libraries",
   ["ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -14451,7 +15354,7 @@ define("ember-metal/libraries",
 
     __exports__["default"] = libraries;
   });
-define("ember-metal/logger",
+enifed("ember-metal/logger",
   ["ember-metal/core","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14599,8 +15502,8 @@ define("ember-metal/logger",
       assert: consoleMethod('assert') || assertPolyfill
     };
   });
-define("ember-metal/map",
-  ["ember-metal/property_set","ember-metal/utils","ember-metal/array","ember-metal/platform","exports"],
+enifed("ember-metal/map",
+  ["ember-metal/utils","ember-metal/array","ember-metal/platform","ember-metal/deprecate_property","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
@@ -14618,37 +15521,44 @@ define("ember-metal/map",
 
       This implementation follows the current iteration of the ES6 proposal for
       maps (http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets),
-      with two exceptions. First, because we need our implementation to be pleasant
-      on older browsers, we do not use the `delete` name (using `remove` instead).
-      Second, as we do not have the luxury of in-VM iteration, we implement a
+      with one exception:  as we do not have the luxury of in-VM iteration, we implement a
       forEach method for iteration.
 
       Map is mocked out to look like an Ember object, so you can do
       `Ember.Map.create()` for symmetry with other Ember classes.
     */
 
-    var set = __dependency1__.set;
-    var guidFor = __dependency2__.guidFor;
-    var indexOf = __dependency3__.indexOf;
-    var create = __dependency4__.create;
+    var guidFor = __dependency1__.guidFor;
+    var indexOf = __dependency2__.indexOf;
+    var create = __dependency3__.create;
+    var deprecateProperty = __dependency4__.deprecateProperty;
 
-    function copy(obj) {
-      var output = {};
+    function missingFunction(fn) {
+      throw new TypeError('' + Object.prototype.toString.call(fn) + " is not a function");
+    }
+
+    function missingNew(name) {
+      throw new TypeError("Constructor " + name + "requires 'new'");
+    }
+
+    function copyNull(obj) {
+      var output = create(null);
 
       for (var prop in obj) {
-        if (obj.hasOwnProperty(prop)) { output[prop] = obj[prop]; }
+        // hasOwnPropery is not needed because obj is Object.create(null);
+        output[prop] = obj[prop];
       }
 
       return output;
     }
 
     function copyMap(original, newObject) {
-      var keys = original.keys.copy(),
-          values = copy(original.values);
+      var keys = original.keys.copy();
+      var values = copyNull(original.values);
 
       newObject.keys = keys;
       newObject.values = values;
-      newObject.length = original.length;
+      newObject.size = original.size;
 
       return newObject;
     }
@@ -14664,7 +15574,13 @@ define("ember-metal/map",
       @private
     */
     function OrderedSet() {
-      this.clear();
+
+      if (this instanceof OrderedSet) {
+        this.clear();
+        this._silenceRemoveDeprecation = false;
+      } else {
+        missingNew("OrderedSet");
+      }
     }
 
     /**
@@ -14673,48 +15589,78 @@ define("ember-metal/map",
       @return {Ember.OrderedSet}
     */
     OrderedSet.create = function() {
-      return new OrderedSet();
+      var Constructor = this;
+
+      return new Constructor();
     };
 
-
     OrderedSet.prototype = {
+      constructor: OrderedSet,
       /**
         @method clear
       */
       clear: function() {
-        this.presenceSet = {};
+        this.presenceSet = create(null);
         this.list = [];
+        this.size = 0;
       },
 
       /**
         @method add
         @param obj
+        @param guid (optional, and for internal use)
+        @return {Ember.OrderedSet}
       */
-      add: function(obj) {
-        var guid = guidFor(obj),
-            presenceSet = this.presenceSet,
-            list = this.list;
+      add: function(obj, _guid) {
+        var guid = _guid || guidFor(obj);
+        var presenceSet = this.presenceSet;
+        var list = this.list;
 
-        if (guid in presenceSet) { return; }
+        if (presenceSet[guid] === true) {
+          return;
+        }
 
         presenceSet[guid] = true;
-        list.push(obj);
+        this.size = list.push(obj);
+
+        return this;
       },
 
       /**
+        @deprecated
+
         @method remove
         @param obj
+        @param _guid (optional and for internal use only)
+        @return {Boolean}
       */
-      remove: function(obj) {
-        var guid = guidFor(obj),
-            presenceSet = this.presenceSet,
-            list = this.list;
+      remove: function(obj, _guid) {
+        Ember.deprecate('Calling `OrderedSet.prototype.remove` has been deprecated, please use `OrderedSet.prototype.delete` instead.', this._silenceRemoveDeprecation);
 
-        delete presenceSet[guid];
+        return this["delete"](obj, _guid);
+      },
 
-        var index = indexOf.call(list, obj);
-        if (index > -1) {
-          list.splice(index, 1);
+      /**
+        @method delete
+        @param obj
+        @param _guid (optional and for internal use only)
+        @return {Boolean}
+      */
+      "delete": function(obj, _guid) {
+        var guid = _guid || guidFor(obj);
+        var presenceSet = this.presenceSet;
+        var list = this.list;
+
+        if (presenceSet[guid] === true) {
+          delete presenceSet[guid];
+          var index = indexOf.call(list, obj);
+          if (index > -1) {
+            list.splice(index, 1);
+          }
+          this.size = list.length;
+          return true;
+        } else {
+          return false;
         }
       },
 
@@ -14723,7 +15669,7 @@ define("ember-metal/map",
         @return {Boolean}
       */
       isEmpty: function() {
-        return this.list.length === 0;
+        return this.size === 0;
       },
 
       /**
@@ -14732,10 +15678,12 @@ define("ember-metal/map",
         @return {Boolean}
       */
       has: function(obj) {
-        var guid = guidFor(obj),
-            presenceSet = this.presenceSet;
+        if (this.size === 0) { return false; }
 
-        return guid in presenceSet;
+        var guid = guidFor(obj);
+        var presenceSet = this.presenceSet;
+
+        return presenceSet[guid] === true;
       },
 
       /**
@@ -14743,12 +15691,25 @@ define("ember-metal/map",
         @param {Function} fn
         @param self
       */
-      forEach: function(fn, self) {
-        // allow mutation during iteration
-        var list = this.toArray();
+      forEach: function(fn /*, thisArg*/) {
+        if (typeof fn !== 'function') {
+          missingFunction(fn);
+        }
 
-        for (var i = 0, j = list.length; i < j; i++) {
-          fn.call(self, list[i]);
+        if (this.size === 0) { return; }
+
+        var list = this.list;
+        var length = arguments.length;
+        var i;
+
+        if (length === 2) {
+          for (i = 0; i < list.length; i++) {
+            fn.call(arguments[1], list[i]);
+          }
+        } else {
+          for (i = 0; i < list.length; i++) {
+            fn(list[i]);
+          }
         }
       },
 
@@ -14765,15 +15726,20 @@ define("ember-metal/map",
         @return {Ember.OrderedSet}
       */
       copy: function() {
-        var set = new OrderedSet();
+        var Constructor = this.constructor;
+        var set = new Constructor();
 
-        set.presenceSet = copy(this.presenceSet);
+        set._silenceRemoveDeprecation = this._silenceRemoveDeprecation;
+        set.presenceSet = copyNull(this.presenceSet);
         set.list = this.toArray();
+        set.size = this.size;
 
         return set;
       }
     };
 
+    deprecateProperty(OrderedSet.prototype, 'length', 'size');
+
     /**
       A Map stores values indexed by keys. Unlike JavaScript's
       default Objects, the keys of a Map can be any JavaScript
@@ -14795,8 +15761,14 @@ define("ember-metal/map",
       @constructor
     */
     function Map() {
-      this.keys = OrderedSet.create();
-      this.values = {};
+      if (this instanceof this.constructor) {
+        this.keys = OrderedSet.create();
+        this.keys._silenceRemoveDeprecation = true;
+        this.values = create(null);
+        this.size = 0;
+      } else {
+        missingNew("OrderedSet");
+      }
     }
 
     Ember.Map = Map;
@@ -14806,18 +15778,21 @@ define("ember-metal/map",
       @static
     */
     Map.create = function() {
-      return new Map();
+      var Constructor = this;
+      return new Constructor();
     };
 
     Map.prototype = {
+      constructor: Map,
+
       /**
         This property will change as the number of objects in the map changes.
 
-        @property length
+        @property size
         @type number
         @default 0
       */
-      length: 0,
+      size: 0,
 
       /**
         Retrieve the value associated with a given key.
@@ -14827,8 +15802,10 @@ define("ember-metal/map",
         @return {*} the value associated with the key, or `undefined`
       */
       get: function(key) {
-        var values = this.values,
-            guid = guidFor(key);
+        if (this.size === 0) { return; }
+
+        var values = this.values;
+        var guid = guidFor(key);
 
         return values[guid];
       },
@@ -14840,18 +15817,27 @@ define("ember-metal/map",
         @method set
         @param {*} key
         @param {*} value
+        @return {Ember.Map}
       */
       set: function(key, value) {
-        var keys = this.keys,
-            values = this.values,
-            guid = guidFor(key);
+        var keys = this.keys;
+        var values = this.values;
+        var guid = guidFor(key);
+
+        // ensure we don't store -0
+        var k = key === -0 ? 0 : key;
+
+        keys.add(k, guid);
 
-        keys.add(key);
         values[guid] = value;
-        set(this, 'length', keys.list.length);
+
+        this.size = keys.size;
+
+        return this;
       },
 
       /**
+        @deprecated see delete
         Removes a value from the map for an associated key.
 
         @method remove
@@ -14859,16 +15845,29 @@ define("ember-metal/map",
         @return {Boolean} true if an item was removed, false otherwise
       */
       remove: function(key) {
+        Ember.deprecate('Calling `Map.prototype.remove` has been deprecated, please use `Map.prototype.delete` instead.');
+
+        return this["delete"](key);
+      },
+
+      /**
+        Removes a value from the map for an associated key.
+
+        @method delete
+        @param {*} key
+        @return {Boolean} true if an item was removed, false otherwise
+      */
+      "delete": function(key) {
+        if (this.size === 0) { return false; }
         // don't use ES6 "delete" because it will be annoying
         // to use in browsers that are not ES6 friendly;
-        var keys = this.keys,
-            values = this.values,
-            guid = guidFor(key);
+        var keys = this.keys;
+        var values = this.values;
+        var guid = guidFor(key);
 
-        if (values.hasOwnProperty(guid)) {
-          keys.remove(key);
+        if (keys["delete"](key, guid)) {
           delete values[guid];
-          set(this, 'length', keys.list.length);
+          this.size = keys.size;
           return true;
         } else {
           return false;
@@ -14883,10 +15882,7 @@ define("ember-metal/map",
         @return {Boolean} true if the item was present, false otherwise
       */
       has: function(key) {
-        var values = this.values,
-            guid = guidFor(key);
-
-        return values.hasOwnProperty(guid);
+        return this.keys.has(key);
       },
 
       /**
@@ -14900,14 +15896,38 @@ define("ember-metal/map",
         @param {*} self if passed, the `this` value inside the
           callback. By default, `this` is the map.
       */
-      forEach: function(callback, self) {
-        var keys = this.keys,
-            values = this.values;
+      forEach: function(callback /*, thisArg*/) {
+        if (typeof callback !== 'function') {
+          missingFunction(callback);
+        }
 
-        keys.forEach(function(key) {
-          var guid = guidFor(key);
-          callback.call(self, key, values[guid]);
-        });
+        if (this.size === 0) { return; }
+
+        var length = arguments.length;
+        var map = this;
+        var cb, thisArg;
+
+        if (length === 2) {
+          thisArg = arguments[1];
+          cb = function(key) {
+            callback.call(thisArg, map.get(key), key);
+          };
+        } else {
+          cb = function(key) {
+            callback(map.get(key), key);
+          };
+        }
+
+        this.keys.forEach(cb);
+      },
+
+      /**
+        @method clear
+      */
+      clear: function() {
+        this.keys.clear();
+        this.values = create(null);
+        this.size = 0;
       },
 
       /**
@@ -14919,6 +15939,8 @@ define("ember-metal/map",
       }
     };
 
+    deprecateProperty(Map.prototype, 'length', 'size');
+
     /**
       @class MapWithDefault
       @namespace Ember
@@ -14929,7 +15951,7 @@ define("ember-metal/map",
         @param {*} [options.defaultValue]
     */
     function MapWithDefault(options) {
-      Map.call(this);
+      this._super$constructor();
       this.defaultValue = options.defaultValue;
     }
 
@@ -14950,6 +15972,9 @@ define("ember-metal/map",
     };
 
     MapWithDefault.prototype = create(Map.prototype);
+    MapWithDefault.prototype.constructor = MapWithDefault;
+    MapWithDefault.prototype._super$constructor = Map;
+    MapWithDefault.prototype._super$get = Map.prototype.get;
 
     /**
       Retrieve the value associated with a given key.
@@ -14962,7 +15987,7 @@ define("ember-metal/map",
       var hasValue = this.has(key);
 
       if (hasValue) {
-        return Map.prototype.get.call(this, key);
+        return this._super$get(key);
       } else {
         var defaultValue = this.defaultValue(key);
         this.set(key, defaultValue);
@@ -14975,19 +16000,24 @@ define("ember-metal/map",
       @return {Ember.MapWithDefault}
     */
     MapWithDefault.prototype.copy = function() {
-      return copyMap(this, new MapWithDefault({
+      var Constructor = this.constructor;
+      return copyMap(this, new Constructor({
         defaultValue: this.defaultValue
       }));
     };
 
+    __exports__["default"] = Map;
+
     __exports__.OrderedSet = OrderedSet;
     __exports__.Map = Map;
     __exports__.MapWithDefault = MapWithDefault;
   });
-define("ember-metal/merge",
-  ["exports"],
-  function(__exports__) {
+enifed("ember-metal/merge",
+  ["ember-metal/keys","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
+    var keys = __dependency1__["default"];
+
     /**
       Merge the contents of two objects together into the first object.
 
@@ -15004,14 +16034,23 @@ define("ember-metal/merge",
       @return {Object}
     */
     __exports__["default"] = function merge(original, updates) {
-      for (var prop in updates) {
-        if (!updates.hasOwnProperty(prop)) { continue; }
+      if (!updates || typeof updates !== 'object') { 
+        return original;
+      }
+
+      var props = keys(updates);
+      var prop;
+      var length = props.length;
+
+      for (var i = 0; i < length; i++) {
+        prop = props[i];
         original[prop] = updates[prop];
       }
+
       return original;
     }
   });
-define("ember-metal/mixin",
+enifed("ember-metal/mixin",
   ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","ember-metal/utils","ember-metal/expand_properties","ember-metal/properties","ember-metal/computed","ember-metal/binding","ember-metal/observer","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -15033,10 +16072,10 @@ define("ember-metal/mixin",
     var create = __dependency4__.create;
     var guidFor = __dependency5__.guidFor;
     var meta = __dependency5__.meta;
-    var META_KEY = __dependency5__.META_KEY;
     var wrap = __dependency5__.wrap;
     var makeArray = __dependency5__.makeArray;
     var apply = __dependency5__.apply;
+    var isArray = __dependency5__.isArray;
     var expandProperties = __dependency6__["default"];
     var Descriptor = __dependency7__.Descriptor;
     var defineProperty = __dependency7__.defineProperty;
@@ -15049,26 +16088,32 @@ define("ember-metal/mixin",
     var addListener = __dependency11__.addListener;
     var removeListener = __dependency11__.removeListener;
 
-    var REQUIRED,
-        a_map = map,
-        a_indexOf = indexOf,
-        a_forEach = forEach,
-        a_slice = [].slice,
-        o_create = create,
-        metaFor = meta;
+    var REQUIRED;
+    var a_map = map;
+    var a_indexOf = indexOf;
+    var a_forEach = forEach;
+    var a_slice = [].slice;
+    var o_create = create;
+    var metaFor = meta;
 
     function superFunction(){
-      var ret, func = this.__nextSuper;
+      var func = this.__nextSuper;
+      var ret;
       if (func) {
+        var args = new Array(arguments.length);
+        for (var i = 0, l = args.length; i < l; i++) {
+          args[i] = arguments[i];
+        }
         this.__nextSuper = null;
-        ret = apply(this, func, arguments);
+        ret = apply(this, func, args);
         this.__nextSuper = func;
       }
       return ret;
     }
 
     function mixinsMeta(obj) {
-      var m = metaFor(obj, true), ret = m.mixins;
+      var m = metaFor(obj, true);
+      var ret = m.mixins;
       if (!ret) {
         ret = m.mixins = {};
       } else if (!m.hasOwnProperty('mixins')) {
@@ -15139,7 +16184,7 @@ define("ember-metal/mixin",
       // it on the original object.
       superProperty = superProperty || meta.descs[key];
 
-      if (!superProperty || !(superProperty instanceof ComputedProperty)) {
+      if (superProperty === undefined || !(superProperty instanceof ComputedProperty)) {
         return property;
       }
 
@@ -15166,7 +16211,7 @@ define("ember-metal/mixin",
       superMethod = superMethod || obj[key];
 
       // Only wrap the new method if the original method was a function
-      if ('function' !== typeof superMethod) {
+      if (superMethod === undefined || 'function' !== typeof superMethod) {
         return method;
       }
 
@@ -15190,10 +16235,13 @@ define("ember-metal/mixin",
     function applyMergedProperties(obj, key, value, values) {
       var baseValue = values[key] || obj[key];
 
+      Ember.assert("You passed in `" + JSON.stringify(value) + "` as the value for `" + key +
+                   "` but `" + key + "` cannot be an Array", !isArray(value));
+
       if (!baseValue) { return value; }
 
-      var newBase = merge({}, baseValue),
-          hasFunction = false;
+      var newBase = merge({}, baseValue);
+      var hasFunction = false;
 
       for (var prop in value) {
         if (!value.hasOwnProperty(prop)) { continue; }
@@ -15296,7 +16344,8 @@ define("ember-metal/mixin",
 
     function connectBindings(obj, m) {
       // TODO Mixin.apply(instance) should disconnect binding if exists
-      var bindings = m.bindings, key, binding, to;
+      var bindings = m.bindings;
+      var key, binding, to;
       if (bindings) {
         for (key in bindings) {
           binding = bindings[key];
@@ -15323,7 +16372,8 @@ define("ember-metal/mixin",
     }
 
     function followAlias(obj, desc, m, descs, values) {
-      var altKey = desc.methodName, value;
+      var altKey = desc.methodName;
+      var value;
       if (descs[altKey] || values[altKey]) {
         value = values[altKey];
         desc  = descs[altKey];
@@ -15365,8 +16415,11 @@ define("ember-metal/mixin",
     }
 
     function applyMixin(obj, mixins, partial) {
-      var descs = {}, values = {}, m = metaFor(obj),
-          key, value, desc, keys = [];
+      var descs = {};
+      var values = {};
+      var m = metaFor(obj);
+      var keys = [];
+      var key, value, desc;
 
       obj._super = superFunction;
 
@@ -15525,7 +16578,9 @@ define("ember-metal/mixin",
         this.mixins = [];
       }
 
-      var len = arguments.length, mixins = this.mixins, idx;
+      var len = arguments.length;
+      var mixins = this.mixins;
+      var idx;
 
       for(idx=0; idx < len; idx++) {
         mixin = arguments[idx];
@@ -15564,7 +16619,8 @@ define("ember-metal/mixin",
       seen[guid] = true;
 
       if (curMixin === targetMixin) { return true; }
-      var mixins = curMixin.mixins, loc = mixins ? mixins.length : 0;
+      var mixins = curMixin.mixins;
+      var loc = mixins ? mixins.length : 0;
       while (--loc >= 0) {
         if (_detect(mixins[loc], targetMixin, seen)) { return true; }
       }
@@ -15579,8 +16635,8 @@ define("ember-metal/mixin",
     MixinPrototype.detect = function(obj) {
       if (!obj) { return false; }
       if (obj instanceof Mixin) { return _detect(obj, this, {}); }
-      var m = obj[META_KEY],
-          mixins = m && m.mixins;
+      var m = obj['__ember_meta__'];
+      var mixins = m && m.mixins;
       if (mixins) {
         return !!mixins[guidFor(this)];
       }
@@ -15608,7 +16664,9 @@ define("ember-metal/mixin",
     }
 
     MixinPrototype.keys = function() {
-      var keys = {}, seen = {}, ret = [];
+      var keys = {};
+      var seen = {};
+      var ret = [];
       _keys(keys, this, seen);
       for(var key in keys) {
         if (keys.hasOwnProperty(key)) { ret.push(key); }
@@ -15619,8 +16677,9 @@ define("ember-metal/mixin",
     // returns the mixins currently applied to the specified object
     // TODO: Make Ember.mixin
     Mixin.mixins = function(obj) {
-      var m = obj[META_KEY],
-          mixins = m && m.mixins, ret = [];
+      var m = obj['__ember_meta__'];
+      var mixins = m && m.mixins;
+      var ret = [];
 
       if (!mixins) { return ret; }
 
@@ -15665,7 +16724,7 @@ define("ember-metal/mixin",
       });
 
       var goodGuy = App.Person.create();
-      
+
       goodGuy.name();    // 'Tomhuda Katzdale'
       goodGuy.moniker(); // 'Tomhuda Katzdale'
       ```
@@ -15840,7 +16899,7 @@ define("ember-metal/mixin",
     __exports__.beforeObserver = beforeObserver;__exports__.IS_BINDING = IS_BINDING;
     __exports__.Mixin = Mixin;
   });
-define("ember-metal/observer",
+enifed("ember-metal/observer",
   ["ember-metal/watching","ember-metal/array","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -15959,7 +17018,7 @@ define("ember-metal/observer",
 
     __exports__.removeBeforeObserver = removeBeforeObserver;
   });
-define("ember-metal/observer_set",
+enifed("ember-metal/observer_set",
   ["ember-metal/utils","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -15991,11 +17050,11 @@ define("ember-metal/observer_set",
 
 
     ObserverSet.prototype.add = function(sender, keyName, eventName) {
-      var observerSet = this.observerSet,
-          observers = this.observers,
-          senderGuid = guidFor(sender),
-          keySet = observerSet[senderGuid],
-          index;
+      var observerSet = this.observerSet;
+      var observers = this.observers;
+      var senderGuid = guidFor(sender);
+      var keySet = observerSet[senderGuid];
+      var index;
 
       if (!keySet) {
         observerSet[senderGuid] = keySet = {};
@@ -16014,7 +17073,8 @@ define("ember-metal/observer_set",
     };
 
     ObserverSet.prototype.flush = function() {
-      var observers = this.observers, i, len, observer, sender;
+      var observers = this.observers;
+      var i, len, observer, sender;
       this.clear();
       for (i=0, len=observers.length; i < len; ++i) {
         observer = observers[i];
@@ -16029,22 +17089,62 @@ define("ember-metal/observer_set",
       this.observers = [];
     };
   });
-define("ember-metal/platform",
-  ["ember-metal/core","exports"],
+enifed("ember-metal/path_cache",
+  ["ember-metal/cache","exports"],
   function(__dependency1__, __exports__) {
-        // Remove "use strict"; from transpiled module (in browser builds only) until
-    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
-    //
-    // REMOVE_USE_STRICT: true
+    "use strict";
+    var Cache = __dependency1__["default"];
 
-    /*globals Node */
+    var IS_GLOBAL      = /^([A-Z$]|([0-9][A-Z$]))/;
+    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
+    var HAS_THIS       = 'this.';
 
-    var Ember = __dependency1__["default"];
+    var isGlobalCache     = new Cache(1000, function(key) { return IS_GLOBAL.test(key);          });
+    var isGlobalPathCache = new Cache(1000, function(key) { return IS_GLOBAL_PATH.test(key);     });
+    var hasThisCache      = new Cache(1000, function(key) { return key.indexOf(HAS_THIS) !== -1; });
+    var isPathCache       = new Cache(1000, function(key) { return key.indexOf('.')      !== -1; });
+
+    var caches = {
+      isGlobalCache:     isGlobalCache,
+      isGlobalPathCache: isGlobalPathCache,
+      hasThisCache:      hasThisCache,
+      isPathCache:       isPathCache
+    };
+    __exports__.caches = caches;
+    function isGlobal(path) {
+      return isGlobalCache.get(path);
+    }
+
+    __exports__.isGlobal = isGlobal;function isGlobalPath(path) {
+      return isGlobalPathCache.get(path);
+    }
+
+    __exports__.isGlobalPath = isGlobalPath;function hasThis(path) {
+      return hasThisCache.get(path);
+    }
+
+    __exports__.hasThis = hasThis;function isPath(path) {
+      return isPathCache.get(path);
+    }
+
+    __exports__.isPath = isPath;
+  });
+enifed("ember-metal/platform",
+  ["ember-metal/platform/define_property","ember-metal/platform/define_properties","ember-metal/platform/create","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var hasES5CompliantDefineProperty = __dependency1__.hasES5CompliantDefineProperty;
+    var defineProperty = __dependency1__.defineProperty;
+    var defineProperties = __dependency2__["default"];
+    var create = __dependency3__["default"];
 
     /**
     @module ember-metal
     */
 
+    var hasPropertyAccessors = hasES5CompliantDefineProperty;
+    var canDefineNonEnumerableProperties = hasES5CompliantDefineProperty;
+
     /**
       Platform specific methods and feature detectors needed by the framework.
 
@@ -16052,8 +17152,26 @@ define("ember-metal/platform",
       @namespace Ember
       @static
     */
-    // TODO remove this
-    var platform = {};
+
+    __exports__.create = create;
+    __exports__.defineProperty = defineProperty;
+    __exports__.defineProperties = defineProperties;
+    __exports__.hasPropertyAccessors = hasPropertyAccessors;
+    __exports__.canDefineNonEnumerableProperties = canDefineNonEnumerableProperties;
+  });
+enifed("ember-metal/platform/create",
+  ["exports"],
+  function(__exports__) {
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
+
+    /**
+    @class platform
+    @namespace Ember
+    @static
+    */
 
     /**
       Identical to `Object.create()`. Implements if not available natively.
@@ -16061,76 +17179,190 @@ define("ember-metal/platform",
       @method create
       @for Ember
     */
-    var create = Object.create;
+    var create;
+    // ES5 15.2.3.5
+    // http://es5.github.com/#x15.2.3.5
+    if (!(Object.create && !Object.create(null).hasOwnProperty)) {
+      /* jshint scripturl:true, proto:true */
+      // Contributed by Brandon Benvie, October, 2012
+      var createEmpty;
+      var supportsProto = !({'__proto__':null} instanceof Object);
+      // the following produces false positives
+      // in Opera Mini => not a reliable check
+      // Object.prototype.__proto__ === null
+      if (supportsProto || typeof document === 'undefined') {
+        createEmpty = function () {
+          return { "__proto__": null };
+        };
+      } else {
+        // In old IE __proto__ can't be used to manually set `null`, nor does
+        // any other method exist to make an object that inherits from nothing,
+        // aside from Object.prototype itself. Instead, create a new global
+        // object and *steal* its Object.prototype and strip it bare. This is
+        // used as the prototype to create nullary objects.
+        createEmpty = function () {
+          var iframe = document.createElement('iframe');
+          var parent = document.body || document.documentElement;
+          iframe.style.display = 'none';
+          parent.appendChild(iframe);
+          iframe.src = 'javascript:';
+          var empty = iframe.contentWindow.Object.prototype;
+          parent.removeChild(iframe);
+          iframe = null;
+          delete empty.constructor;
+          delete empty.hasOwnProperty;
+          delete empty.propertyIsEnumerable;
+          delete empty.isPrototypeOf;
+          delete empty.toLocaleString;
+          delete empty.toString;
+          delete empty.valueOf;
 
-    // IE8 has Object.create but it couldn't treat property descriptors.
-    if (create) {
-      if (create({a: 1}, {a: {value: 2}}).a !== 2) {
-        create = null;
+          function Empty() {}
+          Empty.prototype = empty;
+          // short-circuit future calls
+          createEmpty = function () {
+            return new Empty();
+          };
+          return new Empty();
+        };
       }
+
+      create = Object.create = function create(prototype, properties) {
+
+        var object;
+        function Type() {}  // An empty constructor.
+
+        if (prototype === null) {
+          object = createEmpty();
+        } else {
+          if (typeof prototype !== "object" && typeof prototype !== "function") {
+            // In the native implementation `parent` can be `null`
+            // OR *any* `instanceof Object`  (Object|Function|Array|RegExp|etc)
+            // Use `typeof` tho, b/c in old IE, DOM elements are not `instanceof Object`
+            // like they are in modern browsers. Using `Object.create` on DOM elements
+            // is...err...probably inappropriate, but the native version allows for it.
+            throw new TypeError("Object prototype may only be an Object or null"); // same msg as Chrome
+          }
+
+          Type.prototype = prototype;
+
+          object = new Type();
+        }
+
+        if (properties !== undefined) {
+          Object.defineProperties(object, properties);
+        }
+
+        return object;
+      };
+    } else {
+      create = Object.create;
     }
 
-    // STUB_OBJECT_CREATE allows us to override other libraries that stub
-    // Object.create different than we would prefer
-    if (!create || Ember.ENV.STUB_OBJECT_CREATE) {
-      var K = function() {};
+    __exports__["default"] = create;
+  });
+enifed("ember-metal/platform/define_properties",
+  ["ember-metal/platform/define_property","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var defineProperty = __dependency1__.defineProperty;
 
-      create = function(obj, props) {
-        K.prototype = obj;
-        obj = new K();
-        if (props) {
-          K.prototype = obj;
-          for (var prop in props) {
-            K.prototype[prop] = props[prop].value;
+    var defineProperties = Object.defineProperties;
+
+    // ES5 15.2.3.7
+    // http://es5.github.com/#x15.2.3.7
+    if (!defineProperties) {
+      defineProperties = function defineProperties(object, properties) {
+        for (var property in properties) {
+          if (properties.hasOwnProperty(property) && property !== "__proto__") {
+            defineProperty(object, property, properties[property]);
           }
-          obj = new K();
         }
-        K.prototype = null;
-
-        return obj;
+        return object;
       };
 
-      create.isSimulated = true;
+      Object.defineProperties = defineProperties;
     }
 
-    var defineProperty = Object.defineProperty;
-    var canRedefineProperties, canDefinePropertyOnDOM;
+    __exports__["default"] = defineProperties;
+  });
+enifed("ember-metal/platform/define_property",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /*globals Node */
 
-    // Catch IE8 where Object.defineProperty exists but only works on DOM elements
-    if (defineProperty) {
+    /**
+    @class platform
+    @namespace Ember
+    @static
+    */
+
+    /**
+      Set to true if the platform supports native getters and setters.
+
+      @property hasPropertyAccessors
+      @final
+    */
+
+    /**
+      Identical to `Object.defineProperty()`. Implements as much functionality
+      as possible if not available natively.
+
+      @method defineProperty
+      @param {Object} obj The object to modify
+      @param {String} keyName property name to modify
+      @param {Object} desc descriptor hash
+      @return {void}
+    */
+    var defineProperty = (function checkCompliance(defineProperty) {
+      if (!defineProperty) return;
       try {
-        defineProperty({}, 'a',{get:function() {}});
-      } catch (e) {
-        defineProperty = null;
-      }
-    }
-
-    if (defineProperty) {
-      // Detects a bug in Android <3.2 where you cannot redefine a property using
-      // Object.defineProperty once accessors have already been set.
-      canRedefineProperties = (function() {
+        var a = 5;
         var obj = {};
-
         defineProperty(obj, 'a', {
           configurable: true,
           enumerable: true,
-          get: function() { },
-          set: function() { }
+          get: function () {
+            return a;
+          },
+          set: function (v) {
+            a = v;
+          }
         });
+        if (obj.a !== 5) return;
+        obj.a = 10;
+        if (a !== 10) return;
 
+        // check non-enumerability
         defineProperty(obj, 'a', {
           configurable: true,
-          enumerable: true,
+          enumerable: false,
           writable: true,
           value: true
         });
+        for (var key in obj) {
+          if (key === 'a') return;
+        }
 
-        return obj.a === true;
-      })();
+        // Detects a bug in Android <3.2 where you cannot redefine a property using
+        // Object.defineProperty once accessors have already been set.
+        if (obj.a !== true) return;
 
+        // defineProperty is compliant
+        return defineProperty;
+      } catch (e) {
+        // IE8 defines Object.defineProperty but calling it on an Object throws
+        return;
+      }
+    })(Object.defineProperty);
+
+    var hasES5CompliantDefineProperty = !!defineProperty;
+
+    if (hasES5CompliantDefineProperty && typeof document !== 'undefined') {
       // This is for Safari 5.0, which supports Object.defineProperty, but not
       // on DOM nodes.
-      canDefinePropertyOnDOM = (function() {
+      var canDefinePropertyOnDOM = (function() {
         try {
           defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
           return true;
@@ -16139,9 +17371,7 @@ define("ember-metal/platform",
         return false;
       })();
 
-      if (!canRedefineProperties) {
-        defineProperty = null;
-      } else if (!canDefinePropertyOnDOM) {
+      if (!canDefinePropertyOnDOM) {
         defineProperty = function(obj, keyName, desc) {
           var isNode;
 
@@ -16161,69 +17391,28 @@ define("ember-metal/platform",
       }
     }
 
-    /**
-    @class platform
-    @namespace Ember
-    */
-
-    /**
-      Identical to `Object.defineProperty()`. Implements as much functionality
-      as possible if not available natively.
-
-      @method defineProperty
-      @param {Object} obj The object to modify
-      @param {String} keyName property name to modify
-      @param {Object} desc descriptor hash
-      @return {void}
-    */
-    platform.defineProperty = defineProperty;
-
-    /**
-      Set to true if the platform supports native getters and setters.
-
-      @property hasPropertyAccessors
-      @final
-    */
-    platform.hasPropertyAccessors = true;
-
-    if (!platform.defineProperty) {
-      platform.hasPropertyAccessors = false;
-
-      platform.defineProperty = function(obj, keyName, desc) {
+    if (!hasES5CompliantDefineProperty) {
+      defineProperty = function defineProperty(obj, keyName, desc) {
         if (!desc.get) { obj[keyName] = desc.value; }
       };
-
-      platform.defineProperty.isSimulated = true;
     }
 
-    if (Ember.ENV.MANDATORY_SETTER && !platform.hasPropertyAccessors) {
-      Ember.ENV.MANDATORY_SETTER = false;
-    }
-
-    __exports__.create = create;
-    __exports__.platform = platform;
+    __exports__.hasES5CompliantDefineProperty = hasES5CompliantDefineProperty;
+    __exports__.defineProperty = defineProperty;
   });
-define("ember-metal/properties",
-  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","ember-metal/property_get","ember-metal/property_set","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+enifed("ember-metal/properties",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var Ember = __dependency1__["default"];
-    var META_KEY = __dependency2__.META_KEY;
-    var meta = __dependency2__.meta;
-    var platform = __dependency3__.platform;
+    var metaFor = __dependency2__.meta;
+    var objectDefineProperty = __dependency3__.defineProperty;
+    var hasPropertyAccessors = __dependency3__.hasPropertyAccessors;
     var overrideChains = __dependency4__.overrideChains;
-    var get = __dependency5__.get;
-    var set = __dependency6__.set;
-
-    var metaFor = meta,
-        objectDefineProperty = platform.defineProperty;
-
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
-
     // ..........................................................
     // DESCRIPTOR
     //
@@ -16245,18 +17434,20 @@ define("ember-metal/properties",
     // DEFINING PROPERTIES API
     //
 
-    var MANDATORY_SETTER_FUNCTION = Ember.MANDATORY_SETTER_FUNCTION = function(value) {
-      Ember.assert("You must use Ember.set() to access this property (of " + this + ")", false);
-    };
+    function MANDATORY_SETTER_FUNCTION(name) {
+      return function SETTER_FUNCTION(value) {
+        Ember.assert("You must use Ember.set() to set the `" + name + "` property (of " + this + ") to `" + value + "`.", false);
+      };
+    }
 
-    var DEFAULT_GETTER_FUNCTION = Ember.DEFAULT_GETTER_FUNCTION = function DEFAULT_GETTER_FUNCTION(name) {
-      return function() {
-        var meta = this[META_KEY];
+    __exports__.MANDATORY_SETTER_FUNCTION = MANDATORY_SETTER_FUNCTION;function DEFAULT_GETTER_FUNCTION(name) {
+      return function GETTER_FUNCTION() {
+        var meta = this['__ember_meta__'];
         return meta && meta.values[name];
       };
-    };
+    }
 
-    /**
+    __exports__.DEFAULT_GETTER_FUNCTION = DEFAULT_GETTER_FUNCTION;/**
       NOTE: This is a low-level method used by other parts of the API. You almost
       never want to call this method directly. Instead you should use
       `Ember.mixin()` to define new properties.
@@ -16307,7 +17498,9 @@ define("ember-metal/properties",
       if (!meta) meta = metaFor(obj);
       descs = meta.descs;
       existingDesc = meta.descs[keyName];
-      watching = meta.watching[keyName] > 0;
+      var watchEntry = meta.watching[keyName];
+
+      watching = watchEntry !== undefined && watchEntry > 0;
 
       if (existingDesc instanceof Descriptor) {
         existingDesc.teardown(obj, keyName);
@@ -16317,34 +17510,36 @@ define("ember-metal/properties",
         value = desc;
 
         descs[keyName] = desc;
-        if (MANDATORY_SETTER && watching) {
-          objectDefineProperty(obj, keyName, {
-            configurable: true,
-            enumerable: true,
-            writable: true,
-            value: undefined // make enumerable
-          });
-        } else {
-          obj[keyName] = undefined; // make enumerable
-        }
-        if (desc.setup) { desc.setup(obj, keyName); }
+        
+          if (watching && hasPropertyAccessors) {
+            objectDefineProperty(obj, keyName, {
+              configurable: true,
+              enumerable: true,
+              writable: true,
+              value: undefined // make enumerable
+            });
+          } else {
+            obj[keyName] = undefined; // make enumerable
+          }
+                if (desc.setup) { desc.setup(obj, keyName); }
       } else {
         descs[keyName] = undefined; // shadow descriptor in proto
         if (desc == null) {
           value = data;
 
-          if (MANDATORY_SETTER && watching) {
-            meta.values[keyName] = data;
-            objectDefineProperty(obj, keyName, {
-              configurable: true,
-              enumerable: true,
-              set: MANDATORY_SETTER_FUNCTION,
-              get: DEFAULT_GETTER_FUNCTION(keyName)
-            });
-          } else {
-            obj[keyName] = data;
-          }
-        } else {
+          
+            if (watching && hasPropertyAccessors) {
+              meta.values[keyName] = data;
+              objectDefineProperty(obj, keyName, {
+                configurable: true,
+                enumerable: true,
+                set: MANDATORY_SETTER_FUNCTION(keyName),
+                get: DEFAULT_GETTER_FUNCTION(keyName)
+              });
+            } else {
+              obj[keyName] = data;
+            }
+                  } else {
           value = desc;
 
           // compatibility with ES5
@@ -16362,41 +17557,12 @@ define("ember-metal/properties",
 
       return this;
     }
-
-    __exports__.defineProperty = defineProperty;/**
-      Used internally to allow changing properties in a backwards compatible way, and print a helpful
-      deprecation warning.
-
-      @method deprecateProperty
-      @param {Object} object The object to add the deprecated property to.
-      @param {String} deprecatedKey The property to add (and print deprecation warnings upon accessing).
-      @param {String} newKey The property that will be aliased.
-      @private
-      @since 1.7.0
-    */
-
-    function deprecateProperty(object, deprecatedKey, newKey) {
-      function deprecate() {
-        Ember.deprecate('Usage of `' + deprecatedKey + '` is deprecated, use `' + newKey + '` instead.');
-      }
-
-      if (platform.hasPropertyAccessors) {
-        defineProperty(object, deprecatedKey, {
-            configurable: true,
-            enumerable: false,
-            set: function(value) { deprecate(); set(this, newKey, value); },
-            get: function() { deprecate(); return get(this, newKey); }
-        });
-      }
-    }
-
-    __exports__.deprecateProperty = deprecateProperty;
+    __exports__.defineProperty = defineProperty;
   });
-define("ember-metal/property_events",
+enifed("ember-metal/property_events",
   ["ember-metal/utils","ember-metal/events","ember-metal/observer_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var META_KEY = __dependency1__.META_KEY;
     var guidFor = __dependency1__.guidFor;
     var tryFinally = __dependency1__.tryFinally;
     var sendEvent = __dependency2__.sendEvent;
@@ -16428,10 +17594,10 @@ define("ember-metal/property_events",
       @return {void}
     */
     function propertyWillChange(obj, keyName) {
-      var m = obj[META_KEY],
-          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
-          proto = m && m.proto,
-          desc = m && m.descs[keyName];
+      var m = obj['__ember_meta__'];
+      var watching = (m && m.watching[keyName] > 0) || keyName === 'length';
+      var proto = m && m.proto;
+      var desc = m && m.descs[keyName];
 
       if (!watching) { return; }
       if (proto === obj) { return; }
@@ -16457,10 +17623,10 @@ define("ember-metal/property_events",
       @return {void}
     */
     function propertyDidChange(obj, keyName) {
-      var m = obj[META_KEY],
-          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
-          proto = m && m.proto,
-          desc = m && m.descs[keyName];
+      var m = obj['__ember_meta__'];
+      var watching = (m && m.watching[keyName] > 0) || keyName === 'length';
+      var proto = m && m.proto;
+      var desc = m && m.descs[keyName];
 
       if (proto === obj) { return; }
 
@@ -16468,44 +17634,63 @@ define("ember-metal/property_events",
       if (desc && desc.didChange) { desc.didChange(obj, keyName); }
       if (!watching && keyName !== 'length') { return; }
 
-      dependentKeysDidChange(obj, keyName, m);
+      if (m && m.deps && m.deps[keyName]) {
+        dependentKeysDidChange(obj, keyName, m);
+      }
+
       chainsDidChange(obj, keyName, m, false);
       notifyObservers(obj, keyName);
     }
 
     var WILL_SEEN, DID_SEEN;
-
     // called whenever a property is about to change to clear the cache of any dependent keys (and notify those properties of changes, etc...)
     function dependentKeysWillChange(obj, depKey, meta) {
       if (obj.isDestroying) { return; }
 
-      var seen = WILL_SEEN, top = !seen;
-      if (top) { seen = WILL_SEEN = {}; }
-      iterDeps(propertyWillChange, obj, depKey, seen, meta);
-      if (top) { WILL_SEEN = null; }
+      var deps;
+      if (meta && meta.deps && (deps = meta.deps[depKey])) {
+        var seen = WILL_SEEN;
+        var top = !seen;
+        if (top) { seen = WILL_SEEN = {}; }
+        iterDeps(propertyWillChange, obj, deps, depKey, seen, meta);
+        if (top) { WILL_SEEN = null; }
+      }
     }
 
     // called whenever a property has just changed to update dependent keys
     function dependentKeysDidChange(obj, depKey, meta) {
       if (obj.isDestroying) { return; }
 
-      var seen = DID_SEEN, top = !seen;
-      if (top) { seen = DID_SEEN = {}; }
-      iterDeps(propertyDidChange, obj, depKey, seen, meta);
-      if (top) { DID_SEEN = null; }
+      var deps;
+      if (meta && meta.deps && (deps = meta.deps[depKey])) {
+        var seen = DID_SEEN;
+        var top = !seen;
+        if (top) { seen = DID_SEEN = {}; }
+        iterDeps(propertyDidChange, obj, deps, depKey, seen, meta);
+        if (top) { DID_SEEN = null; }
+      }
     }
 
-    function iterDeps(method, obj, depKey, seen, meta) {
-      var guid = guidFor(obj);
-      if (!seen[guid]) seen[guid] = {};
-      if (seen[guid][depKey]) return;
-      seen[guid][depKey] = true;
+    function keysOf(obj) {
+      var keys = [];
+      for (var key in obj) keys.push(key);
+      return keys;
+    }
+
+    function iterDeps(method, obj, deps, depKey, seen, meta) {
+      var keys, key, i, desc;
+      var guid = guidFor(obj);
+      var current = seen[guid];
+      if (!current) current = seen[guid] = {};
+      if (current[depKey]) return;
+      current[depKey] = true;
 
-      var deps = meta.deps;
-      deps = deps && deps[depKey];
       if (deps) {
-        for(var key in deps) {
-          var desc = meta.descs[key];
+        keys = keysOf(deps);
+        var descs = meta.descs;
+        for (i=0; i<keys.length; i++) {
+          key = keys[i];
+          desc = descs[key];
           if (desc && desc._suspended === obj) continue;
           method(obj, key);
         }
@@ -16518,9 +17703,9 @@ define("ember-metal/property_events",
         return;
       }
 
-      var nodes = m.chainWatchers[keyName],
-          events = [],
-          i, l;
+      var nodes = m.chainWatchers[keyName];
+      var events = [];
+      var i, l;
 
       for(i = 0, l = nodes.length; i < l; i++) {
         nodes[i].willChange(events);
@@ -16537,9 +17722,9 @@ define("ember-metal/property_events",
         return;
       }
 
-      var nodes = m.chainWatchers[keyName],
-          events = suppressEvents ? null : [],
-          i, l;
+      var nodes = m.chainWatchers[keyName];
+      var events = suppressEvents ? null : [];
+      var i, l;
 
       for(i = 0, l = nodes.length; i < l; i++) {
         nodes[i].didChange(events);
@@ -16602,7 +17787,8 @@ define("ember-metal/property_events",
     function notifyBeforeObservers(obj, keyName) {
       if (obj.isDestroying) { return; }
 
-      var eventName = keyName + ':before', listeners, diff;
+      var eventName = keyName + ':before';
+      var listeners, diff;
       if (deferred) {
         listeners = beforeObserverSet.add(obj, keyName, eventName);
         diff = listenersDiff(obj, eventName, listeners);
@@ -16615,7 +17801,8 @@ define("ember-metal/property_events",
     function notifyObservers(obj, keyName) {
       if (obj.isDestroying) { return; }
 
-      var eventName = keyName + ':change', listeners;
+      var eventName = keyName + ':change';
+      var listeners;
       if (deferred) {
         listeners = observerSet.add(obj, keyName, eventName);
         listenersUnion(obj, eventName, listeners);
@@ -16631,24 +17818,21 @@ define("ember-metal/property_events",
     __exports__.endPropertyChanges = endPropertyChanges;
     __exports__.changeProperties = changeProperties;
   });
-define("ember-metal/property_get",
-  ["ember-metal/core","ember-metal/utils","ember-metal/error","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+enifed("ember-metal/property_get",
+  ["ember-metal/core","ember-metal/error","ember-metal/path_cache","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var Ember = __dependency1__["default"];
-    var META_KEY = __dependency2__.META_KEY;
-    var EmberError = __dependency3__["default"];
+    var EmberError = __dependency2__["default"];
+    var isGlobalPath = __dependency3__.isGlobalPath;
+    var isPath = __dependency3__.isPath;
+    var pathHasThis = __dependency3__.hasThis;
+    var hasPropertyAccessors = __dependency4__.hasPropertyAccessors;
 
-    var get;
-
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
-
-    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
-    var HAS_THIS  = 'this.';
     var FIRST_KEY = /^([^\.]+)/;
 
     // ..........................................................
@@ -16688,7 +17872,7 @@ define("ember-metal/property_get",
         return obj;
       }
 
-      if (!keyName && 'string'===typeof obj) {
+      if (!keyName && 'string' === typeof obj) {
         keyName = obj;
         obj = null;
       }
@@ -16696,23 +17880,33 @@ define("ember-metal/property_get",
       Ember.assert("Cannot call get with "+ keyName +" key.", !!keyName);
       Ember.assert("Cannot call get with '"+ keyName +"' on an undefined object.", obj !== undefined);
 
-      if (obj === null) { return _getPath(obj, keyName);  }
+      if (obj === null) {
+        var value = _getPath(obj, keyName);
+        Ember.deprecate(
+          "Ember.get fetched '"+keyName+"' from the global context. This behavior will change in the future (issue #3852)",
+          !value || (obj && obj !== Ember.lookup) || isPath(keyName) || isGlobalPath(keyName+".") // Add a . to ensure simple paths are matched.
+        );
+        return value;
+      }
 
-      var meta = obj[META_KEY], desc = meta && meta.descs[keyName], ret;
+      var meta = obj['__ember_meta__'];
+      var desc = meta && meta.descs[keyName];
+      var ret;
 
-      if (desc === undefined && keyName.indexOf('.') !== -1) {
+      if (desc === undefined && isPath(keyName)) {
         return _getPath(obj, keyName);
       }
 
       if (desc) {
         return desc.get(obj, keyName);
       } else {
-        if (MANDATORY_SETTER && meta && meta.watching[keyName] > 0) {
-          ret = meta.values[keyName];
-        } else {
-          ret = obj[keyName];
-        }
-
+        
+          if (hasPropertyAccessors && meta && meta.watching[keyName] > 0) {
+            ret = meta.values[keyName];
+          } else {
+            ret = obj[keyName];
+          }
+        
         if (ret === undefined &&
             'object' === typeof obj && !(keyName in obj) && 'function' === typeof obj.unknownProperty) {
           return obj.unknownProperty(keyName);
@@ -16743,13 +17937,18 @@ define("ember-metal/property_get",
       @return {Array} a temporary array with the normalized target/path pair.
     */
     function normalizeTuple(target, path) {
-      var hasThis  = path.indexOf(HAS_THIS) === 0,
-          isGlobal = !hasThis && IS_GLOBAL_PATH.test(path),
-          key;
+      var hasThis  = pathHasThis(path);
+      var isGlobal = !hasThis && isGlobalPath(path);
+      var key;
 
       if (!target || isGlobal) target = Ember.lookup;
       if (hasThis) path = path.slice(5);
 
+      Ember.deprecate(
+        "normalizeTuple will return '"+path+"' as a non-global. This behavior will change in the future (issue #3852)",
+        target === Ember.lookup || !target || hasThis || isGlobal || !isGlobalPath(path+'.')
+      );
+
       if (target === Ember.lookup) {
         key = path.match(FIRST_KEY)[0];
         target = get(target, key);
@@ -16768,10 +17967,12 @@ define("ember-metal/property_get",
       // If there is no root and path is a key name, return that
       // property from the global object.
       // E.g. get('Ember') -> Ember
-      if (root === null && path.indexOf('.') === -1) { return get(Ember.lookup, path); }
+      if (root === null && !isPath(path)) {
+        return get(Ember.lookup, path);
+      }
 
       // detect complicated paths and normalize them
-      hasThis = path.indexOf(HAS_THIS) === 0;
+      hasThis = pathHasThis(path);
 
       if (!root || hasThis) {
         tuple = normalizeTuple(root, path);
@@ -16801,19 +18002,19 @@ define("ember-metal/property_get",
     __exports__.normalizeTuple = normalizeTuple;
     __exports__._getPath = _getPath;
   });
-define("ember-metal/property_set",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/property_events","ember-metal/properties","ember-metal/error","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+enifed("ember-metal/property_set",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_events","ember-metal/properties","ember-metal/error","ember-metal/path_cache","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var getPath = __dependency2__._getPath;
-    var META_KEY = __dependency3__.META_KEY;
-    var propertyWillChange = __dependency4__.propertyWillChange;
-    var propertyDidChange = __dependency4__.propertyDidChange;
-    var defineProperty = __dependency5__.defineProperty;
-    var EmberError = __dependency6__["default"];
+    var propertyWillChange = __dependency3__.propertyWillChange;
+    var propertyDidChange = __dependency3__.propertyDidChange;
+    var defineProperty = __dependency4__.defineProperty;
+    var EmberError = __dependency5__["default"];
+    var isPath = __dependency6__.isPath;
+    var hasPropertyAccessors = __dependency7__.hasPropertyAccessors;
 
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
     var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
 
     /**
@@ -16843,10 +18044,11 @@ define("ember-metal/property_set",
         return setPath(obj, keyName, value, tolerant);
       }
 
-      var meta = obj[META_KEY], desc = meta && meta.descs[keyName],
-          isUnknown, currentValue;
+      var meta = obj['__ember_meta__'];
+      var desc = meta && meta.descs[keyName];
+      var isUnknown, currentValue;
 
-      if (desc === undefined && keyName.indexOf('.') !== -1) {
+      if (desc === undefined && isPath(keyName)) {
         return setPath(obj, keyName, value, tolerant);
       }
 
@@ -16869,24 +18071,29 @@ define("ember-metal/property_set",
         if (isUnknown && 'function' === typeof obj.setUnknownProperty) {
           obj.setUnknownProperty(keyName, value);
         } else if (meta && meta.watching[keyName] > 0) {
-          if (MANDATORY_SETTER) {
-            currentValue = meta.values[keyName];
-          } else {
-            currentValue = obj[keyName];
-          }
-          // only trigger a change if the value has changed
+          
+            if (hasPropertyAccessors) {
+              currentValue = meta.values[keyName];
+            } else {
+              currentValue = obj[keyName];
+            }
+                    // only trigger a change if the value has changed
           if (value !== currentValue) {
             propertyWillChange(obj, keyName);
-            if (MANDATORY_SETTER) {
-              if ((currentValue === undefined && !(keyName in obj)) || !obj.propertyIsEnumerable(keyName)) {
-                defineProperty(obj, keyName, null, value); // setup mandatory setter
+            
+              if (hasPropertyAccessors) {
+                if (
+                  (currentValue === undefined && !(keyName in obj)) ||
+                  !Object.prototype.propertyIsEnumerable.call(obj, keyName)
+                ) {
+                  defineProperty(obj, keyName, null, value); // setup mandatory setter
+                } else {
+                  meta.values[keyName] = value;
+                }
               } else {
-                meta.values[keyName] = value;
+                obj[keyName] = value;
               }
-            } else {
-              obj[keyName] = value;
-            }
-            propertyDidChange(obj, keyName);
+                        propertyDidChange(obj, keyName);
           }
         } else {
           obj[keyName] = value;
@@ -16949,15 +18156,17 @@ define("ember-metal/property_set",
 
     __exports__.trySet = trySet;__exports__.set = set;
   });
-define("ember-metal/run_loop",
-  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+enifed("ember-metal/run_loop",
+  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","backburner","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var apply = __dependency2__.apply;
+    var GUID_KEY = __dependency2__.GUID_KEY;
     var indexOf = __dependency3__.indexOf;
     var beginPropertyChanges = __dependency4__.beginPropertyChanges;
     var endPropertyChanges = __dependency4__.endPropertyChanges;
+    var Backburner = __dependency5__["default"];
 
     function onBegin(current) {
       run.currentRunLoop = current;
@@ -16968,8 +18177,8 @@ define("ember-metal/run_loop",
     }
 
     // ES6TODO: should Backburner become es6?
-    var Backburner = requireModule('backburner').Backburner;
     var backburner = new Backburner(['sync', 'actions', 'destroy'], {
+      GUID_KEY: GUID_KEY,
       sync: {
         before: beginPropertyChanges,
         after: endPropertyChanges
@@ -17016,7 +18225,7 @@ define("ember-metal/run_loop",
     */
     __exports__["default"] = run;
     function run() {
-      return apply(backburner, backburner.run, arguments);
+      return backburner.run.apply(backburner, arguments);
     }
 
     /**
@@ -17058,12 +18267,12 @@ define("ember-metal/run_loop",
     */
     run.join = function(target, method /* args */) {
       if (!run.currentRunLoop) {
-        return apply(Ember, run, arguments);
+        return Ember.run.apply(Ember, arguments);
       }
 
       var args = slice.call(arguments);
       args.unshift('actions');
-      apply(run, run.schedule, args);
+      run.schedule.apply(run, args);
     };
 
     /**
@@ -17110,7 +18319,7 @@ define("ember-metal/run_loop",
     run.bind = function(target, method /* args*/) {
       var args = slice.call(arguments);
       return function() {
-        return apply(run, run.join, args.concat(slice.call(arguments)));
+        return run.join.apply(run, args.concat(slice.call(arguments)));
       };
     };
 
@@ -17204,7 +18413,7 @@ define("ember-metal/run_loop",
     */
     run.schedule = function(queue, target, method) {
       checkAutoRun();
-      apply(backburner, backburner.schedule, arguments);
+      backburner.schedule.apply(backburner, arguments);
     };
 
     // Used by global test teardown
@@ -17241,7 +18450,7 @@ define("ember-metal/run_loop",
 
     /**
       Invokes the passed target/method and optional arguments after a specified
-      period if time. The last parameter of this method must always be a number
+      period of time. The last parameter of this method must always be a number
       of milliseconds.
 
       You should use this method whenever you need to run some action after a
@@ -17262,11 +18471,10 @@ define("ember-metal/run_loop",
         target at the time the method is invoked.
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @param {Number} wait Number of milliseconds to wait.
-      @return {String} a string you can use to cancel the timer in
-        `run.cancel` later.
+      @return {Object} Timer information for use in cancelling, see `run.cancel`.
     */
-    run.later = function(target, method) {
-      return apply(backburner, backburner.later, arguments);
+    run.later = function(/*target, method*/) {
+      return backburner.later.apply(backburner, arguments);
     };
 
     /**
@@ -17332,9 +18540,9 @@ define("ember-metal/run_loop",
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @return {Object} Timer information for use in cancelling, see `run.cancel`.
     */
-    run.scheduleOnce = function(queue, target, method) {
+    run.scheduleOnce = function(/*queue, target, method*/) {
       checkAutoRun();
-      return apply(backburner, backburner.scheduleOnce, arguments);
+      return backburner.scheduleOnce.apply(backburner, arguments);
     };
 
     /**
@@ -17513,7 +18721,7 @@ define("ember-metal/run_loop",
       @return {Array} Timer information for use in cancelling, see `run.cancel`.
     */
     run.debounce = function() {
-      return apply(backburner, backburner.debounce, arguments);
+      return backburner.debounce.apply(backburner, arguments);
     };
 
     /**
@@ -17552,7 +18760,7 @@ define("ember-metal/run_loop",
       @return {Array} Timer information for use in cancelling, see `run.cancel`.
     */
     run.throttle = function() {
-      return apply(backburner, backburner.throttle, arguments);
+      return backburner.throttle.apply(backburner, arguments);
     };
 
     // Make sure it's not an autorun during testing
@@ -17578,12 +18786,13 @@ define("ember-metal/run_loop",
       }
     };
   });
-define("ember-metal/set_properties",
-  ["ember-metal/property_events","ember-metal/property_set","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-metal/set_properties",
+  ["ember-metal/property_events","ember-metal/property_set","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var changeProperties = __dependency1__.changeProperties;
     var set = __dependency2__.set;
+    var keys = __dependency3__["default"];
 
     /**
       Set a list of properties on an object. These properties are set inside
@@ -17601,20 +18810,26 @@ define("ember-metal/set_properties",
       ```
 
       @method setProperties
-      @param self
-      @param {Object} hash
-      @return self
+      @param obj
+      @param {Object} properties
+      @return obj
     */
-    __exports__["default"] = function setProperties(self, hash) {
+    __exports__["default"] = function setProperties(obj, properties) {
+      if (!properties || typeof properties !== "object") { return obj; }
       changeProperties(function() {
-        for(var prop in hash) {
-          if (hash.hasOwnProperty(prop)) { set(self, prop, hash[prop]); }
+        var props = keys(properties);
+        var propertyName;
+
+        for (var i = 0, l = props.length; i < l; i++) {
+          propertyName = props[i];
+
+          set(obj, propertyName, properties[propertyName]);
         }
       });
-      return self;
+      return obj;
     }
   });
-define("ember-metal/utils",
+enifed("ember-metal/utils",
   ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -17623,7 +18838,9 @@ define("ember-metal/utils",
     // REMOVE_USE_STRICT: true
 
     var Ember = __dependency1__["default"];
-    var platform = __dependency2__.platform;
+    var o_defineProperty = __dependency2__.defineProperty;
+    var canDefineNonEnumerableProperties = __dependency2__.canDefineNonEnumerableProperties;
+    var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
     var create = __dependency2__.create;
 
     var forEach = __dependency3__.forEach;
@@ -17664,12 +18881,58 @@ define("ember-metal/utils",
     */
     var GUID_PREFIX = 'ember';
 
-    var o_defineProperty = platform.defineProperty;
     var o_create = create;
     // Used for guid generation...
     var numberCache  = [];
     var stringCache  = {};
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    /**
+      Strongly hint runtimes to intern the provided string.
+
+      When do I need to use this function?
+
+      For the most part, never. Pre-mature optimization is bad, and often the
+      runtime does exactly what you need it to, and more often the trade-off isn't
+      worth it.
+
+      Why?
+
+      Runtimes store strings in at least 2 different representations:
+      Ropes and Symbols (interned strings). The Rope provides a memory efficient
+      data-structure for strings created from concatenation or some other string
+      manipulation like splitting.
+
+      Unfortunately checking equality of different ropes can be quite costly as
+      runtimes must resort to clever string comparison algorithims. These
+      algorithims typically cost in proportion to the length of the string.
+      Luckily, this is where the Symbols (interned strings) shine. As Symbols are
+      unique by their string content, equality checks can be done by pointer
+      comparision.
+
+      How do I know if my string is a rope or symbol?
+
+      Typically (warning general sweeping statement, but truthy in runtimes at
+      present) static strings created as part of the JS source are interned.
+      Strings often used for comparisions can be interned at runtime if some
+      criteria are met.  One of these criteria can be the size of the entire rope.
+      For example, in chrome 38 a rope longer then 12 characters will not
+      intern, nor will segments of that rope.
+
+      Some numbers: http://jsperf.com/eval-vs-keys/8
+
+      Known Trick™
+
+      @private
+      @return {String} interned version of the provided string
+    */
+    function intern(str) {
+      var obj = {};
+      obj[str] = 1;
+      for (var key in obj) {
+        if (key === str) return key;
+      }
+      return str;
+    }
 
     /**
       A unique key used to assign guids and other private metadata to objects.
@@ -17685,7 +18948,7 @@ define("ember-metal/utils",
       @type String
       @final
     */
-    var GUID_KEY = '__ember' + (+ new Date());
+    var GUID_KEY = intern('__ember' + (+ new Date()));
 
     var GUID_DESC = {
       writable:    false,
@@ -17767,7 +19030,7 @@ define("ember-metal/utils",
           if (obj[GUID_KEY]) return obj[GUID_KEY];
           if (obj === Object) return '(Object)';
           if (obj === Array)  return '(Array)';
-          ret = 'ember' + uuid();
+          ret = GUID_PREFIX + uuid();
 
           if (obj[GUID_KEY] === null) {
             obj[GUID_KEY] = ret;
@@ -17790,19 +19053,6 @@ define("ember-metal/utils",
       value: null
     };
 
-    /**
-      The key used to store meta information on object for property observing.
-
-      @property META_KEY
-      @for Ember
-      @private
-      @final
-      @type String
-    */
-    var META_KEY = '__ember_meta__';
-
-    var isDefinePropertySimulated = platform.defineProperty.isSimulated;
-
     function Meta(obj) {
       this.descs = {};
       this.watching = {};
@@ -17827,7 +19077,7 @@ define("ember-metal/utils",
       proto: null
     };
 
-    if (isDefinePropertySimulated) {
+    if (!canDefineNonEnumerableProperties) {
       // on platforms that don't support enumerable false
       // make meta fail jQuery.isPlainObject() to hide from
       // jQuery.extend() by having a property that fails
@@ -17842,7 +19092,11 @@ define("ember-metal/utils",
     // Placeholder for non-writable metas.
     var EMPTY_META = new Meta(null);
 
-    if (MANDATORY_SETTER) { EMPTY_META.values = {}; }
+    
+      if (hasPropertyAccessors) {
+        EMPTY_META.values = {};
+      }
+    
 
     /**
       Retrieves the meta hash for an object. If `writable` is true ensures the
@@ -17864,23 +19118,27 @@ define("ember-metal/utils",
     */
     function meta(obj, writable) {
 
-      var ret = obj[META_KEY];
+      var ret = obj['__ember_meta__'];
       if (writable===false) return ret || EMPTY_META;
 
       if (!ret) {
-        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
+        if (canDefineNonEnumerableProperties) o_defineProperty(obj, '__ember_meta__', META_DESC);
 
         ret = new Meta(obj);
 
-        if (MANDATORY_SETTER) { ret.values = {}; }
+        
+          if (hasPropertyAccessors) {
+            ret.values = {};
+          }
+        
 
-        obj[META_KEY] = ret;
+        obj['__ember_meta__'] = ret;
 
         // make sure we don't accidentally try to create constructor like desc
         ret.descs.constructor = null;
 
       } else if (ret.source !== obj) {
-        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
+        if (canDefineNonEnumerableProperties) o_defineProperty(obj, '__ember_meta__', META_DESC);
 
         ret = o_create(ret);
         ret.descs     = o_create(ret.descs);
@@ -17889,9 +19147,13 @@ define("ember-metal/utils",
         ret.cacheMeta = {};
         ret.source    = obj;
 
-        if (MANDATORY_SETTER) { ret.values = o_create(ret.values); }
+        
+          if (hasPropertyAccessors) {
+            ret.values = o_create(ret.values);
+          }
+        
 
-        obj[META_KEY] = ret;
+        obj['__ember_meta__'] = ret;
       }
       return ret;
     }
@@ -17942,7 +19204,8 @@ define("ember-metal/utils",
     */
     function metaPath(obj, path, writable) {
       Ember.deprecate("Ember.metaPath is deprecated and will be removed from future releases.");
-      var _meta = meta(obj, writable), keyName, value;
+      var _meta = meta(obj, writable);
+      var keyName, value;
 
       for (var i=0, l=path.length; i<l; i++) {
         keyName = path[i];
@@ -17977,9 +19240,14 @@ define("ember-metal/utils",
     */
     function wrap(func, superFunc) {
       function superWrapper() {
-        var ret, sup = this && this.__nextSuper;
+        var ret;
+        var sup  = this && this.__nextSuper;
+        var args = new Array(arguments.length);
+        for (var i = 0, l = args.length; i < l; i++) {
+          args[i] = arguments[i];
+        }
         if(this) { this.__nextSuper = superFunc; }
-        ret = apply(this, func, arguments);
+        ret = apply(this, func, args);
         if(this) { this.__nextSuper = sup; }
         return ret;
       }
@@ -18382,13 +19650,19 @@ define("ember-metal/utils",
         return obj + '';
       }
 
-      var v, ret = [];
+      var v;
+      var ret = [];
       for(var key in obj) {
         if (obj.hasOwnProperty(key)) {
           v = obj[key];
           if (v === 'toString') { continue; } // ignore useless items
           if (typeOf(v) === 'function') { v = "function() { ... }"; }
-          ret.push(key + ": " + v);
+
+          if (v && typeof v.toString !== 'function') {
+            ret.push(key + ": " + toString.call(v));
+          } else {
+            ret.push(key + ": " + v);
+          }
         }
       }
       return "{" + ret.join(", ") + "}";
@@ -18424,10 +19698,8 @@ define("ember-metal/utils",
     }
 
     __exports__.applyStr = applyStr;__exports__.GUID_KEY = GUID_KEY;
-    __exports__.GUID_PREFIX = GUID_PREFIX;
     __exports__.META_DESC = META_DESC;
     __exports__.EMPTY_META = EMPTY_META;
-    __exports__.META_KEY = META_KEY;
     __exports__.meta = meta;
     __exports__.typeOf = typeOf;
     __exports__.tryCatchFinally = tryCatchFinally;
@@ -18435,18 +19707,20 @@ define("ember-metal/utils",
     __exports__.canInvoke = canInvoke;
     __exports__.tryFinally = tryFinally;
   });
-define("ember-metal/watch_key",
-  ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+enifed("ember-metal/watch_key",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/properties","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var meta = __dependency2__.meta;
     var typeOf = __dependency2__.typeOf;
-    var platform = __dependency3__.platform;
+    var o_defineProperty = __dependency3__.defineProperty;
+    var hasPropertyAccessors = __dependency3__.hasPropertyAccessors;
+    var MANDATORY_SETTER_FUNCTION = __dependency4__.MANDATORY_SETTER_FUNCTION;
+    var DEFAULT_GETTER_FUNCTION = __dependency4__.DEFAULT_GETTER_FUNCTION;
 
     var metaFor = meta; // utils.js
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
-    var o_defineProperty = platform.defineProperty;
+
 
     function watchKey(obj, keyName, meta) {
       // can't watch length on Array - it is special...
@@ -18465,21 +19739,33 @@ define("ember-metal/watch_key",
           obj.willWatchProperty(keyName);
         }
 
-        if (MANDATORY_SETTER && keyName in obj) {
-          m.values[keyName] = obj[keyName];
-          o_defineProperty(obj, keyName, {
-            configurable: true,
-            enumerable: obj.propertyIsEnumerable(keyName),
-            set: Ember.MANDATORY_SETTER_FUNCTION,
-            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
-          });
-        }
+        
+          if (hasPropertyAccessors) {
+            handleMandatorySetter(m, obj, keyName);
+          }
+        
       } else {
         watching[keyName] = (watching[keyName] || 0) + 1;
       }
     }
 
-    __exports__.watchKey = watchKey;function unwatchKey(obj, keyName, meta) {
+    __exports__.watchKey = watchKey;
+    
+      var handleMandatorySetter = function handleMandatorySetter(m, obj, keyName) {
+        // this x in Y deopts, so keeping it in this function is better;
+        if (keyName in obj) {
+          m.values[keyName] = obj[keyName];
+          o_defineProperty(obj, keyName, {
+            configurable: true,
+            enumerable: Object.prototype.propertyIsEnumerable.call(obj, keyName),
+            set: MANDATORY_SETTER_FUNCTION(keyName),
+            get: DEFAULT_GETTER_FUNCTION(keyName)
+          });
+        }
+      };
+    
+
+    function unwatchKey(obj, keyName, meta) {
       var m = meta || metaFor(obj), watching = m.watching;
 
       if (watching[keyName] === 1) {
@@ -18492,23 +19778,25 @@ define("ember-metal/watch_key",
           obj.didUnwatchProperty(keyName);
         }
 
-        if (MANDATORY_SETTER && keyName in obj) {
-          o_defineProperty(obj, keyName, {
-            configurable: true,
-            enumerable: obj.propertyIsEnumerable(keyName),
-            set: function(val) {
-              // redefine to set as enumerable
-              o_defineProperty(obj, keyName, {
-                configurable: true,
-                writable: true,
-                enumerable: true,
-                value: val
-              });
-              delete m.values[keyName];
-            },
-            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
-          });
-        }
+        
+          if (hasPropertyAccessors && keyName in obj) {
+            o_defineProperty(obj, keyName, {
+              configurable: true,
+              enumerable: Object.prototype.propertyIsEnumerable.call(obj, keyName),
+              set: function(val) {
+                // redefine to set as enumerable
+                o_defineProperty(obj, keyName, {
+                  configurable: true,
+                  writable: true,
+                  enumerable: true,
+                  value: val
+                });
+                delete m.values[keyName];
+              },
+              get: DEFAULT_GETTER_FUNCTION(keyName)
+            });
+          }
+        
       } else if (watching[keyName] > 1) {
         watching[keyName]--;
       }
@@ -18516,7 +19804,7 @@ define("ember-metal/watch_key",
 
     __exports__.unwatchKey = unwatchKey;
   });
-define("ember-metal/watch_path",
+enifed("ember-metal/watch_path",
   ["ember-metal/utils","ember-metal/chains","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -18530,7 +19818,8 @@ define("ember-metal/watch_path",
     // chains inherited from the proto they will be cloned and reconfigured for
     // the current object.
     function chainsFor(obj, meta) {
-      var m = meta || metaFor(obj), ret = m.chains;
+      var m = meta || metaFor(obj);
+      var ret = m.chains;
       if (!ret) {
         ret = m.chains = new ChainNode(null, null, obj);
       } else if (ret.value() !== obj) {
@@ -18543,7 +19832,8 @@ define("ember-metal/watch_path",
       // can't watch length on Array - it is special...
       if (keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      var m = meta || metaFor(obj), watching = m.watching;
+      var m = meta || metaFor(obj);
+      var watching = m.watching;
 
       if (!watching[keyPath]) { // activate watching first time
         watching[keyPath] = 1;
@@ -18554,7 +19844,8 @@ define("ember-metal/watch_path",
     }
 
     __exports__.watchPath = watchPath;function unwatchPath(obj, keyPath, meta) {
-      var m = meta || metaFor(obj), watching = m.watching;
+      var m = meta || metaFor(obj);
+      var watching = m.watching;
 
       if (watching[keyPath] === 1) {
         watching[keyPath] = 0;
@@ -18566,16 +19857,15 @@ define("ember-metal/watch_path",
 
     __exports__.unwatchPath = unwatchPath;
   });
-define("ember-metal/watching",
-  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+enifed("ember-metal/watching",
+  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","ember-metal/path_cache","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var meta = __dependency1__.meta;
-    var META_KEY = __dependency1__.META_KEY;
     var GUID_KEY = __dependency1__.GUID_KEY;
     var typeOf = __dependency1__.typeOf;
     var generateGuid = __dependency1__.generateGuid;
@@ -18587,11 +19877,7 @@ define("ember-metal/watching",
     var unwatchPath = __dependency4__.unwatchPath;
 
     var metaFor = meta; // utils.js
-
-    // returns true if the passed path is just a keyName
-    function isKeyName(path) {
-      return path.indexOf('.') === -1;
-    }
+    var isPath = __dependency5__.isPath;
 
     /**
       Starts watching a property on an object. Whenever the property changes,
@@ -18610,7 +19896,7 @@ define("ember-metal/watching",
       // can't watch length on Array - it is special...
       if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      if (isKeyName(_keyPath)) {
+      if (!isPath(_keyPath)) {
         watchKey(obj, _keyPath, m);
       } else {
         watchPath(obj, _keyPath, m);
@@ -18620,7 +19906,7 @@ define("ember-metal/watching",
     __exports__.watch = watch;
 
     function isWatching(obj, key) {
-      var meta = obj[META_KEY];
+      var meta = obj['__ember_meta__'];
       return (meta && meta.watching[key]) > 0;
     }
 
@@ -18630,7 +19916,7 @@ define("ember-metal/watching",
       // can't watch length on Array - it is special...
       if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      if (isKeyName(_keyPath)) {
+      if (!isPath(_keyPath)) {
         unwatchKey(obj, _keyPath, m);
       } else {
         unwatchPath(obj, _keyPath, m);
@@ -18648,7 +19934,7 @@ define("ember-metal/watching",
       @param obj
     */
     function rewatch(obj) {
-      var m = obj[META_KEY], chains = m && m.chains;
+      var m = obj['__ember_meta__'], chains = m && m.chains;
 
       // make sure the object has its own guid.
       if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
@@ -18673,9 +19959,9 @@ define("ember-metal/watching",
       @return {void}
     */
     function destroy(obj) {
-      var meta = obj[META_KEY], node, nodes, key, nodeObject;
+      var meta = obj['__ember_meta__'], node, nodes, key, nodeObject;
       if (meta) {
-        obj[META_KEY] = null;
+        obj['__ember_meta__'] = null;
         // remove chainWatchers to remove circular references that would prevent GC
         node = meta.chains;
         if (node) {
@@ -18706,7 +19992,7 @@ define("ember-metal/watching",
 
     __exports__.destroy = destroy;
   });
-define("ember-routing-handlebars",
+enifed("ember-routing-handlebars",
   ["ember-metal/core","ember-handlebars","ember-routing/system/router","ember-routing-handlebars/helpers/shared","ember-routing-handlebars/helpers/link_to","ember-routing-handlebars/helpers/outlet","ember-routing-handlebars/helpers/render","ember-routing-handlebars/helpers/action","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -18728,6 +20014,7 @@ define("ember-routing-handlebars",
     var deprecatedLinkToHelper = __dependency5__.deprecatedLinkToHelper;
     var linkToHelper = __dependency5__.linkToHelper;
     var LinkView = __dependency5__.LinkView;
+    var queryParamsHelper = __dependency5__.queryParamsHelper;
 
     var outletHelper = __dependency6__.outletHelper;
     var OutletView = __dependency6__.OutletView;
@@ -18749,12 +20036,13 @@ define("ember-routing-handlebars",
     EmberHandlebars.registerHelper('outlet', outletHelper);
     EmberHandlebars.registerHelper('link-to', linkToHelper);
     EmberHandlebars.registerHelper('linkTo', deprecatedLinkToHelper);
+    EmberHandlebars.registerHelper('query-params', queryParamsHelper);
 
     __exports__["default"] = Ember;
   });
-define("ember-routing-handlebars/helpers/action",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/system/utils","ember-routing/system/router","ember-handlebars","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing-handlebars/helpers/shared","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+enifed("ember-routing-handlebars/helpers/action",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/system/utils","ember-views/system/action_manager","ember-routing/system/router","ember-handlebars","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing-handlebars/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Handlebars, uuid, FEATURES, assert, deprecate
@@ -18764,13 +20052,14 @@ define("ember-routing-handlebars/helpers/action",
     var run = __dependency5__["default"];
 
     var isSimpleClick = __dependency6__.isSimpleClick;
-    var EmberRouter = __dependency7__["default"];
+    var ActionManager = __dependency7__["default"];
+    var EmberRouter = __dependency8__["default"];
 
-    var EmberHandlebars = __dependency8__["default"];
-    var handlebarsGet = __dependency9__.handlebarsGet;
-    var viewHelper = __dependency10__.viewHelper;
-    var resolveParams = __dependency11__.resolveParams;
-    var resolvePath = __dependency11__.resolvePath;
+    var EmberHandlebars = __dependency9__["default"];
+    var handlebarsGet = __dependency10__.handlebarsGet;
+    var viewHelper = __dependency11__.viewHelper;
+    var resolveParams = __dependency12__.resolveParams;
+    var resolvePath = __dependency12__.resolvePath;
 
     /**
     @module ember
@@ -18784,15 +20073,17 @@ define("ember-routing-handlebars/helpers/action",
       var ret = [];
       if (actionName) { ret.push(actionName); }
 
-      var types = options.options.types.slice(1),
-          data = options.options.data;
+      var types = options.options.types.slice(1);
+      var data = options.options.data;
 
       return ret.concat(resolveParams(options.context, options.params, { types: types, data: data }));
     }
 
-    var ActionHelper = {
-      registeredActions: {}
-    };
+    var ActionHelper = {};
+
+    // registeredActions is re-exported for compatibility with older plugins
+    // that were using this undocumented API.
+    ActionHelper.registeredActions = ActionManager.registeredActions;
 
     __exports__.ActionHelper = ActionHelper;
 
@@ -18824,10 +20115,20 @@ define("ember-routing-handlebars/helpers/action",
       return allowed;
     };
 
+    function isKeyEvent(eventName) {
+      return ['keyUp', 'keyPress', 'keyDown'].indexOf(eventName) !== -1;
+    }
+
+    function ignoreKeyEvent(eventName, event, keyCode) {
+      var any = 'any';
+      keyCode = keyCode || any;
+      return isKeyEvent(eventName) && keyCode !== any && keyCode !== event.which.toString();
+    }
+
     ActionHelper.registerAction = function(actionNameOrPath, options, allowedKeys) {
       var actionId = uuid();
 
-      ActionHelper.registeredActions[actionId] = {
+      ActionManager.registeredActions[actionId] = {
         eventName: options.eventName,
         handler: function handleRegisteredAction(event) {
           if (!isAllowedEvent(event, allowedKeys)) { return true; }
@@ -18840,10 +20141,12 @@ define("ember-routing-handlebars/helpers/action",
             event.stopPropagation();
           }
 
-          var target = options.target,
-              parameters = options.parameters,
-              actionName;
+          var target = options.target;
+          var parameters = options.parameters;
+          var eventName = options.eventName;
+          var actionName;
 
+          
           if (target.target) {
             target = handlebarsGet(target.root, target.target, target.options);
           } else {
@@ -18875,24 +20178,25 @@ define("ember-routing-handlebars/helpers/action",
       };
 
       options.view.on('willClearRender', function() {
-        delete ActionHelper.registeredActions[actionId];
+        delete ActionManager.registeredActions[actionId];
       });
 
       return actionId;
     };
 
     /**
-      The `{{action}}` helper registers an HTML element within a template for DOM
-      event handling and forwards that interaction to the templates's controller
-      or supplied `target` option (see 'Specifying a Target').
 
-      If the controller does not implement the event, the event is sent
+      The `{{action}}` helper provides a useful shortcut for registering an HTML
+      element within a template for a single DOM event and forwarding that
+      interaction to the template's controller or specified `target` option.
+
+      If the controller does not implement the specified action, the event is sent
       to the current route, and it bubbles up the route hierarchy from there.
 
-      User interaction with that element will invoke the supplied action name on
-      the appropriate target. Specifying a non-quoted action name will result in
-      a bound property lookup at the time the event will be triggered.
+      For more advanced event handling see [Ember.Component](/api/classes/Ember.Component.html)
 
+
+      ### Use
       Given the following application Handlebars template on the page
 
       ```handlebars
@@ -18972,12 +20276,6 @@ define("ember-routing-handlebars/helpers/action",
       See `Ember.View` 'Responding to Browser Events' for a list of
       acceptable DOM event names.
 
-      NOTE: Because `{{action}}` depends on Ember's event dispatch system it will
-      only function if an `Ember.EventDispatcher` instance is available. An
-      `Ember.EventDispatcher` instance will be created when a new `Ember.Application`
-      is created. Having an instance of `Ember.Application` will satisfy this
-      requirement.
-
       ### Specifying whitelisted modifier keys
 
       By default the `{{action}}` helper will ignore click event with pressed modifier
@@ -19003,7 +20301,7 @@ define("ember-routing-handlebars/helpers/action",
 
       There are several possible target objects for `{{action}}` helpers:
 
-      In a typical Ember application, where views are managed through use of the
+      In a typical Ember application, where templates are managed through use of the
       `{{outlet}}` helper, actions will bubble to the current controller, then
       to the current route, and then up the route hierarchy.
 
@@ -19051,11 +20349,10 @@ define("ember-routing-handlebars/helpers/action",
       @param {Hash} options
     */
     function actionHelper(actionName) {
-      var options = arguments[arguments.length - 1],
-          contexts = a_slice.call(arguments, 1, -1);
-
-      var hash = options.hash,
-          controller = options.data.keywords.controller;
+      var options = arguments[arguments.length - 1];
+      var contexts = a_slice.call(arguments, 1, -1);
+      var hash = options.hash;
+      var controller = options.data.keywords.controller;
 
       // create a hash to pass along to registerAction
       var action = {
@@ -19069,6 +20366,7 @@ define("ember-routing-handlebars/helpers/action",
         bubbles: hash.bubbles,
         preventDefault: hash.preventDefault,
         target: { options: options },
+        withKeyCode: hash.withKeyCode,
         boundProperty: options.types[0] === "ID"
       };
 
@@ -19085,8 +20383,8 @@ define("ember-routing-handlebars/helpers/action",
 
     __exports__.actionHelper = actionHelper;
   });
-define("ember-routing-handlebars/helpers/link_to",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing-handlebars/helpers/shared","exports"],
+enifed("ember-routing-handlebars/helpers/link_to",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-metal/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing-handlebars/helpers/shared","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -19136,8 +20434,8 @@ define("ember-routing-handlebars/helpers/link_to",
 
     function getResolvedPaths(options) {
 
-      var types = options.options.types,
-          data = options.options.data;
+      var types = options.options.types;
+      var data = options.options.data;
 
       return resolvePaths(options.context, options.params, { types: types, data: data });
     }
@@ -19158,8 +20456,20 @@ define("ember-routing-handlebars/helpers/link_to",
     **/
     var LinkView = Ember.LinkView = EmberComponent.extend({
       tagName: 'a',
+
+      /**
+        @deprecated Use current-when instead.
+        @property currentWhen
+      */
       currentWhen: null,
 
+      /**
+        Used to determine when this LinkView is active.
+
+        @property currentWhen
+      */
+      'current-when': null,
+
       /**
         Sets the `title` attribute of the `LinkView`'s HTML element.
 
@@ -19289,6 +20599,8 @@ define("ember-routing-handlebars/helpers/link_to",
       init: function() {
         this._super.apply(this, arguments);
 
+        Ember.deprecate('Using currentWhen with {{link-to}} is deprecated in favor of `current-when`.', !this.currentWhen);
+
         // Map desired event name to invoke function
         var eventName = get(this, 'eventName');
         this.on(eventName, this, this._invoke);
@@ -19314,11 +20626,11 @@ define("ember-routing-handlebars/helpers/link_to",
        @since 1.3.0
       **/
       _setupPathObservers: function(){
-        var helperParameters = this.parameters,
-            linkTextPath     = helperParameters.options.linkTextPath,
-            paths = getResolvedPaths(helperParameters),
-            length = paths.length,
-            path, i, normalizedPath;
+        var helperParameters = this.parameters;
+        var linkTextPath = helperParameters.options.linkTextPath;
+        var paths = getResolvedPaths(helperParameters);
+        var length = paths.length;
+        var path, i, normalizedPath;
 
         if (linkTextPath) {
           normalizedPath = getNormalizedPath(linkTextPath, helperParameters);
@@ -19380,6 +20692,9 @@ define("ember-routing-handlebars/helpers/link_to",
         or the application's current route is the route the `LinkView` would trigger
         transitions into.
 
+        The `currentWhen` property can match against multiple routes by separating
+        route names using the ` ` (space) character.
+
         @property active
       **/
       active: computed('loadedParams', function computeLinkViewActive() {
@@ -19388,33 +20703,33 @@ define("ember-routing-handlebars/helpers/link_to",
         var router = get(this, 'router');
         var loadedParams = get(this, 'loadedParams');
         var contexts = loadedParams.models;
-        var currentWhen = this.currentWhen;
+        var currentWhen = this['current-when'] || this.currentWhen;
         var isCurrentWhenSpecified = Boolean(currentWhen);
         currentWhen = currentWhen || loadedParams.targetRouteName;
 
-        var handlers = router.router.recognizer.handlersFor(currentWhen);
-        var leafName = handlers[handlers.length-1].handler;
-        var maximumContexts = numberOfContextsAcceptedByHandler(currentWhen, handlers);
+        function isActiveForRoute(routeName) {
+          var handlers = router.router.recognizer.handlersFor(routeName);
+          var leafName = handlers[handlers.length-1].handler;
+          var maximumContexts = numberOfContextsAcceptedByHandler(routeName, handlers);
 
-        // NOTE: any ugliness in the calculation of activeness is largely
-        // due to the fact that we support automatic normalizing of
-        // `resource` -> `resource.index`, even though there might be
-        // dynamic segments / query params defined on `resource.index`
-        // which complicates (and makes somewhat ambiguous) the calculation
-        // of activeness for links that link to `resource` instead of
-        // directly to `resource.index`.
+          // NOTE: any ugliness in the calculation of activeness is largely
+          // due to the fact that we support automatic normalizing of
+          // `resource` -> `resource.index`, even though there might be
+          // dynamic segments / query params defined on `resource.index`
+          // which complicates (and makes somewhat ambiguous) the calculation
+          // of activeness for links that link to `resource` instead of
+          // directly to `resource.index`.
 
-        // if we don't have enough contexts revert back to full route name
-        // this is because the leaf route will use one of the contexts
-        if (contexts.length > maximumContexts) {
-          currentWhen = leafName;
-        }
+          // if we don't have enough contexts revert back to full route name
+          // this is because the leaf route will use one of the contexts
+          if (contexts.length > maximumContexts) {
+            routeName = leafName;
+          }
 
-        var args = routeArgs(currentWhen, contexts, null);
-        var isActive = router.isActive.apply(router, args);
-        if (!isActive) { return false; }
+          var args = routeArgs(routeName, contexts, null);
+          var isActive = router.isActive.apply(router, args);
+          if (!isActive) { return false; }
 
-        
           var emptyQueryParams = Ember.isEmpty(Ember.keys(loadedParams.queryParams));
 
           if (!isCurrentWhenSpecified && !emptyQueryParams && isActive) {
@@ -19423,10 +20738,18 @@ define("ember-routing-handlebars/helpers/link_to",
             router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
             isActive = shallowEqual(visibleQueryParams, router.router.state.queryParams);
           }
-        
 
-        if (isActive) { return get(this, 'activeClass'); }
-      }),
+          return isActive;
+        }
+
+        
+          currentWhen = currentWhen.split(' ');
+          for (var i = 0, len = currentWhen.length; i < len; i++) {
+            if (isActiveForRoute(currentWhen[i])) {
+              return get(this, 'activeClass');
+            }
+          }
+              }),
 
       /**
         Accessed as a classname binding to apply the `LinkView`'s `loadingClass`
@@ -19468,9 +20791,11 @@ define("ember-routing-handlebars/helpers/link_to",
 
         if (this.preventDefault !== false) {
           
-            event.preventDefault();
-          
-        }
+            var targetAttribute = get(this, 'target');
+            if (!targetAttribute || targetAttribute === '_self') {
+              event.preventDefault();
+            }
+                  }
 
         if (this.bubbles === false) { event.stopPropagation(); }
 
@@ -19481,8 +20806,15 @@ define("ember-routing-handlebars/helpers/link_to",
           return false;
         }
 
-        var router = get(this, 'router'),
-            loadedParams = get(this, 'loadedParams');
+        
+          var targetAttribute2 = get(this, 'target');
+          if (targetAttribute2 && targetAttribute2 !== '_self') {
+            return false;
+          }
+        
+
+        var router = get(this, 'router');
+        var loadedParams = get(this, 'loadedParams');
 
         var transition = router._doTransition(loadedParams.targetRouteName, loadedParams.models, loadedParams.queryParams);
         if (get(this, 'replace')) {
@@ -19550,13 +20882,13 @@ define("ember-routing-handlebars/helpers/link_to",
         @return {Array}
        */
       resolvedParams: computed('router.url', function() {
-        var parameters = this.parameters,
-            options = parameters.options,
-            types = options.types,
-            data = options.data,
-            targetRouteName, models;
-
+        var parameters = this.parameters;
+        var options = parameters.options;
+        var types = options.types;
+        var data = options.data;
+        var targetRouteName, models;
         var onlyQueryParamsSupplied = (parameters.params.length === 0);
+
         if (onlyQueryParamsSupplied) {
           var appController = this.container.lookup('controller:application');
           targetRouteName = get(appController, 'currentRouteName');
@@ -19589,8 +20921,8 @@ define("ember-routing-handlebars/helpers/link_to",
         var router = get(this, 'router');
         if (!router) { return; }
 
-        var resolvedParams = get(this, 'resolvedParams'),
-            namedRoute = resolvedParams.targetRouteName;
+        var resolvedParams = get(this, 'resolvedParams');
+        var namedRoute = resolvedParams.targetRouteName;
 
         if (!namedRoute) { return; }
 
@@ -19618,18 +20950,16 @@ define("ember-routing-handlebars/helpers/link_to",
       href: computed('loadedParams', function computeLinkViewHref() {
         if (get(this, 'tagName') !== 'a') { return; }
 
-        var router = get(this, 'router'),
-            loadedParams = get(this, 'loadedParams');
+        var router = get(this, 'router');
+        var loadedParams = get(this, 'loadedParams');
 
         if (!loadedParams) {
           return get(this, 'loadingHref');
         }
 
         var visibleQueryParams = {};
-        
-          merge(visibleQueryParams, loadedParams.queryParams);
-          router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
-        
+        merge(visibleQueryParams, loadedParams.queryParams);
+        router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
 
         var args = routeArgs(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
         var result = router.generate.apply(router, args);
@@ -19650,6 +20980,19 @@ define("ember-routing-handlebars/helpers/link_to",
     LinkView.toString = function() { return "LinkView"; };
 
     
+      LinkView.reopen({
+        attributeBindings: ['target'],
+
+        /**
+          Sets the `target` attribute of the `LinkView`'s anchor element.
+
+          @property target
+          @default null
+        **/
+        target: null
+      });
+    
+
     /**
       The `{{link-to}}` helper renders a link to the supplied
       `routeName` passing an optionally supplied model to the
@@ -19913,9 +21256,9 @@ define("ember-routing-handlebars/helpers/link_to",
       @see {Ember.LinkView}
     */
     function linkToHelper(name) {
-      var options = slice.call(arguments, -1)[0],
-          params = slice.call(arguments, 0, -1),
-          hash = options.hash;
+      var options = slice.call(arguments, -1)[0];
+      var params = slice.call(arguments, 0, -1);
+      var hash = options.hash;
 
       Ember.assert("You must provide one or more parameters to the link-to helper.", params.length);
 
@@ -19952,19 +21295,22 @@ define("ember-routing-handlebars/helpers/link_to",
       return viewHelper.call(this, LinkView, options);
     }
 
-
-    
-      EmberHandlebars.registerHelper('query-params', function queryParamsHelper(options) {
-        Ember.assert(fmt("The `query-params` helper only accepts hash parameters, e.g. (query-params queryParamPropertyName='%@') as opposed to just (query-params '%@')", [options, options]), arguments.length === 1);
-
-        return QueryParams.create({
-          values: options.hash,
-          types: options.hashTypes
-        });
-      });
-    
-
     /**
+      @method query-params
+      @for Ember.Handlebars.helpers
+      @param {Object} hash takes a hash of query parameters
+      @return {String} HTML string
+    */
+    function queryParamsHelper(options) {
+      Ember.assert(fmt("The `query-params` helper only accepts hash parameters, e.g. (query-params queryParamPropertyName='%@') as opposed to just (query-params '%@')", [options, options]), arguments.length === 1);
+
+      return QueryParams.create({
+        values: options.hash,
+        types: options.hashTypes
+      });
+    }
+
+    __exports__.queryParamsHelper = queryParamsHelper;/**
       See [link-to](/api/classes/Ember.Handlebars.helpers.html#method_link-to)
 
       @method linkTo
@@ -19980,9 +21326,9 @@ define("ember-routing-handlebars/helpers/link_to",
     }
 
     function getResolvedQueryParams(linkView, targetRouteName) {
-      var helperParameters = linkView.parameters,
-          queryParamsObject = linkView.queryParamsObject,
-          resolvedQueryParams = {};
+      var helperParameters = linkView.parameters;
+      var queryParamsObject = linkView.queryParamsObject;
+      var resolvedQueryParams = {};
 
       if (!queryParamsObject) { return resolvedQueryParams; }
       var rawParams = queryParamsObject.values;
@@ -19990,8 +21336,8 @@ define("ember-routing-handlebars/helpers/link_to",
       for (var key in rawParams) {
         if (!rawParams.hasOwnProperty(key)) { continue; }
 
-        var value = rawParams[key],
-            type = queryParamsObject.types[key];
+        var value = rawParams[key];
+        var type = queryParamsObject.types[key];
 
         if (type === 'ID') {
           var normalizedPath = getNormalizedPath(value, helperParameters);
@@ -20031,7 +21377,7 @@ define("ember-routing-handlebars/helpers/link_to",
     __exports__.deprecatedLinkToHelper = deprecatedLinkToHelper;
     __exports__.linkToHelper = linkToHelper;
   });
-define("ember-routing-handlebars/helpers/outlet",
+enifed("ember-routing-handlebars/helpers/outlet",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-views/views/container_view","ember-handlebars/views/metamorph_view","ember-handlebars/helpers/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -20159,7 +21505,7 @@ define("ember-routing-handlebars/helpers/outlet",
 
     __exports__.outletHelper = outletHelper;
   });
-define("ember-routing-handlebars/helpers/render",
+enifed("ember-routing-handlebars/helpers/render",
   ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-routing/system/generate_controller","ember-handlebars/ext","ember-handlebars/helpers/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -20172,7 +21518,7 @@ define("ember-routing-handlebars/helpers/render",
     var generateControllerFactory = __dependency6__.generateControllerFactory;
     var generateController = __dependency6__["default"];
     var handlebarsGet = __dependency7__.handlebarsGet;
-    var viewHelper = __dependency8__.viewHelper;
+    var ViewHelper = __dependency8__.ViewHelper;
 
 
     /**
@@ -20252,9 +21598,8 @@ define("ember-routing-handlebars/helpers/render",
     */
     __exports__["default"] = function renderHelper(name, contextString, options) {
       var length = arguments.length;
-
-      var contextProvided = length === 3,
-          container, router, controller, view, context, lookupOptions;
+      var contextProvided = length === 3;
+      var container, router, controller, view, context, lookupOptions;
 
       container = (options || contextString).data.keywords.controller.container;
       router = container.lookup('router:main');
@@ -20336,10 +21681,10 @@ define("ember-routing-handlebars/helpers/render",
 
       options.helperName = options.helperName || ('render "' + name + '"');
 
-      viewHelper.call(this, view, options);
+      ViewHelper.instanceHelper(this, view, options);
     }
   });
-define("ember-routing-handlebars/helpers/shared",
+enifed("ember-routing-handlebars/helpers/shared",
   ["ember-metal/property_get","ember-metal/array","ember-runtime/mixins/controller","ember-handlebars/ext","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -20408,8 +21753,8 @@ define("ember-routing-handlebars/helpers/shared",
     }
 
     __exports__.stashParamNames = stashParamNames;function resolvePaths(context, params, options) {
-      var resolved = handlebarsResolve(context, params, options),
-          types = options.types;
+      var resolved = handlebarsResolve(context, params, options);
+      var types = options.types;
 
       return map.call(resolved, function(object, i) {
         if (types[i] === 'ID') {
@@ -20432,7 +21777,7 @@ define("ember-routing-handlebars/helpers/shared",
 
     __exports__.resolvePaths = resolvePaths;
   });
-define("ember-routing",
+enifed("ember-routing",
   ["ember-handlebars","ember-metal/core","ember-routing/ext/run_loop","ember-routing/ext/controller","ember-routing/ext/view","ember-routing/location/api","ember-routing/location/none_location","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/system/generate_controller","ember-routing/system/controller_for","ember-routing/system/dsl","ember-routing/system/router","ember-routing/system/route","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
@@ -20477,7 +21822,7 @@ define("ember-routing",
 
     __exports__["default"] = Ember;
   });
-define("ember-routing/ext/controller",
+enifed("ember-routing/ext/controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/merge","ember-metal/enumerable_utils","ember-runtime/mixins/controller","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -20499,6 +21844,143 @@ define("ember-routing/ext/controller",
     */
 
     ControllerMixin.reopen({
+      concatenatedProperties: ['queryParams', '_pCacheMeta'],
+
+      init: function() {
+        this._super.apply(this, arguments);
+        listenForQueryParamChanges(this);
+      },
+
+      /**
+        @property queryParams
+        @public
+      */
+      queryParams: null,
+
+      /**
+        @property _qpDelegate
+        @private
+      */
+      _qpDelegate: null,
+
+      /**
+        @property _normalizedQueryParams
+        @private
+      */
+      _normalizedQueryParams: computed(function() {
+        var m = meta(this);
+        if (m.proto !== this) {
+          return get(m.proto, '_normalizedQueryParams');
+        }
+
+        var queryParams = get(this, 'queryParams');
+        if (queryParams._qpMap) {
+          return queryParams._qpMap;
+        }
+
+        var qpMap = queryParams._qpMap = {};
+
+        for (var i = 0, len = queryParams.length; i < len; ++i) {
+          accumulateQueryParamDescriptors(queryParams[i], qpMap);
+        }
+
+        return qpMap;
+      }),
+
+      /**
+        @property _cacheMeta
+        @private
+      */
+      _cacheMeta: computed(function() {
+        var m = meta(this);
+        if (m.proto !== this) {
+          return get(m.proto, '_cacheMeta');
+        }
+
+        var cacheMeta = {};
+        var qpMap = get(this, '_normalizedQueryParams');
+        for (var prop in qpMap) {
+          if (!qpMap.hasOwnProperty(prop)) { continue; }
+
+          var qp = qpMap[prop];
+          var scope = qp.scope;
+          var parts;
+
+          if (scope === 'controller') {
+            parts = [];
+          }
+
+          cacheMeta[prop] = {
+            parts: parts, // provided by route if 'model' scope
+            values: null, // provided by route
+            scope: scope,
+            prefix: "",
+            def: get(this, prop)
+          };
+        }
+
+        return cacheMeta;
+      }),
+
+      /**
+        @method _updateCacheParams
+        @private
+      */
+      _updateCacheParams: function(params) {
+        var cacheMeta = get(this, '_cacheMeta');
+        for (var prop in cacheMeta) {
+          if (!cacheMeta.hasOwnProperty(prop)) { continue; }
+          var propMeta = cacheMeta[prop];
+          propMeta.values = params;
+
+          var cacheKey = this._calculateCacheKey(propMeta.prefix, propMeta.parts, propMeta.values);
+          var cache = this._bucketCache;
+
+          if (cache) {
+            var value = cache.lookup(cacheKey, prop, propMeta.def);
+            set(this, prop, value);
+          }
+        }
+      },
+
+      /**
+        @method _qpChanged
+        @private
+      */
+      _qpChanged: function(controller, _prop) {
+        var prop = _prop.substr(0, _prop.length-3);
+        var cacheMeta = get(controller, '_cacheMeta');
+        var propCache = cacheMeta[prop];
+        var cacheKey = controller._calculateCacheKey(propCache.prefix || "", propCache.parts, propCache.values);
+        var value = get(controller, prop);
+
+        // 1. Update model-dep cache
+        var cache = this._bucketCache;
+        if (cache) {
+          controller._bucketCache.stash(cacheKey, prop, value);
+        }
+
+        // 2. Notify a delegate (e.g. to fire a qp transition)
+        var delegate = controller._qpDelegate;
+        if (delegate) {
+          delegate(controller, prop);
+        }
+      },
+
+      /**
+        @method _calculateCacheKey
+        @private
+      */
+      _calculateCacheKey: function(prefix, _parts, values) {
+        var parts = _parts || [], suffixes = "";
+        for (var i = 0, len = parts.length; i < len; ++i) {
+          var part = parts[i];
+          var value = get(values, part);
+          suffixes += "::" + part + ":" + value;
+        }
+        return prefix + suffixes.replace(ALL_PERIODS_REGEX, '-');
+      },
+
       /**
         Transition the application into another route. The route may
         be either a single route or route path:
@@ -20647,117 +22129,6 @@ define("ember-routing/ext/controller",
 
     var ALL_PERIODS_REGEX = /\./g;
 
-    
-      ControllerMixin.reopen({
-        init: function() {
-          this._super.apply(this, arguments);
-          listenForQueryParamChanges(this);
-        },
-
-        concatenatedProperties: ['queryParams', '_pCacheMeta'],
-        queryParams: null,
-
-        _qpDelegate: null,
-        _normalizedQueryParams: computed(function() {
-          var m = meta(this);
-          if (m.proto !== this) {
-            return get(m.proto, '_normalizedQueryParams');
-          }
-
-          var queryParams = get(this, 'queryParams');
-          if (queryParams._qpMap) {
-            return queryParams._qpMap;
-          }
-
-          var qpMap = queryParams._qpMap = {};
-
-          for (var i = 0, len = queryParams.length; i < len; ++i) {
-            accumulateQueryParamDescriptors(queryParams[i], qpMap);
-          }
-
-          return qpMap;
-        }),
-
-        _cacheMeta: computed(function() {
-          var m = meta(this);
-          if (m.proto !== this) {
-            return get(m.proto, '_cacheMeta');
-          }
-
-          var cacheMeta = {};
-          var qpMap = get(this, '_normalizedQueryParams');
-          for (var prop in qpMap) {
-            if (!qpMap.hasOwnProperty(prop)) { continue; }
-
-            var qp = qpMap[prop];
-            var scope = qp.scope;
-            var parts;
-
-            if (scope === 'controller') {
-              parts = [];
-            }
-
-            cacheMeta[prop] = {
-              parts: parts, // provided by route if 'model' scope
-              values: null, // provided by route
-              scope: scope,
-              prefix: "",
-              def: get(this, prop)
-            };
-          }
-
-          return cacheMeta;
-        }),
-
-        _updateCacheParams: function(params) {
-          var cacheMeta = get(this, '_cacheMeta');
-          for (var prop in cacheMeta) {
-            if (!cacheMeta.hasOwnProperty(prop)) { continue; }
-            var propMeta = cacheMeta[prop];
-            propMeta.values = params;
-
-            var cacheKey = this._calculateCacheKey(propMeta.prefix, propMeta.parts, propMeta.values);
-            var cache = this._bucketCache;
-
-            if (cache) {
-              var value = cache.lookup(cacheKey, prop, propMeta.def);
-              set(this, prop, value);
-            }
-          }
-        },
-
-        _qpChanged: function(controller, _prop) {
-          var prop = _prop.substr(0, _prop.length-3);
-          var cacheMeta = get(controller, '_cacheMeta');
-          var propCache = cacheMeta[prop];
-          var cacheKey = controller._calculateCacheKey(propCache.prefix || "", propCache.parts, propCache.values);
-          var value = get(controller, prop);
-
-          // 1. Update model-dep cache
-          var cache = this._bucketCache;
-          if (cache) {
-            controller._bucketCache.stash(cacheKey, prop, value);
-          }
-
-          // 2. Notify a delegate (e.g. to fire a qp transition)
-          var delegate = controller._qpDelegate;
-          if (delegate) {
-            delegate(controller, prop);
-          }
-        },
-
-        _calculateCacheKey: function(prefix, _parts, values) {
-          var parts = _parts || [], suffixes = "";
-          for (var i = 0, len = parts.length; i < len; ++i) {
-            var part = parts[i];
-            var value = get(values, part);
-            suffixes += "::" + part + ":" + value;
-          }
-          return prefix + suffixes.replace(ALL_PERIODS_REGEX, '-');
-        }
-      });
-    
-
     function accumulateQueryParamDescriptors(_desc, accum) {
       var desc = _desc, tmp;
       if (typeOf(desc) === 'string') {
@@ -20792,7 +22163,7 @@ define("ember-routing/ext/controller",
 
     __exports__["default"] = ControllerMixin;
   });
-define("ember-routing/ext/run_loop",
+enifed("ember-routing/ext/run_loop",
   ["ember-metal/run_loop"],
   function(__dependency1__) {
     "use strict";
@@ -20811,7 +22182,7 @@ define("ember-routing/ext/run_loop",
     var queues = run.queues;
     run._addQueue('routerTransitions', 'actions');
   });
-define("ember-routing/ext/view",
+enifed("ember-routing/ext/view",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-views/views/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -20968,7 +22339,7 @@ define("ember-routing/ext/view",
 
     __exports__["default"] = EmberView;
   });
-define("ember-routing/location/api",
+enifed("ember-routing/location/api",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -21180,7 +22551,7 @@ define("ember-routing/location/api",
       }
     };
   });
-define("ember-routing/location/auto_location",
+enifed("ember-routing/location/auto_location",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-routing/location/api","ember-routing/location/history_location","ember-routing/location/hash_location","ember-routing/location/none_location","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -21538,9 +22909,15 @@ define("ember-routing/location/auto_location",
           if (currentPath === historyPath) {
             implementationClass = this._HistoryLocation;
           } else {
-            cancelRouterSetup = true;
-            this._replacePath(historyPath);
-          }
+            
+              if (currentPath.substr(0, 2) === '/#') {
+                this._history.replaceState({ path: historyPath }, null, historyPath);
+                implementationClass = this._HistoryLocation;
+              } else {
+                cancelRouterSetup = true;
+                this._replacePath(historyPath);
+              }
+                      }
 
         } else if (this._getSupportsHashChange()) {
           hashPath = this._getHashPath();
@@ -21568,18 +22945,18 @@ define("ember-routing/location/auto_location",
       }
     };
   });
-define("ember-routing/location/hash_location",
-  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","ember-views/system/jquery","exports"],
+enifed("ember-routing/location/hash_location",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
-    var get = __dependency1__.get;
-    var set = __dependency2__.set;
-    var run = __dependency3__["default"];
-    var guidFor = __dependency4__.guidFor;
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var run = __dependency4__["default"];
+    var guidFor = __dependency5__.guidFor;
 
-    var EmberObject = __dependency5__["default"];
-    var EmberLocation = __dependency6__["default"];
-    var jQuery = __dependency7__["default"];
+    var EmberObject = __dependency6__["default"];
+    var EmberLocation = __dependency7__["default"];
 
     /**
     @module ember
@@ -21619,7 +22996,9 @@ define("ember-routing/location/hash_location",
         @method getURL
       */
       getURL: function() {
-        return this.getHash().substr(1);
+        var path = this.getHash().substr(1);
+        Ember.deprecate('location.hash value is ambiguous. Support for this will be removed soon. When using location: "hash|auto" your hash paths MUST begin with a forward slash. e.g. #/' + path + ' NOT #' + path + '. See http://emberjs.com/guides/deprecations/#toc_location-hash-paths-must-now-include-a-forward-slash-e-g-foo-not-foo', path.length === 0 || path.charAt(0) === '/');
+        return path;
       },
 
       /**
@@ -21662,7 +23041,7 @@ define("ember-routing/location/hash_location",
         var self = this;
         var guid = guidFor(this);
 
-        jQuery(window).on('hashchange.ember-location-'+guid, function() {
+        Ember.$(window).on('hashchange.ember-location-'+guid, function() {
           run(function() {
             var path = self.getURL();
             if (get(self, 'lastSetURL') === path) { return; }
@@ -21698,11 +23077,11 @@ define("ember-routing/location/hash_location",
       willDestroy: function() {
         var guid = guidFor(this);
 
-        jQuery(window).off('hashchange.ember-location-'+guid);
+        Ember.$(window).off('hashchange.ember-location-'+guid);
       }
     });
   });
-define("ember-routing/location/history_location",
+enifed("ember-routing/location/history_location",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/object","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -21775,11 +23154,9 @@ define("ember-routing/location/history_location",
         baseURL = baseURL.replace(/\/$/, '');
 
         var url = path.replace(baseURL, '').replace(rootURL, '');
+        var search = location.search || '';
 
-        
-          var search = location.search || '';
-          url += search;
-        
+        url += search;
 
         return url;
       },
@@ -21930,7 +23307,7 @@ define("ember-routing/location/history_location",
       }
     });
   });
-define("ember-routing/location/none_location",
+enifed("ember-routing/location/none_location",
   ["ember-metal/property_get","ember-metal/property_set","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -22025,7 +23402,7 @@ define("ember-routing/location/none_location",
       }
     });
   });
-define("ember-routing/system/cache",
+enifed("ember-routing/system/cache",
   ["ember-runtime/system/object","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -22060,7 +23437,7 @@ define("ember-routing/system/cache",
       cache: null
     });
   });
-define("ember-routing/system/controller_for",
+enifed("ember-routing/system/controller_for",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -22081,7 +23458,7 @@ define("ember-routing/system/controller_for",
       return container.lookup('controller:' + controllerName, lookupOptions);
     }
   });
-define("ember-routing/system/dsl",
+enifed("ember-routing/system/dsl",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -22199,7 +23576,7 @@ define("ember-routing/system/dsl",
       return dsl;
     };
   });
-define("ember-routing/system/generate_controller",
+enifed("ember-routing/system/generate_controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -22281,8 +23658,8 @@ define("ember-routing/system/generate_controller",
       return instance;
     }
   });
-define("ember-routing/system/route",
-  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/merge","ember-metal/utils","ember-metal/run_loop","ember-runtime/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing-handlebars/helpers/shared","exports"],
+enifed("ember-routing/system/route",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/merge","ember-metal/utils","ember-metal/run_loop","ember-metal/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing-handlebars/helpers/shared","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -22323,6 +23700,280 @@ define("ember-routing/system/route",
       @uses Ember.ActionHandler
     */
     var Route = EmberObject.extend(ActionHandler, {
+      /**
+        Configuration hash for this route's queryParams. The possible
+        configuration options and their defaults are as follows
+        (assuming a query param whose URL key is `page`):
+
+        ```js
+        queryParams: {
+          page: {
+            // By default, controller query param properties don't
+            // cause a full transition when they are changed, but
+            // rather only cause the URL to update. Setting
+            // `refreshModel` to true will cause an "in-place"
+            // transition to occur, whereby the model hooks for
+            // this route (and any child routes) will re-fire, allowing
+            // you to reload models (e.g., from the server) using the
+            // updated query param values.
+            refreshModel: false,
+
+            // By default, changes to controller query param properties
+            // cause the URL to update via `pushState`, which means an
+            // item will be added to the browser's history, allowing
+            // you to use the back button to restore the app to the
+            // previous state before the query param property was changed.
+            // Setting `replace` to true will use `replaceState` (or its
+            // hash location equivalent), which causes no browser history
+            // item to be added. This options name and default value are
+            // the same as the `link-to` helper's `replace` option.
+            replace: false
+          }
+        }
+        ```
+
+        @property queryParams
+        @for Ember.Route
+        @type Hash
+      */
+      queryParams: {},
+
+      /**
+        @private
+
+        @property _qp
+      */
+      _qp: computed(function() {
+        var controllerName = this.controllerName || this.routeName;
+        var controllerClass = this.container.lookupFactory('controller:' + controllerName);
+
+        if (!controllerClass) {
+          return defaultQPMeta;
+        }
+
+        var controllerProto = controllerClass.proto();
+        var qpProps = get(controllerProto, '_normalizedQueryParams');
+        var cacheMeta = get(controllerProto, '_cacheMeta');
+
+        var qps = [], map = {}, self = this;
+        for (var propName in qpProps) {
+          if (!qpProps.hasOwnProperty(propName)) { continue; }
+
+          var desc = qpProps[propName];
+          var urlKey = desc.as || this.serializeQueryParamKey(propName);
+          var defaultValue = get(controllerProto, propName);
+
+          if (isArray(defaultValue)) {
+            defaultValue = Ember.A(defaultValue.slice());
+          }
+
+          var type = typeOf(defaultValue);
+          var defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type);
+          var fprop = controllerName + ':' + propName;
+          var qp = {
+            def: defaultValue,
+            sdef: defaultValueSerialized,
+            type: type,
+            urlKey: urlKey,
+            prop: propName,
+            fprop: fprop,
+            ctrl: controllerName,
+            cProto: controllerProto,
+            svalue: defaultValueSerialized,
+            cacheType: desc.scope,
+            route: this,
+            cacheMeta: cacheMeta[propName]
+          };
+
+          map[propName] = map[urlKey] = map[fprop] = qp;
+          qps.push(qp);
+        }
+
+        return {
+          qps: qps,
+          map: map,
+          states: {
+            active: function(controller, prop) {
+              return self._activeQPChanged(controller, map[prop]);
+            },
+            allowOverrides: function(controller, prop) {
+              return self._updatingQPChanged(controller, map[prop]);
+            },
+            changingKeys: function(controller, prop) {
+              return self._updateSerializedQPValue(controller, map[prop]);
+            }
+          }
+        };
+      }),
+
+      /**
+        @private
+
+        @property _names
+      */
+      _names: null,
+
+      /**
+        @private
+
+        @method _stashNames
+      */
+      _stashNames: function(_handlerInfo, dynamicParent) {
+        var handlerInfo = _handlerInfo;
+        if (this._names) { return; }
+        var names = this._names = handlerInfo._names;
+
+        if (!names.length) {
+          handlerInfo = dynamicParent;
+          names = handlerInfo && handlerInfo._names || [];
+        }
+
+        var qps = get(this, '_qp.qps');
+        var len = qps.length;
+
+        var namePaths = new Array(names.length);
+        for (var a = 0, nlen = names.length; a < nlen; ++a) {
+          namePaths[a] = handlerInfo.name + '.' + names[a];
+        }
+
+        for (var i = 0; i < len; ++i) {
+          var qp = qps[i];
+          var cacheMeta = qp.cacheMeta;
+          if (cacheMeta.scope === 'model') {
+            cacheMeta.parts = namePaths;
+          }
+          cacheMeta.prefix = qp.ctrl;
+        }
+      },
+
+      /**
+        @private
+
+        @property _updateSerializedQPValue
+      */
+      _updateSerializedQPValue: function(controller, qp) {
+        var value = get(controller, qp.prop);
+        qp.svalue = this.serializeQueryParam(value, qp.urlKey, qp.type);
+      },
+
+      /**
+        @private
+
+        @property _activeQPChanged
+      */
+      _activeQPChanged: function(controller, qp) {
+        var value = get(controller, qp.prop);
+        this.router._queuedQPChanges[qp.fprop] = value;
+        run.once(this, this._fireQueryParamTransition);
+      },
+
+      /**
+        @private
+        @method _updatingQPChanged
+      */
+      _updatingQPChanged: function(controller, qp) {
+        var router = this.router;
+        if (!router._qpUpdates) {
+          router._qpUpdates = {};
+        }
+        router._qpUpdates[qp.urlKey] = true;
+      },
+
+      mergedProperties: ['events', 'queryParams'],
+
+      /**
+        @method paramsFor
+      */
+      paramsFor: function(name) {
+        var route = this.container.lookup('route:' + name);
+
+        if (!route) {
+          return {};
+        }
+
+        var transition = this.router.router.activeTransition;
+        var state = transition ? transition.state : this.router.router.state;
+
+        var params = {};
+        merge(params, state.params[name]);
+        merge(params, getQueryParamsFor(route, state));
+
+        return params;
+      },
+
+      /**
+        @method serializeQueryParamKey
+      */
+      serializeQueryParamKey: function(controllerPropertyName) {
+        return controllerPropertyName;
+      },
+
+      /**
+        @method serializeQueryParam
+      */
+      serializeQueryParam: function(value, urlKey, defaultValueType) {
+        // urlKey isn't used here, but anyone overriding
+        // can use it to provide serialization specific
+        // to a certain query param.
+        if (defaultValueType === 'array') {
+          return JSON.stringify(value);
+        }
+        return '' + value;
+      },
+
+      /**
+        @method deserializeQueryParam
+      */
+      deserializeQueryParam: function(value, urlKey, defaultValueType) {
+        // urlKey isn't used here, but anyone overriding
+        // can use it to provide deserialization specific
+        // to a certain query param.
+
+        // Use the defaultValueType of the default value (the initial value assigned to a
+        // controller query param property), to intelligently deserialize and cast.
+        if (defaultValueType === 'boolean') {
+          return (value === 'true') ? true : false;
+        } else if (defaultValueType === 'number') {
+          return (Number(value)).valueOf();
+        } else if (defaultValueType === 'array') {
+          return Ember.A(JSON.parse(value));
+        }
+        return value;
+      },
+
+
+      /**
+        @private
+        @property _fireQueryParamTransition
+      */
+      _fireQueryParamTransition: function() {
+        this.transitionTo({ queryParams: this.router._queuedQPChanges });
+        this.router._queuedQPChanges = {};
+      },
+
+      /**
+        A hook you can use to reset controller values either when the model
+        changes or the route is exiting.
+
+        ```js
+        App.ArticlesRoute = Ember.Route.extend({
+          // ...
+
+          resetController: function (controller, isExiting, transition) {
+            if (isExiting) {
+              controller.set('page', 1);
+            }
+          }
+        });
+        ```
+
+        @method resetController
+        @param {Controller} controller instance
+        @param {Boolean} isExiting
+        @param {Object} transition
+        @since 1.7.0
+      */
+      resetController: Ember.K,
 
       /**
         @private
@@ -22341,11 +23992,11 @@ define("ember-routing/system/route",
         @since 1.7.0
       */
       _reset: function(isExiting, transition) {
-        
-          var controller = this.controller;
-          controller._qpDelegate = get(this, '_qp.states.inactive');
-          this.resetController(this.controller, isExiting, transition);
-        
+        var controller = this.controller;
+
+        controller._qpDelegate = get(this, '_qp.states.inactive');
+
+        this.resetController(controller, isExiting, transition);
       },
 
       /**
@@ -22600,102 +24251,100 @@ define("ember-routing/system/route",
       _actions: {
 
         queryParamsDidChange: function(changed, totalPresent, removed) {
-          
-            var totalChanged = keys(changed).concat(keys(removed));
-            for (var i = 0, len = totalChanged.length; i < len; ++i) {
-              var urlKey = totalChanged[i],
-                  options = get(this.queryParams, urlKey) || {};
-              if (get(options, 'refreshModel')) {
-                this.refresh();
-              }
+          var totalChanged = keys(changed).concat(keys(removed));
+          for (var i = 0, len = totalChanged.length; i < len; ++i) {
+            var urlKey = totalChanged[i];
+            var options = get(this.queryParams, urlKey) || {};
+            if (get(options, 'refreshModel')) {
+              this.refresh();
             }
-            return true;
-          
+          }
+
+          return true;
         },
 
         finalizeQueryParamChange: function(params, finalParams, transition) {
-          
-            if (this.routeName !== 'application') { return true; }
+          if (this.routeName !== 'application') { return true; }
 
-            // Transition object is absent for intermediate transitions.
-            if (!transition) { return; }
+          // Transition object is absent for intermediate transitions.
+          if (!transition) { return; }
 
-            var handlerInfos = transition.state.handlerInfos;
-            var router = this.router;
-            var qpMeta = router._queryParamsFor(handlerInfos[handlerInfos.length-1].name);
-            var changes = router._qpUpdates;
-            var replaceUrl;
+          var handlerInfos = transition.state.handlerInfos;
+          var router = this.router;
+          var qpMeta = router._queryParamsFor(handlerInfos[handlerInfos.length-1].name);
+          var changes = router._qpUpdates;
+          var replaceUrl;
 
-            stashParamNames(router, handlerInfos);
+          stashParamNames(router, handlerInfos);
 
-            for (var i = 0, len = qpMeta.qps.length; i < len; ++i) {
-              var qp = qpMeta.qps[i];
-              var route = qp.route;
-              var controller = route.controller;
-              var presentKey = qp.urlKey in params && qp.urlKey;
+          for (var i = 0, len = qpMeta.qps.length; i < len; ++i) {
+            var qp = qpMeta.qps[i];
+            var route = qp.route;
+            var controller = route.controller;
+            var presentKey = qp.urlKey in params && qp.urlKey;
 
-              // Do a reverse lookup to see if the changed query
-              // param URL key corresponds to a QP property on
-              // this controller.
-              var value, svalue;
-              if (changes && qp.urlKey in changes) {
-                // Value updated in/before setupController
-                value = get(controller, qp.prop);
-                svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
+            // Do a reverse lookup to see if the changed query
+            // param URL key corresponds to a QP property on
+            // this controller.
+            var value, svalue;
+            if (changes && qp.urlKey in changes) {
+              // Value updated in/before setupController
+              value = get(controller, qp.prop);
+              svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
+            } else {
+              if (presentKey) {
+                svalue = params[presentKey];
+                value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
               } else {
-                if (presentKey) {
-                  svalue = params[presentKey];
-                  value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
-                } else {
-                  // No QP provided; use default value.
-                  svalue = qp.sdef;
-                  value = copyDefaultValue(qp.def);
-                }
-              }
-
-              controller._qpDelegate = get(this, '_qp.states.inactive');
-
-              var thisQueryParamChanged = (svalue !== qp.svalue);
-              if (thisQueryParamChanged) {
-                var options = get(route, 'queryParams.' + qp.urlKey) || {};
-
-                if (transition.queryParamsOnly && replaceUrl !== false) {
-                  var replaceConfigValue = get(options, 'replace');
-                  if (replaceConfigValue) {
-                    replaceUrl = true;
-                  } else if (replaceConfigValue === false) {
-                    // Explicit pushState wins over any other replaceStates.
-                    replaceUrl = false;
-                  }
-                }
-
-                set(controller, qp.prop, value);
-              }
-
-              // Stash current serialized value of controller.
-              qp.svalue = svalue;
-
-              var thisQueryParamHasDefaultValue = (qp.sdef === svalue);
-              if (!thisQueryParamHasDefaultValue) {
-                finalParams.push({
-                  value: svalue,
-                  visible: true,
-                  key: presentKey || qp.urlKey
-                });
+                // No QP provided; use default value.
+                svalue = qp.sdef;
+                value = copyDefaultValue(qp.def);
               }
             }
 
-            if (replaceUrl) {
-              transition.method('replace');
+            controller._qpDelegate = get(this, '_qp.states.inactive');
+
+            var thisQueryParamChanged = (svalue !== qp.svalue);
+            if (thisQueryParamChanged) {
+              var options = get(route, 'queryParams.' + qp.urlKey) || {};
+
+              if (transition.queryParamsOnly && replaceUrl !== false) {
+                var replaceConfigValue = get(options, 'replace');
+                if (replaceConfigValue) {
+                  replaceUrl = true;
+                } else if (replaceConfigValue === false) {
+                  // Explicit pushState wins over any other replaceStates.
+                  replaceUrl = false;
+                }
+              }
+
+              set(controller, qp.prop, value);
             }
 
-            forEach(qpMeta.qps, function(qp) {
-              var routeQpMeta = get(qp.route, '_qp');
-              var finalizedController = qp.route.controller;
-              finalizedController._qpDelegate = get(routeQpMeta, 'states.active');
-            });
-            router._qpUpdates = null;
-          
+            // Stash current serialized value of controller.
+            qp.svalue = svalue;
+
+            var thisQueryParamHasDefaultValue = (qp.sdef === svalue);
+            if (!thisQueryParamHasDefaultValue) {
+              finalParams.push({
+                value: svalue,
+                visible: true,
+                key: presentKey || qp.urlKey
+              });
+            }
+          }
+
+          if (replaceUrl) {
+            transition.method('replace');
+          }
+
+          forEach(qpMeta.qps, function(qp) {
+            var routeQpMeta = get(qp.route, '_qp');
+            var finalizedController = qp.route.controller;
+            finalizedController._qpDelegate = get(routeQpMeta, 'states.active');
+          });
+
+          router._qpUpdates = null;
         }
       },
 
@@ -22707,8 +24356,6 @@ define("ember-routing/system/route",
       */
       events: null,
 
-      mergedProperties: ['events'],
-
       /**
         This hook is executed when the router completely exits this route. It is
         not executed when the model for the route changes.
@@ -22989,23 +24636,22 @@ define("ember-routing/system/route",
           Ember.deprecate("Ember.Route.setupControllers is deprecated. Please use Ember.Route.setupController(controller, model) instead.");
           this.setupControllers(controller, context);
         } else {
-          
-            var states = get(this, '_qp.states');
-            if (transition) {
-              // Update the model dep values used to calculate cache keys.
-              stashParamNames(this.router, transition.state.handlerInfos);
-              controller._qpDelegate = states.changingKeys;
-              controller._updateCacheParams(transition.params);
-            }
-            controller._qpDelegate = states.allowOverrides;
+          var states = get(this, '_qp.states');
+          if (transition) {
+            // Update the model dep values used to calculate cache keys.
+            stashParamNames(this.router, transition.state.handlerInfos);
+            controller._qpDelegate = states.changingKeys;
+            controller._updateCacheParams(transition.params);
+          }
+          controller._qpDelegate = states.allowOverrides;
 
-            if (transition) {
-              var qpValues = getQueryParamsFor(this, transition.state);
-              controller.setProperties(qpValues);
-            }
+          if (transition) {
+            var qpValues = getQueryParamsFor(this, transition.state);
+            controller.setProperties(qpValues);
+          }
 
-            this.setupController(controller, context, transition);
-                  }
+          this.setupController(controller, context, transition);
+        }
 
         if (this.renderTemplates) {
           Ember.deprecate("Ember.Route.renderTemplates is deprecated. Please use Ember.Route.renderTemplate(controller, model) instead.");
@@ -23172,7 +24818,7 @@ define("ember-routing/system/route",
         });
         ```
 
-        The model for the `post` route is `App.Post.find(params.post_id)`.
+        The model for the `post` route is `store.find('post', params.post_id)`.
 
         By default, if your route has a dynamic segment ending in `_id`:
 
@@ -23215,7 +24861,7 @@ define("ember-routing/system/route",
         ```js
         App.PostRoute = Ember.Route.extend({
           model: function(params) {
-            return App.Post.find(params.post_id);
+            return this.store.find('post', params.post_id);
           }
         });
         ```
@@ -23232,10 +24878,7 @@ define("ember-routing/system/route",
       model: function(params, transition) {
         var match, name, sawParams, value;
 
-        var queryParams;
-        
-          queryParams = get(this, '_qp.map');
-        
+        var queryParams = get(this, '_qp.map');
 
         for (var prop in params) {
           if (prop === 'queryParams' || (queryParams && prop in queryParams)) {
@@ -23251,7 +24894,7 @@ define("ember-routing/system/route",
 
         if (!name && sawParams) { return copy(params); }
         else if (!name) {
-          if (transition.resolveIndex !== transition.state.handlerInfos.length-1) { return; }
+          if (transition.resolveIndex < 1) { return; }
 
           var parentModel = transition.state.handlerInfos[transition.resolveIndex-1].context;
 
@@ -23271,9 +24914,8 @@ define("ember-routing/system/route",
         Router.js hook.
        */
       deserialize: function(params, transition) {
-        
-          return this.model(this.paramsFor(this.routeName), transition);
-              },
+        return this.model(this.paramsFor(this.routeName), transition);
+      },
 
       /**
 
@@ -23390,7 +25032,7 @@ define("ember-routing/system/route",
         ```js
         App.PhotosRoute = Ember.Route.extend({
           model: function() {
-            return App.Photo.find();
+            return this.store.find('photo');
           },
 
           setupController: function (controller, model) {
@@ -23630,7 +25272,7 @@ define("ember-routing/system/route",
         // posts route
         Ember.Route.extend({
           renderTemplate: function(){
-            this.render('posts', {
+            this.render('photos', {
               into: 'application',
               outlet: 'anOutletName'
             })
@@ -23851,240 +25493,6 @@ define("ember-routing/system/route",
       states: {}
     };
 
-    
-      Route.reopen({
-        /**
-          Configuration hash for this route's queryParams. The possible
-          configuration options and their defaults are as follows
-          (assuming a query param whose URL key is `page`):
-
-          ```js
-          queryParams: {
-            page: {
-              // By default, controller query param properties don't
-              // cause a full transition when they are changed, but
-              // rather only cause the URL to update. Setting
-              // `refreshModel` to true will cause an "in-place"
-              // transition to occur, whereby the model hooks for
-              // this route (and any child routes) will re-fire, allowing
-              // you to reload models (e.g., from the server) using the
-              // updated query param values.
-              refreshModel: false,
-
-              // By default, changes to controller query param properties
-              // cause the URL to update via `pushState`, which means an
-              // item will be added to the browser's history, allowing
-              // you to use the back button to restore the app to the
-              // previous state before the query param property was changed.
-              // Setting `replace` to true will use `replaceState` (or its
-              // hash location equivalent), which causes no browser history
-              // item to be added. This options name and default value are
-              // the same as the `link-to` helper's `replace` option.
-              replace: false
-            }
-          }
-          ```
-
-          @property queryParams
-          @for Ember.Route
-          @type Hash
-        */
-        queryParams: {},
-
-        _qp: computed(function() {
-          var controllerName = this.controllerName || this.routeName;
-          var fullName = this.container.normalize('controller:' + controllerName);
-          var controllerClass = this.container.lookupFactory(fullName);
-
-          if (!controllerClass) {
-            return defaultQPMeta;
-          }
-
-          var controllerProto = controllerClass.proto();
-          var qpProps = get(controllerProto, '_normalizedQueryParams');
-          var cacheMeta = get(controllerProto, '_cacheMeta');
-
-          var qps = [], map = {}, self = this;
-          for (var propName in qpProps) {
-            if (!qpProps.hasOwnProperty(propName)) { continue; }
-
-            var desc = qpProps[propName],
-                urlKey = desc.as || this.serializeQueryParamKey(propName),
-                defaultValue = get(controllerProto, propName);
-
-            if (isArray(defaultValue)) {
-              defaultValue = Ember.A(defaultValue.slice());
-            }
-
-            var type = typeOf(defaultValue),
-                defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type),
-                fprop = controllerName + ':' + propName,
-                qp = {
-                  def: defaultValue,
-                  sdef: defaultValueSerialized,
-                  type: type,
-                  urlKey: urlKey,
-                  prop: propName,
-                  fprop: fprop,
-                  ctrl: controllerName,
-                  cProto: controllerProto,
-                  svalue: defaultValueSerialized,
-                  cacheType: desc.scope,
-                  route: this,
-                  cacheMeta: cacheMeta[propName]
-                };
-
-            map[propName] = map[urlKey] = map[fprop] = qp;
-            qps.push(qp);
-          }
-
-          return {
-            qps: qps,
-            map: map,
-            states: {
-              active: function(controller, prop) {
-                return self._activeQPChanged(controller, map[prop]);
-              },
-              allowOverrides: function(controller, prop) {
-                return self._updatingQPChanged(controller, map[prop]);
-              },
-              changingKeys: function(controller, prop) {
-                return self._updateSerializedQPValue(controller, map[prop]);
-              }
-            }
-          };
-        }),
-
-        _names: null,
-        _stashNames: function(_handlerInfo, dynamicParent) {
-          var handlerInfo = _handlerInfo;
-          if (this._names) { return; }
-          var names = this._names = handlerInfo._names;
-
-          if (!names.length) {
-            handlerInfo = dynamicParent;
-            names = handlerInfo && handlerInfo._names || [];
-          }
-
-          var qps = get(this, '_qp.qps');
-          var len = qps.length;
-
-          var namePaths = new Array(names.length);
-          for (var a = 0, nlen = names.length; a < nlen; ++a) {
-            namePaths[a] = handlerInfo.name + '.' + names[a];
-          }
-
-          for (var i = 0; i < len; ++i) {
-            var qp = qps[i];
-            var cacheMeta = qp.cacheMeta;
-            if (cacheMeta.scope === 'model') {
-              cacheMeta.parts = namePaths;
-            }
-            cacheMeta.prefix = qp.ctrl;
-          }
-        },
-
-        _updateSerializedQPValue: function(controller, qp) {
-          var value = get(controller, qp.prop);
-          qp.svalue = this.serializeQueryParam(value, qp.urlKey, qp.type);
-        },
-
-        _activeQPChanged: function(controller, qp) {
-          var value = get(controller, qp.prop);
-          this.router._queuedQPChanges[qp.fprop] = value;
-          run.once(this, this._fireQueryParamTransition);
-        },
-
-        _updatingQPChanged: function(controller, qp) {
-          var router = this.router;
-          if (!router._qpUpdates) {
-            router._qpUpdates = {};
-          }
-          router._qpUpdates[qp.urlKey] = true;
-        },
-
-        mergedProperties: ['queryParams'],
-
-        paramsFor: function(name) {
-          var route = this.container.lookup('route:' + name);
-
-          if (!route) {
-            return {};
-          }
-
-          var transition = this.router.router.activeTransition;
-          var state = transition ? transition.state : this.router.router.state;
-
-          var params = {};
-          merge(params, state.params[name]);
-          merge(params, getQueryParamsFor(route, state));
-
-          return params;
-        },
-
-        serializeQueryParamKey: function(controllerPropertyName) {
-          return controllerPropertyName;
-        },
-
-        serializeQueryParam: function(value, urlKey, defaultValueType) {
-          // urlKey isn't used here, but anyone overriding
-          // can use it to provide serialization specific
-          // to a certain query param.
-          if (defaultValueType === 'array') {
-            return JSON.stringify(value);
-          }
-          return '' + value;
-        },
-
-        deserializeQueryParam: function(value, urlKey, defaultValueType) {
-          // urlKey isn't used here, but anyone overriding
-          // can use it to provide deserialization specific
-          // to a certain query param.
-
-          // Use the defaultValueType of the default value (the initial value assigned to a
-          // controller query param property), to intelligently deserialize and cast.
-          if (defaultValueType === 'boolean') {
-            return (value === 'true') ? true : false;
-          } else if (defaultValueType === 'number') {
-            return (Number(value)).valueOf();
-          } else if (defaultValueType === 'array') {
-            return Ember.A(JSON.parse(value));
-          }
-          return value;
-        },
-
-
-        _fireQueryParamTransition: function() {
-          this.transitionTo({ queryParams: this.router._queuedQPChanges });
-          this.router._queuedQPChanges = {};
-        },
-
-        /**
-          A hook you can use to reset controller values either when the model
-          changes or the route is exiting.
-
-          ```js
-          App.ArticlesRoute = Ember.Route.extend({
-            // ...
-
-            resetController: function (controller, isExiting, transition) {
-              if (isExiting) {
-                controller.set('page', 1);
-              }
-            }
-          });
-          ```
-
-          @method resetController
-          @param {Controller} controller instance
-          @param {Boolean} isExiting
-          @param {Object} transition
-          @since 1.7.0
-        */
-        resetController: Ember.K
-      });
-    
-
     function parentRoute(route) {
       var handlerInfo = handlerInfoFor(route, route.router.router.state.handlerInfos, -1);
       return handlerInfo && handlerInfo.handler;
@@ -24122,9 +25530,9 @@ define("ember-routing/system/route",
 
       Ember.assert("An outlet ("+options.outlet+") was specified but was not found.", options.outlet === 'main' || options.into);
 
-      var controller = options.controller,
-          model = options.model,
-          namedController;
+      var controller = options.controller;
+      var model = options.model;
+      var namedController;
 
       if (options.controller) {
         controller = options.controller;
@@ -24249,9 +25657,9 @@ define("ember-routing/system/route",
 
     __exports__["default"] = Route;
   });
-define("ember-routing/system/router",
-  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","ember-routing-handlebars/helpers/shared","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
+enifed("ember-routing/system/router",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","ember-routing-handlebars/helpers/shared","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, Logger, K, assert
@@ -24274,10 +25682,7 @@ define("ember-routing/system/router",
     var routeArgs = __dependency17__.routeArgs;
     var getActiveTargetName = __dependency17__.getActiveTargetName;
     var stashParamNames = __dependency17__.stashParamNames;
-
-    // requireModule("ember-handlebars");
-    // requireModule("ember-runtime");
-    // requireModule("ember-views");
+    var create = __dependency18__.create;
 
     /**
     @module ember
@@ -24562,13 +25967,17 @@ define("ember-routing/system/router",
           }
         }
 
-        if (rootURL && typeof rootURL === 'string') {
-          location.rootURL = rootURL;
-        }
+        if (location !== null && typeof location === 'object') {
+          if (rootURL && typeof rootURL === 'string') {
+            location.rootURL = rootURL;
+          }
 
-        // ensure that initState is called AFTER the rootURL is set on
-        // the location instance
-        if (typeof location.initState === 'function') { location.initState(); }
+          // ensure that initState is called AFTER the rootURL is set on
+          // the location instance
+          if (typeof location.initState === 'function') {
+            location.initState();
+          }
+        }
       },
 
       _getHandlerFunction: function() {
@@ -24676,10 +26085,8 @@ define("ember-routing/system/router",
         Ember.assert("The route " + targetRouteName + " was not found", targetRouteName && this.router.hasRoute(targetRouteName));
 
         var queryParams = {};
-        
-          merge(queryParams, _queryParams);
-          this._prepareQueryParams(targetRouteName, models, queryParams);
-        
+        merge(queryParams, _queryParams);
+        this._prepareQueryParams(targetRouteName, models, queryParams);
 
         var transitionArgs = routeArgs(targetRouteName, models, queryParams);
         var transitionPromise = this.router.transitionTo.apply(this.router, transitionArgs);
@@ -24709,8 +26116,8 @@ define("ember-routing/system/router",
           qps: qps
         };
 
-        var routerjs = this.router,
-            recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
+        var routerjs = this.router;
+        var recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
 
         for (var i = 0, len = recogHandlerInfos.length; i < len; ++i) {
           var recogHandler = recogHandlerInfos[i];
@@ -24990,8 +26397,8 @@ define("ember-routing/system/router",
         return;
       }
 
-      var infos = router.router.currentHandlerInfos,
-          path = EmberRouter._routePath(infos);
+      var infos = router.router.currentHandlerInfos;
+      var path = EmberRouter._routePath(infos);
 
       if (!('currentPath' in appController)) {
         defineProperty(appController, 'currentPath');
@@ -25108,25 +26515,24 @@ define("ember-routing/system/router",
     }
 
     function forEachQueryParam(router, targetRouteName, queryParams, callback) {
-      
-        var qpCache = router._queryParamsFor(targetRouteName),
-        qps = qpCache.qps;
+      var qpCache = router._queryParamsFor(targetRouteName);
+      var qps = qpCache.qps;
 
-        for (var key in queryParams) {
-          if (!queryParams.hasOwnProperty(key)) { continue; }
-          var value = queryParams[key],
-          qp = qpCache.map[key];
+      for (var key in queryParams) {
+        if (!queryParams.hasOwnProperty(key)) { continue; }
+        var value = queryParams[key];
+        var qp = qpCache.map[key];
 
-          if (qp) {
-            callback(key, value, qp);
-          }
+        if (qp) {
+          callback(key, value, qp);
         }
-          }
+      }
+    }
 
     __exports__["default"] = EmberRouter;
   });
-define("ember-runtime",
-  ["ember-metal","ember-runtime/core","ember-runtime/keys","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/mixins/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
+enifed("ember-runtime",
+  ["ember-metal","ember-runtime/core","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/-proxy","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/mixins/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __dependency37__, __dependency38__, __dependency39__, __dependency40__, __dependency41__, __dependency42__, __dependency43__, __dependency44__, __exports__) {
     "use strict";
     /**
@@ -25140,35 +26546,35 @@ define("ember-runtime",
     // BEGIN IMPORTS
     var Ember = __dependency1__["default"];
     var isEqual = __dependency2__.isEqual;
-    var keys = __dependency3__["default"];
-    var compare = __dependency4__["default"];
-    var copy = __dependency5__["default"];
+    var compare = __dependency3__["default"];
+    var copy = __dependency4__["default"];
 
-    var Namespace = __dependency6__["default"];
-    var EmberObject = __dependency7__["default"];
-    var TrackedArray = __dependency8__["default"];
-    var SubArray = __dependency9__["default"];
-    var Container = __dependency10__["default"];
-    var Application = __dependency11__["default"];
-    var ArrayProxy = __dependency12__["default"];
-    var ObjectProxy = __dependency13__["default"];
-    var CoreObject = __dependency14__["default"];
-    var EachArray = __dependency15__.EachArray;
-    var EachProxy = __dependency15__.EachProxy;
+    var Namespace = __dependency5__["default"];
+    var EmberObject = __dependency6__["default"];
+    var TrackedArray = __dependency7__["default"];
+    var SubArray = __dependency8__["default"];
+    var Container = __dependency9__["default"];
+    var Application = __dependency10__["default"];
+    var ArrayProxy = __dependency11__["default"];
+    var ObjectProxy = __dependency12__["default"];
+    var CoreObject = __dependency13__["default"];
+    var EachArray = __dependency14__.EachArray;
+    var EachProxy = __dependency14__.EachProxy;
 
-    var NativeArray = __dependency16__["default"];
-    var Set = __dependency17__["default"];
-    var EmberStringUtils = __dependency18__["default"];
-    var Deferred = __dependency19__["default"];
-    var onLoad = __dependency20__.onLoad;
-    var runLoadHooks = __dependency20__.runLoadHooks;
+    var NativeArray = __dependency15__["default"];
+    var Set = __dependency16__["default"];
+    var EmberStringUtils = __dependency17__["default"];
+    var Deferred = __dependency18__["default"];
+    var onLoad = __dependency19__.onLoad;
+    var runLoadHooks = __dependency19__.runLoadHooks;
 
-    var EmberArray = __dependency21__["default"];
-    var Comparable = __dependency22__["default"];
-    var Copyable = __dependency23__["default"];
-    var Enumerable = __dependency24__["default"];
-    var Freezable = __dependency25__.Freezable;
-    var FROZEN_ERROR = __dependency25__.FROZEN_ERROR;
+    var EmberArray = __dependency20__["default"];
+    var Comparable = __dependency21__["default"];
+    var Copyable = __dependency22__["default"];
+    var Enumerable = __dependency23__["default"];
+    var Freezable = __dependency24__.Freezable;
+    var FROZEN_ERROR = __dependency24__.FROZEN_ERROR;
+    var _ProxyMixin = __dependency25__["default"];
 
     var Observable = __dependency26__["default"];
     var ActionHandler = __dependency27__["default"];
@@ -25215,7 +26621,6 @@ define("ember-runtime",
     Ember.compare = compare;
     Ember.copy = copy;
     Ember.isEqual = isEqual;
-    Ember.keys = keys;
 
     Ember.Array = EmberArray;
 
@@ -25288,34 +26693,41 @@ define("ember-runtime",
     Ember.Controller = Controller;
     Ember.ControllerMixin = ControllerMixin;
 
+    Ember._ProxyMixin = _ProxyMixin;
+
     Ember.RSVP = RSVP;
     // END EXPORTS
 
     __exports__["default"] = Ember;
   });
-define("ember-runtime/compare",
-  ["ember-metal/core","ember-metal/utils","ember-runtime/mixins/comparable","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+enifed("ember-runtime/compare",
+  ["ember-metal/utils","ember-runtime/mixins/comparable","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-     // for Ember.ORDER_DEFINITION
-    var typeOf = __dependency2__.typeOf;
-    var Comparable = __dependency3__["default"];
+    var typeOf = __dependency1__.typeOf;
+    var Comparable = __dependency2__["default"];
 
-    // Used by Ember.compare
-    Ember.ORDER_DEFINITION = Ember.ENV.ORDER_DEFINITION || [
-      'undefined',
-      'null',
-      'boolean',
-      'number',
-      'string',
-      'array',
-      'object',
-      'instance',
-      'function',
-      'class',
-      'date'
-    ];
+    var TYPE_ORDER = {
+      'undefined': 0,
+      'null': 1,
+      'boolean': 2,
+      'number': 3,
+      'string': 4,
+      'array': 5,
+      'object': 6,
+      'instance': 7,
+      'function': 8,
+      'class': 9,
+      'date': 10
+    };
+
+    //
+    // the spaceship operator
+    //
+    function spaceship(a, b) {
+      var diff = a - b;
+      return (diff > 0) - (diff < 0);
+    }
 
     /**
      This will compare two javascript values of possibly different types.
@@ -25341,74 +26753,52 @@ define("ember-runtime/compare",
      @return {Number} -1 if v < w, 0 if v = w and 1 if v > w.
     */
     __exports__["default"] = function compare(v, w) {
-      if (v === w) { return 0; }
+      if (v === w) {
+        return 0;
+      }
 
       var type1 = typeOf(v);
       var type2 = typeOf(w);
 
       if (Comparable) {
-        if (type1==='instance' && Comparable.detect(v.constructor)) {
+        if (type1 ==='instance' && Comparable.detect(v.constructor)) {
           return v.constructor.compare(v, w);
         }
 
         if (type2 === 'instance' && Comparable.detect(w.constructor)) {
-          return 1-w.constructor.compare(w, v);
+          return 1 - w.constructor.compare(w, v);
         }
       }
 
-      // If we haven't yet generated a reverse-mapping of Ember.ORDER_DEFINITION,
-      // do so now.
-      var mapping = Ember.ORDER_DEFINITION_MAPPING;
-      if (!mapping) {
-        var order = Ember.ORDER_DEFINITION;
-        mapping = Ember.ORDER_DEFINITION_MAPPING = {};
-        var idx, len;
-        for (idx = 0, len = order.length; idx < len;  ++idx) {
-          mapping[order[idx]] = idx;
-        }
-
-        // We no longer need Ember.ORDER_DEFINITION.
-        delete Ember.ORDER_DEFINITION;
+      var res = spaceship(TYPE_ORDER[type1], TYPE_ORDER[type2]);
+      if (res !== 0) {
+        return res;
       }
 
-      var type1Index = mapping[type1];
-      var type2Index = mapping[type2];
-
-      if (type1Index < type2Index) { return -1; }
-      if (type1Index > type2Index) { return 1; }
-
       // types are equal - so we have to check values now
       switch (type1) {
         case 'boolean':
         case 'number':
-          if (v < w) { return -1; }
-          if (v > w) { return 1; }
-          return 0;
+          return spaceship(v,w);
 
         case 'string':
-          var comp = v.localeCompare(w);
-          if (comp < 0) { return -1; }
-          if (comp > 0) { return 1; }
-          return 0;
+          return spaceship(v.localeCompare(w), 0);
 
         case 'array':
           var vLen = v.length;
           var wLen = w.length;
-          var l = Math.min(vLen, wLen);
-          var r = 0;
-          var i = 0;
-          while (r === 0 && i < l) {
-            r = compare(v[i],w[i]);
-            i++;
+          var len = Math.min(vLen, wLen);
+
+          for (var i = 0; i < len; i++) {
+            var r = compare(v[i], w[i]);
+            if (r !== 0) {
+              return r;
+            }
           }
-          if (r !== 0) { return r; }
 
           // all elements are equal now
           // shorter array should be ordered first
-          if (vLen < wLen) { return -1; }
-          if (vLen > wLen) { return 1; }
-          // arrays are equal now
-          return 0;
+          return spaceship(vLen, wLen);
 
         case 'instance':
           if (Comparable && Comparable.detect(v)) {
@@ -25417,18 +26807,14 @@ define("ember-runtime/compare",
           return 0;
 
         case 'date':
-          var vNum = v.getTime();
-          var wNum = w.getTime();
-          if (vNum < wNum) { return -1; }
-          if (vNum > wNum) { return 1; }
-          return 0;
+          return spaceship(v.getTime(), w.getTime());
 
         default:
           return 0;
       }
     }
   });
-define("ember-runtime/computed/array_computed",
+enifed("ember-runtime/computed/array_computed",
   ["ember-metal/core","ember-runtime/computed/reduce_computed","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/observer","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -25468,9 +26854,11 @@ define("ember-runtime/computed/array_computed",
     }
 
     ArrayComputedProperty.prototype = o_create(ReduceComputedProperty.prototype);
+
     ArrayComputedProperty.prototype.initialValue = function () {
       return Ember.A();
     };
+
     ArrayComputedProperty.prototype.resetValue = function (array) {
       array.clear();
       return array;
@@ -25603,8 +26991,8 @@ define("ember-runtime/computed/array_computed",
         options = a_slice.call(arguments, -1)[0];
       }
 
-      if (typeof options !== "object") {
-        throw new EmberError("Array Computed Property declared without an options hash");
+      if (typeof options !== 'object') {
+        throw new EmberError('Array Computed Property declared without an options hash');
       }
 
       var cp = new ArrayComputedProperty(options);
@@ -25619,9 +27007,9 @@ define("ember-runtime/computed/array_computed",
     __exports__.arrayComputed = arrayComputed;
     __exports__.ArrayComputedProperty = ArrayComputedProperty;
   });
-define("ember-runtime/computed/reduce_computed",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","ember-runtime/system/set","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+enifed("ember-runtime/computed/reduce_computed",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
@@ -25645,7 +27033,6 @@ define("ember-runtime/computed/reduce_computed",
     var TrackedArray = __dependency12__["default"];
     var EmberArray = __dependency13__["default"];
     var run = __dependency14__["default"];
-    var Set = __dependency15__["default"];
     var isArray = __dependency4__.isArray;
 
     var cacheSet = cacheFor.set;
@@ -25708,7 +27095,7 @@ define("ember-runtime/computed/reduce_computed",
     }
 
     function ItemPropertyObserverContext (dependentArray, index, trackedArray) {
-      Ember.assert("Internal error: trackedArray is null or undefined", trackedArray);
+      Ember.assert('Internal error: trackedArray is null or undefined', trackedArray);
 
       this.dependentArray = dependentArray;
       this.index = index;
@@ -25716,7 +27103,6 @@ define("ember-runtime/computed/reduce_computed",
       this.trackedArray = trackedArray;
       this.beforeObserver = null;
       this.observer = null;
-
       this.destroyed = false;
     }
 
@@ -25724,6 +27110,7 @@ define("ember-runtime/computed/reduce_computed",
       setValue: function (newValue) {
         this.instanceMeta.setValue(newValue, true);
       },
+
       getValue: function () {
         return this.instanceMeta.getValue();
       },
@@ -25762,9 +27149,9 @@ define("ember-runtime/computed/reduce_computed",
       },
 
       setupPropertyObservers: function (dependentKey, itemPropertyKeys) {
-        var dependentArray = get(this.instanceMeta.context, dependentKey),
-            length = get(dependentArray, 'length'),
-            observerContexts = new Array(length);
+        var dependentArray = get(this.instanceMeta.context, dependentKey);
+        var length = get(dependentArray, 'length');
+        var observerContexts = new Array(length);
 
         this.resetTransformations(dependentKey, observerContexts);
 
@@ -25780,11 +27167,9 @@ define("ember-runtime/computed/reduce_computed",
       },
 
       teardownPropertyObservers: function (dependentKey, itemPropertyKeys) {
-        var dependentArrayObserver = this,
-            trackedArray = this.trackedArraysByGuid[dependentKey],
-            beforeObserver,
-            observer,
-            item;
+        var dependentArrayObserver = this;
+        var trackedArray = this.trackedArraysByGuid[dependentKey];
+        var beforeObserver, observer, item;
 
         if (!trackedArray) { return; }
 
@@ -25819,6 +27204,7 @@ define("ember-runtime/computed/reduce_computed",
         observerContext.beforeObserver = function (obj, keyName) {
           return dependentArrayObserver.itemPropertyWillChange(obj, keyName, observerContext.dependentArray, observerContext);
         };
+
         observerContext.observer = function (obj, keyName) {
           return dependentArrayObserver.itemPropertyDidChange(obj, keyName, observerContext.dependentArray, observerContext);
         };
@@ -25830,6 +27216,7 @@ define("ember-runtime/computed/reduce_computed",
 
       trackAdd: function (dependentKey, index, newItems) {
         var trackedArray = this.trackedArraysByGuid[dependentKey];
+
         if (trackedArray) {
           trackedArray.addItems(index, newItems);
         }
@@ -25895,9 +27282,10 @@ define("ember-runtime/computed/reduce_computed",
           forEach(itemPropertyKeys, removeObservers, this);
 
           changeMeta = new ChangeMeta(dependentArray, item, itemIndex, this.instanceMeta.propertyName, this.cp, normalizedRemoveCount);
-          this.setValue( removedItem.call(
+          this.setValue(removedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }
+        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       },
 
       dependentArrayDidChange: function (dependentArray, index, removedCount, addedCount) {
@@ -25910,13 +27298,15 @@ define("ember-runtime/computed/reduce_computed",
         var itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey];
         var length = get(dependentArray, 'length');
         var normalizedIndex = normalizeIndex(index, length, addedCount);
+        var endIndex = normalizedIndex + addedCount;
         var changeMeta, observerContext;
 
-        forEach(dependentArray.slice(normalizedIndex, normalizedIndex + addedCount), function (item, sliceIndex) {
+        forEach(dependentArray.slice(normalizedIndex, endIndex), function (item, sliceIndex) {
           if (itemPropertyKeys) {
-            observerContext =
-              observerContexts[sliceIndex] =
-              this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex, this.trackedArraysByGuid[dependentKey]);
+            observerContext = this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex,
+              this.trackedArraysByGuid[dependentKey]);
+            observerContexts[sliceIndex] = observerContext;
+
             forEach(itemPropertyKeys, function (propertyKey) {
               addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
               addObserver(item, propertyKey, this, observerContext.observer);
@@ -25924,10 +27314,10 @@ define("ember-runtime/computed/reduce_computed",
           }
 
           changeMeta = new ChangeMeta(dependentArray, item, normalizedIndex + sliceIndex, this.instanceMeta.propertyName, this.cp, addedCount);
-          this.setValue( addedItem.call(
+          this.setValue(addedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }, this);
-
+        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
         this.trackAdd(dependentKey, normalizedIndex, observerContexts);
       },
 
@@ -25936,25 +27326,26 @@ define("ember-runtime/computed/reduce_computed",
 
         if (!this.changedItems[guid]) {
           this.changedItems[guid] = {
-            array:            array,
-            observerContext:  observerContext,
-            obj:              obj,
-            previousValues:   {}
+            array: array,
+            observerContext: observerContext,
+            obj: obj,
+            previousValues: {}
           };
         }
-        ++this.changedItemCount;
 
+        ++this.changedItemCount;
         this.changedItems[guid].previousValues[keyName] = get(obj, keyName);
       },
 
-      itemPropertyDidChange: function(obj, keyName, array, observerContext) {
+      itemPropertyDidChange: function (obj, keyName, array, observerContext) {
         if (--this.changedItemCount === 0) {
           this.flushChanges();
         }
       },
 
-      flushChanges: function() {
-        var changedItems = this.changedItems, key, c, changeMeta;
+      flushChanges: function () {
+        var changedItems = this.changedItems;
+        var key, c, changeMeta;
 
         for (key in changedItems) {
           c = changedItems[key];
@@ -25968,7 +27359,9 @@ define("ember-runtime/computed/reduce_computed",
           this.setValue(
             this.callbacks.addedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
         }
+
         this.changedItems = {};
+        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       }
     };
 
@@ -26000,26 +27393,26 @@ define("ember-runtime/computed/reduce_computed",
       }
     }
 
-    function addItems (dependentArray, callbacks, cp, propertyName, meta) {
+    function addItems(dependentArray, callbacks, cp, propertyName, meta) {
       forEach(dependentArray, function (item, index) {
         meta.setValue( callbacks.addedItem.call(
           this, meta.getValue(), item, new ChangeMeta(dependentArray, item, index, propertyName, cp, dependentArray.length), meta.sugarMeta));
       }, this);
+      callbacks.flushedChanges.call(this, meta.getValue(), meta.sugarMeta);
     }
 
     function reset(cp, propertyName) {
-      var callbacks = cp._callbacks(),
-          meta;
+      var callbacks = cp._callbacks();
+      var hadMeta = cp._hasInstanceMeta(this, propertyName);
+      var meta = cp._instanceMeta(this, propertyName);
 
-      if (cp._hasInstanceMeta(this, propertyName)) {
-        meta = cp._instanceMeta(this, propertyName);
-        meta.setValue(cp.resetValue(meta.getValue()));
-      } else {
-        meta = cp._instanceMeta(this, propertyName);
-      }
+      if (hadMeta) { meta.setValue(cp.resetValue(meta.getValue())); }
 
       if (cp.options.initialize) {
-        cp.options.initialize.call(this, meta.getValue(), { property: cp, propertyName: propertyName }, meta.sugarMeta);
+        cp.options.initialize.call(this, meta.getValue(), {
+          property: cp,
+          propertyName: propertyName
+        }, meta.sugarMeta);
       }
     }
 
@@ -26036,16 +27429,15 @@ define("ember-runtime/computed/reduce_computed",
       this.context = context;
       this.propertyName = propertyName;
       this.cache = metaFor(context).cache;
-
       this.dependentArrays = {};
       this.sugarMeta = {};
-
       this.initialValue = initialValue;
     }
 
     ReduceComputedPropertyInstanceMeta.prototype = {
       getValue: function () {
         var value = cacheGet(this.cache, this.propertyName);
+
         if (value !== undefined) {
           return value;
         } else {
@@ -26088,11 +27480,11 @@ define("ember-runtime/computed/reduce_computed",
 
     __exports__.ReduceComputedProperty = ReduceComputedProperty;
     // TODO: default export
+
     function ReduceComputedProperty(options) {
       var cp = this;
 
       this.options = options;
-
       this._dependentKeys = null;
       // A map of dependentKey -> [itemProperty, ...] that tracks what properties of
       // items in the array we must track to update this property.
@@ -26108,24 +27500,25 @@ define("ember-runtime/computed/reduce_computed",
         // coalesce by, in addition to the target and method.
         run.once(this, recompute, propertyName);
       };
+
       var recompute = function(propertyName) {
-        var dependentKeys = cp._dependentKeys,
-            meta = cp._instanceMeta(this, propertyName),
-            callbacks = cp._callbacks();
+        var dependentKeys = cp._dependentKeys;
+        var meta = cp._instanceMeta(this, propertyName);
+        var callbacks = cp._callbacks();
 
         reset.call(this, cp, propertyName);
 
         meta.dependentArraysObserver.suspendArrayObservers(function () {
           forEach(cp._dependentKeys, function (dependentKey) {
             Ember.assert(
-              "dependent array " + dependentKey + " must be an `Ember.Array`.  " +
-              "If you are not extending arrays, you will need to wrap native arrays with `Ember.A`",
+              'dependent array ' + dependentKey + ' must be an `Ember.Array`.  ' +
+              'If you are not extending arrays, you will need to wrap native arrays with `Ember.A`',
               !(isArray(get(this, dependentKey)) && !EmberArray.detect(get(this, dependentKey))));
 
             if (!partiallyRecomputeFor(this, dependentKey)) { return; }
 
-            var dependentArray = get(this, dependentKey),
-                previousDependentArray = meta.dependentArrays[dependentKey];
+            var dependentArray = get(this, dependentKey);
+            var previousDependentArray = meta.dependentArrays[dependentKey];
 
             if (dependentArray === previousDependentArray) {
               // The array may be the same, but our item property keys may have
@@ -26154,6 +27547,7 @@ define("ember-runtime/computed/reduce_computed",
           if (!partiallyRecomputeFor(this, dependentKey)) { return; }
 
           var dependentArray = get(this, dependentKey);
+
           if (dependentArray) {
             addItems.call(this, dependentArray, callbacks, cp, propertyName, meta);
           }
@@ -26162,7 +27556,7 @@ define("ember-runtime/computed/reduce_computed",
 
 
       this.func = function (propertyName) {
-        Ember.assert("Computed reduce values require at least one dependent key", cp._dependentKeys);
+        Ember.assert('Computed reduce values require at least one dependent key', cp._dependentKeys);
 
         recompute.call(this, propertyName);
 
@@ -26179,11 +27573,14 @@ define("ember-runtime/computed/reduce_computed",
     ReduceComputedProperty.prototype._callbacks = function () {
       if (!this.callbacks) {
         var options = this.options;
+
         this.callbacks = {
           removedItem: options.removedItem || defaultCallback,
-          addedItem: options.addedItem || defaultCallback
+          addedItem: options.addedItem || defaultCallback,
+          flushedChanges: options.flushedChanges || defaultCallback
         };
       }
+
       return this.callbacks;
     };
 
@@ -26192,8 +27589,8 @@ define("ember-runtime/computed/reduce_computed",
     };
 
     ReduceComputedProperty.prototype._instanceMeta = function (context, propertyName) {
-      var cacheMeta = metaFor(context).cacheMeta,
-          meta = cacheMeta[propertyName];
+      var cacheMeta = metaFor(context).cacheMeta;
+      var meta = cacheMeta[propertyName];
 
       if (!meta) {
         meta = cacheMeta[propertyName] = new ReduceComputedPropertyInstanceMeta(context, propertyName, this.initialValue());
@@ -26229,33 +27626,35 @@ define("ember-runtime/computed/reduce_computed",
     };
 
     ReduceComputedProperty.prototype.property = function () {
-      var cp = this,
-          args = a_slice.call(arguments),
-          propertyArgs = new Set(),
-          match,
-          dependentArrayKey,
-          itemPropertyKey;
+      var cp = this;
+      var args = a_slice.call(arguments);
+      var propertyArgs = {};
+      var match, dependentArrayKey, itemPropertyKey;
 
       forEach(args, function (dependentKey) {
         if (doubleEachPropertyPattern.test(dependentKey)) {
-          throw new EmberError("Nested @each properties not supported: " + dependentKey);
+          throw new EmberError('Nested @each properties not supported: ' + dependentKey);
         } else if (match = eachPropertyPattern.exec(dependentKey)) {
           dependentArrayKey = match[1];
 
-          var itemPropertyKeyPattern = match[2],
-              addItemPropertyKey = function (itemPropertyKey) {
-                cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
-              };
+          var itemPropertyKeyPattern = match[2];
+          var addItemPropertyKey = function (itemPropertyKey) {
+            cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
+          };
 
           expandProperties(itemPropertyKeyPattern, addItemPropertyKey);
-          propertyArgs.add(dependentArrayKey);
+          propertyArgs[guidFor(dependentArrayKey)] = dependentArrayKey;
         } else {
-          propertyArgs.add(dependentKey);
+          propertyArgs[guidFor(dependentKey)] = dependentKey;
         }
       });
 
-      return ComputedProperty.prototype.property.apply(this, propertyArgs.toArray());
+      var propertyArgsToArray = [];
+      for (var guid in propertyArgs) {
+        propertyArgsToArray.push(propertyArgs[guid]);
+      }
 
+      return ComputedProperty.prototype.property.apply(this, propertyArgsToArray);
     };
 
     /**
@@ -26391,8 +27790,8 @@ define("ember-runtime/computed/reduce_computed",
           // `content.@each.reversedName` above, we would be getting the objects
           // directly and not have access to `reversedName`.
           //
-          var reversedNameA = get(personA, 'reversedName'),
-              reversedNameB = get(personB, 'reversedName');
+          var reversedNameA = get(personA, 'reversedName');
+          var reversedNameB = get(personB, 'reversedName');
 
           return Ember.compare(reversedNameA, reversedNameB);
         })
@@ -26451,12 +27850,12 @@ define("ember-runtime/computed/reduce_computed",
         options = a_slice.call(arguments, -1)[0];
       }
 
-      if (typeof options !== "object") {
-        throw new EmberError("Reduce Computed Property declared without an options hash");
+      if (typeof options !== 'object') {
+        throw new EmberError('Reduce Computed Property declared without an options hash');
       }
 
       if (!('initialValue' in options)) {
-        throw new EmberError("Reduce Computed Property declared without an initial value");
+        throw new EmberError('Reduce Computed Property declared without an initial value');
       }
 
       var cp = new ReduceComputedProperty(options);
@@ -26470,9 +27869,9 @@ define("ember-runtime/computed/reduce_computed",
 
     __exports__.reduceComputed = reduceComputed;
   });
-define("ember-runtime/computed/reduce_computed_macros",
-  ["ember-metal/core","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/object_proxy","ember-runtime/system/subarray","ember-runtime/keys","ember-runtime/compare","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+enifed("ember-runtime/computed/reduce_computed_macros",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/subarray","ember-metal/keys","ember-runtime/compare","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -26481,21 +27880,19 @@ define("ember-runtime/computed/reduce_computed_macros",
 
     var Ember = __dependency1__["default"];
     // Ember.assert
-    var merge = __dependency2__["default"];
-    var get = __dependency3__.get;
-    var set = __dependency4__.set;
-    var isArray = __dependency5__.isArray;
-    var guidFor = __dependency5__.guidFor;
-    var EmberError = __dependency6__["default"];
-    var forEach = __dependency7__.forEach;
-    var run = __dependency8__["default"];
-    var addObserver = __dependency9__.addObserver;
-    var arrayComputed = __dependency10__.arrayComputed;
-    var reduceComputed = __dependency11__.reduceComputed;
-    var ObjectProxy = __dependency12__["default"];
-    var SubArray = __dependency13__["default"];
-    var keys = __dependency14__["default"];
-    var compare = __dependency15__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var isArray = __dependency4__.isArray;
+    var guidFor = __dependency4__.guidFor;
+    var EmberError = __dependency5__["default"];
+    var forEach = __dependency6__.forEach;
+    var run = __dependency7__["default"];
+    var addObserver = __dependency8__.addObserver;
+    var arrayComputed = __dependency9__.arrayComputed;
+    var reduceComputed = __dependency10__.reduceComputed;
+    var SubArray = __dependency11__["default"];
+    var keys = __dependency12__["default"];
+    var compare = __dependency13__["default"];
 
     var a_slice = [].slice;
 
@@ -26557,7 +27954,7 @@ define("ember-runtime/computed/reduce_computed_macros",
       @param {String} dependentKey
       @return {Ember.ComputedProperty} computes the largest value in the dependentKey's array
     */
-    function max (dependentKey) {
+    function max(dependentKey) {
       return reduceComputed(dependentKey, {
         initialValue: -Infinity,
 
@@ -26627,16 +28024,17 @@ define("ember-runtime/computed/reduce_computed_macros",
 
       The callback method you provide should have the following signature.
       `item` is the current item in the iteration.
+      `index` is the integer index of the current item in the iteration.
 
       ```javascript
-      function(item);
+      function(item, index);
       ```
 
       Example
 
       ```javascript
       var Hamster = Ember.Object.extend({
-        excitingChores: Ember.computed.map('chores', function(chore) {
+        excitingChores: Ember.computed.map('chores', function(chore, index) {
           return chore.toUpperCase() + '!';
         })
       });
@@ -26657,7 +28055,7 @@ define("ember-runtime/computed/reduce_computed_macros",
     function map(dependentKey, callback) {
       var options = {
         addedItem: function(array, item, changeMeta, instanceMeta) {
-          var mapped = callback.call(this, item);
+          var mapped = callback.call(this, item, changeMeta.index);
           array.insertAt(changeMeta.index, mapped);
           return array;
         },
@@ -26718,24 +28116,25 @@ define("ember-runtime/computed/reduce_computed_macros",
 
       The callback method you provide should have the following signature.
       `item` is the current item in the iteration.
+      `index` is the integer index of the current item in the iteration.
 
       ```javascript
-      function(item);
+      function(item, index);
       ```
 
       ```javascript
       var Hamster = Ember.Object.extend({
-        remainingChores: Ember.computed.filter('chores', function(chore) {
+        remainingChores: Ember.computed.filter('chores', function(chore, index) {
           return !chore.done;
         })
       });
 
-      var hamster = Hamster.create({ 
+      var hamster = Hamster.create({
         chores: [
           { name: 'cook', done: true },
           { name: 'clean', done: true },
           { name: 'write more unit tests', done: false }
-        ] 
+        ]
       });
 
       hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
@@ -26753,9 +28152,9 @@ define("ember-runtime/computed/reduce_computed_macros",
           instanceMeta.filteredArrayIndexes = new SubArray();
         },
 
-        addedItem: function(array, item, changeMeta, instanceMeta) {
-          var match = !!callback.call(this, item),
-              filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
+        addedItem: function (array, item, changeMeta, instanceMeta) {
+          var match = !!callback.call(this, item, changeMeta.index);
+          var filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
 
           if (match) {
             array.insertAt(filterIndex, item);
@@ -26861,6 +28260,7 @@ define("ember-runtime/computed/reduce_computed_macros",
     */
     function uniq() {
       var args = a_slice.call(arguments);
+
       args.push({
         initialize: function(array, changeMeta, instanceMeta) {
           instanceMeta.itemCounts = {};
@@ -26871,22 +28271,25 @@ define("ember-runtime/computed/reduce_computed_macros",
 
           if (!instanceMeta.itemCounts[guid]) {
             instanceMeta.itemCounts[guid] = 1;
+            array.pushObject(item);
           } else {
             ++instanceMeta.itemCounts[guid];
           }
-          array.addObject(item);
           return array;
         },
+
         removedItem: function(array, item, _, instanceMeta) {
-          var guid = guidFor(item),
-              itemCounts = instanceMeta.itemCounts;
+          var guid = guidFor(item);
+          var itemCounts = instanceMeta.itemCounts;
 
           if (--itemCounts[guid] === 0) {
             array.removeObject(item);
           }
+
           return array;
         }
       });
+
       return arrayComputed.apply(null, args);
     }
 
@@ -26925,6 +28328,7 @@ define("ember-runtime/computed/reduce_computed_macros",
     */
     function intersect() {
       var args = a_slice.call(arguments);
+
       args.push({
         initialize: function (array, changeMeta, instanceMeta) {
           instanceMeta.itemCounts = {};
@@ -26936,16 +28340,22 @@ define("ember-runtime/computed/reduce_computed_macros",
           var numberOfDependentArrays = changeMeta.property._dependentKeys.length;
           var itemCounts = instanceMeta.itemCounts;
 
-          if (!itemCounts[itemGuid]) { itemCounts[itemGuid] = {}; }
-          if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
+          if (!itemCounts[itemGuid]) {
+            itemCounts[itemGuid] = {};
+          }
+
+          if (itemCounts[itemGuid][dependentGuid] === undefined) {
+            itemCounts[itemGuid][dependentGuid] = 0;
+          }
 
           if (++itemCounts[itemGuid][dependentGuid] === 1 &&
               numberOfDependentArrays === keys(itemCounts[itemGuid]).length) {
-
             array.addObject(item);
           }
+
           return array;
         },
+
         removedItem: function(array, item, changeMeta, instanceMeta) {
           var itemGuid = guidFor(item);
           var dependentGuid = guidFor(changeMeta.arrayChanged);
@@ -26964,11 +28374,14 @@ define("ember-runtime/computed/reduce_computed_macros",
             if (numberOfArraysItemAppearsIn === 0) {
               delete itemCounts[itemGuid];
             }
+
             array.removeObject(item);
           }
+
           return array;
         }
       });
+
       return arrayComputed.apply(null, args);
     }
 
@@ -27005,12 +28418,13 @@ define("ember-runtime/computed/reduce_computed_macros",
     */
     function setDiff(setAProperty, setBProperty) {
       if (arguments.length !== 2) {
-        throw new EmberError("setDiff requires exactly two dependent arrays.");
+        throw new EmberError('setDiff requires exactly two dependent arrays.');
       }
+
       return arrayComputed(setAProperty, setBProperty, {
         addedItem: function (array, item, changeMeta, instanceMeta) {
-          var setA = get(this, setAProperty),
-              setB = get(this, setBProperty);
+          var setA = get(this, setAProperty);
+          var setB = get(this, setBProperty);
 
           if (changeMeta.arrayChanged === setA) {
             if (!setB.contains(item)) {
@@ -27019,12 +28433,13 @@ define("ember-runtime/computed/reduce_computed_macros",
           } else {
             array.removeObject(item);
           }
+
           return array;
         },
 
         removedItem: function (array, item, changeMeta, instanceMeta) {
-          var setA = get(this, setAProperty),
-              setB = get(this, setBProperty);
+          var setA = get(this, setAProperty);
+          var setB = get(this, setBProperty);
 
           if (changeMeta.arrayChanged === setB) {
             if (setA.contains(item)) {
@@ -27033,6 +28448,7 @@ define("ember-runtime/computed/reduce_computed_macros",
           } else {
             array.removeObject(item);
           }
+
           return array;
         }
       });
@@ -27041,8 +28457,13 @@ define("ember-runtime/computed/reduce_computed_macros",
     __exports__.setDiff = setDiff;function binarySearch(array, item, low, high) {
       var mid, midItem, res, guidMid, guidItem;
 
-      if (arguments.length < 4) { high = get(array, 'length'); }
-      if (arguments.length < 3) { low = 0; }
+      if (arguments.length < 4) {
+        high = get(array, 'length');
+      }
+
+      if (arguments.length < 3) {
+        low = 0;
+      }
 
       if (low === high) {
         return low;
@@ -27051,14 +28472,15 @@ define("ember-runtime/computed/reduce_computed_macros",
       mid = low + Math.floor((high - low) / 2);
       midItem = array.objectAt(mid);
 
-      guidMid = _guidFor(midItem);
-      guidItem = _guidFor(item);
+      guidMid = guidFor(midItem);
+      guidItem = guidFor(item);
 
       if (guidMid === guidItem) {
         return mid;
       }
 
       res = this.order(midItem, item);
+
       if (res === 0) {
         res = guidMid < guidItem ? -1 : 1;
       }
@@ -27071,18 +28493,9 @@ define("ember-runtime/computed/reduce_computed_macros",
       }
 
       return mid;
-
-      function _guidFor(item) {
-        if (SearchProxy.detectInstance(item)) {
-          return guidFor(get(item, 'content'));
-        }
-        return guidFor(item);
-      }
     }
 
 
-    var SearchProxy = ObjectProxy.extend();
-
     /**
       A computed property which returns a new array with all the
       properties from the first dependent array sorted based on a property
@@ -27148,27 +28561,64 @@ define("ember-runtime/computed/reduce_computed_macros",
       on the sort property array or callback function
     */
     function sort(itemsKey, sortDefinition) {
-      Ember.assert("Ember.computed.sort requires two arguments: an array key to sort and either a sort properties key or sort function", arguments.length === 2);
-
-      var initFn, sortPropertiesKey;
+      Ember.assert('Ember.computed.sort requires two arguments: an array key to sort and ' +
+        'either a sort properties key or sort function', arguments.length === 2);
 
       if (typeof sortDefinition === 'function') {
-        initFn = function (array, changeMeta, instanceMeta) {
-          instanceMeta.order = sortDefinition;
-          instanceMeta.binarySearch = binarySearch;
-        };
+        return customSort(itemsKey, sortDefinition);
       } else {
-        sortPropertiesKey = sortDefinition;
-        initFn = function (array, changeMeta, instanceMeta) {
-          function setupSortProperties() {
-            var sortPropertyDefinitions = get(this, sortPropertiesKey),
-                sortProperty,
-                sortProperties = instanceMeta.sortProperties = [],
-                sortPropertyAscending = instanceMeta.sortPropertyAscending = {},
-                idx,
-                asc;
+        return propertySort(itemsKey, sortDefinition);
+      }
+    }
 
-            Ember.assert("Cannot sort: '" + sortPropertiesKey + "' is not an array.", isArray(sortPropertyDefinitions));
+    __exports__.sort = sort;function customSort(itemsKey, comparator) {
+      return arrayComputed(itemsKey, {
+        initialize: function (array, changeMeta, instanceMeta) {
+          instanceMeta.order = comparator;
+          instanceMeta.binarySearch = binarySearch;
+          instanceMeta.waitingInsertions = [];
+          instanceMeta.insertWaiting = function() {
+            var index, item;
+            var waiting = instanceMeta.waitingInsertions;
+            instanceMeta.waitingInsertions = [];
+            for (var i=0; i<waiting.length; i++) {
+              item = waiting[i];
+              index = instanceMeta.binarySearch(array, item);
+              array.insertAt(index, item);
+            }
+          };
+          instanceMeta.insertLater = function(item) {
+            this.waitingInsertions.push(item);
+          };
+        },
+
+        addedItem: function (array, item, changeMeta, instanceMeta) {
+          instanceMeta.insertLater(item);
+          return array;
+        },
+
+        removedItem: function (array, item, changeMeta, instanceMeta) {
+          array.removeObject(item);
+          return array;
+        },
+
+        flushedChanges: function(array, instanceMeta) {
+          instanceMeta.insertWaiting();
+        }
+      });
+    }
+
+    function propertySort(itemsKey, sortPropertiesKey) {
+      return arrayComputed(itemsKey, {
+        initialize: function (array, changeMeta, instanceMeta) {
+          function setupSortProperties() {
+            var sortPropertyDefinitions = get(this, sortPropertiesKey);
+            var sortProperties = instanceMeta.sortProperties = [];
+            var sortPropertyAscending = instanceMeta.sortPropertyAscending = {};
+            var sortProperty, idx, asc;
+
+            Ember.assert('Cannot sort: \'' + sortPropertiesKey + '\' is not an array.',
+                         isArray(sortPropertyDefinitions));
 
             changeMeta.property.clearItemPropertyKeys(itemsKey);
 
@@ -27199,17 +28649,17 @@ define("ember-runtime/computed/reduce_computed_macros",
           }
 
           addObserver(this, sortPropertiesKey, updateSortPropertiesOnce);
-
           setupSortProperties.call(this);
 
-
           instanceMeta.order = function (itemA, itemB) {
-            var isProxy = itemB instanceof SearchProxy,
-                sortProperty, result, asc;
+            var sortProperty, result, asc;
+            var keyA = this.keyFor(itemA);
+            var keyB = this.keyFor(itemB);
 
             for (var i = 0; i < this.sortProperties.length; ++i) {
               sortProperty = this.sortProperties[i];
-              result = compare(get(itemA, sortProperty), isProxy ? itemB[sortProperty] : get(itemB, sortProperty));
+
+              result = compare(keyA[sortProperty], keyB[sortProperty]);
 
               if (result !== 0) {
                 asc = this.sortPropertyAscending[sortProperty];
@@ -27221,11 +28671,8 @@ define("ember-runtime/computed/reduce_computed_macros",
           };
 
           instanceMeta.binarySearch = binarySearch;
-        };
-      }
-
-      return arrayComputed(itemsKey, {
-        initialize: initFn,
+          setupKeyCache(instanceMeta);
+        },
 
         addedItem: function (array, item, changeMeta, instanceMeta) {
           var index = instanceMeta.binarySearch(array, item);
@@ -27234,26 +28681,38 @@ define("ember-runtime/computed/reduce_computed_macros",
         },
 
         removedItem: function (array, item, changeMeta, instanceMeta) {
-          var proxyProperties, index, searchItem;
-
-          if (changeMeta.previousValues) {
-            proxyProperties = merge({ content: item }, changeMeta.previousValues);
-
-            searchItem = SearchProxy.create(proxyProperties);
-          } else {
-            searchItem = item;
-          }
-
-          index = instanceMeta.binarySearch(array, searchItem);
+          var index = instanceMeta.binarySearch(array, item);
           array.removeAt(index);
+          instanceMeta.dropKeyFor(item);
           return array;
         }
       });
     }
 
-    __exports__.sort = sort;
+    function setupKeyCache(instanceMeta) {
+      instanceMeta.keyFor = function(item) {
+        var guid = guidFor(item);
+        if (this.keyCache[guid]) {
+          return this.keyCache[guid];
+        }
+        var sortProperty;
+        var key = {};
+        for (var i = 0; i < this.sortProperties.length; ++i) {
+          sortProperty = this.sortProperties[i];
+          key[sortProperty] = get(item, sortProperty);
+        }
+        return this.keyCache[guid] = key;
+      };
+
+      instanceMeta.dropKeyFor = function(item) {
+        var guid = guidFor(item);
+        this.keyCache[guid] = null;
+      };
+
+      instanceMeta.keyCache = {};
+    }
   });
-define("ember-runtime/controllers/array_controller",
+enifed("ember-runtime/controllers/array_controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-runtime/system/array_proxy","ember-runtime/mixins/sortable","ember-runtime/mixins/controller","ember-metal/computed","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -27314,9 +28773,9 @@ define("ember-runtime/controllers/array_controller",
       For example:
 
       ```handlebars
-        {{#each post in controller}}
-          <li>{{post.title}} ({{post.titleLength}} characters)</li>
-        {{/each}}
+      {{#each post in controller}}
+        <li>{{post.title}} ({{post.titleLength}} characters)</li>
+      {{/each}}
       ```
 
       ```javascript
@@ -27326,7 +28785,6 @@ define("ember-runtime/controllers/array_controller",
 
       App.PostController = Ember.ObjectController.extend({
         // the `title` property will be proxied to the underlying post.
-
         titleLength: function() {
           return this.get('title').length;
         }.property('title')
@@ -27364,10 +28822,22 @@ define("ember-runtime/controllers/array_controller",
     __exports__["default"] = ArrayProxy.extend(ControllerMixin, SortableMixin, {
 
       /**
-        The controller used to wrap items, if any.
+        The controller used to wrap items, if any. If the value is a string, it will
+        be used to lookup the container for the controller. As an alternative, you
+        can also provide a controller class as the value.
+
+        For example:
+
+        ```javascript
+        App.MyArrayController = Ember.ArrayController.extend({
+          itemController: Ember.ObjectController.extend({
+            //Item Controller Implementation
+          })
+        });
+        ```
 
         @property itemController
-        @type String
+        @type String | Ember.Controller
         @default null
       */
       itemController: null,
@@ -27408,6 +28878,7 @@ define("ember-runtime/controllers/array_controller",
 
         if (idx >= 0 && idx < length) {
           controllerClass = this.lookupItemController(object);
+
           if (controllerClass) {
             return this.controllerAt(idx, object, controllerClass);
           }
@@ -27468,10 +28939,9 @@ define("ember-runtime/controllers/array_controller",
       _isVirtual: false,
 
       controllerAt: function(idx, object, controllerClass) {
-        var fullName, subController, parentController;
-
         var container = get(this, 'container');
         var subControllers = this._subControllers;
+        var fullName, subController, subControllerFactory, parentController, options;
 
         if (subControllers.length > idx) {
           subController = subControllers[idx];
@@ -27481,23 +28951,25 @@ define("ember-runtime/controllers/array_controller",
           }
         }
 
-        fullName = 'controller:' + controllerClass;
-
-        if (!container.has(fullName)) {
-          throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
-        }
-
         if (this._isVirtual) {
           parentController = get(this, 'parentController');
         } else {
           parentController = this;
         }
 
-        subController = container.lookupFactory(fullName).create({
-          target: parentController,
-          parentController: parentController,
-          model: object
-        });
+        
+          fullName = 'controller:' + controllerClass;
+
+          if (!container.has(fullName)) {
+            throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
+          }
+
+          subController = container.lookupFactory(fullName).create({
+            target: parentController,
+            parentController: parentController,
+            model: object
+          });
+        
 
         subControllers[idx] = subController;
 
@@ -27513,6 +28985,7 @@ define("ember-runtime/controllers/array_controller",
         if (subControllers.length) {
           for (var i = 0, length = subControllers.length; length > i; i++) {
             controller = subControllers[i];
+
             if (controller) {
               controller.destroy();
             }
@@ -27528,7 +29001,7 @@ define("ember-runtime/controllers/array_controller",
       }
     });
   });
-define("ember-runtime/controllers/controller",
+enifed("ember-runtime/controllers/controller",
   ["ember-runtime/system/object","ember-runtime/mixins/controller","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -27548,7 +29021,7 @@ define("ember-runtime/controllers/controller",
     */
     __exports__["default"] = EmberObject.extend(Mixin);
   });
-define("ember-runtime/controllers/object_controller",
+enifed("ember-runtime/controllers/object_controller",
   ["ember-runtime/mixins/controller","ember-runtime/system/object_proxy","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -27575,34 +29048,42 @@ define("ember-runtime/controllers/object_controller",
     **/
     __exports__["default"] = ObjectProxy.extend(ControllerMixin);
   });
-define("ember-runtime/copy",
-  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+enifed("ember-runtime/copy",
+  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var indexOf = __dependency1__.indexOf;
     var typeOf = __dependency2__.typeOf;
     var EmberObject = __dependency3__["default"];
     var Copyable = __dependency4__["default"];
-    var create = __dependency5__.create;
 
     function _copy(obj, deep, seen, copies) {
       var ret, loc, key;
 
       // primitive data types are immutable, just return them.
-      if ('object' !== typeof obj || obj===null) return obj;
+      if (typeof obj !== 'object' || obj === null) {
+        return obj;
+      }
 
       // avoid cyclical loops
-      if (deep && (loc=indexOf(seen, obj))>=0) return copies[loc];
+      if (deep && (loc = indexOf(seen, obj)) >= 0) {
+        return copies[loc];
+      }
 
-      Ember.assert('Cannot clone an Ember.Object that does not implement Ember.Copyable', !(obj instanceof EmberObject) || (Copyable && Copyable.detect(obj)));
+      Ember.assert('Cannot clone an Ember.Object that does not implement Ember.Copyable',
+        !(obj instanceof EmberObject) || (Copyable && Copyable.detect(obj)));
 
       // IMPORTANT: this specific test will detect a native array only. Any other
       // object will need to implement Copyable.
       if (typeOf(obj) === 'array') {
         ret = obj.slice();
+
         if (deep) {
           loc = ret.length;
-          while(--loc>=0) ret[loc] = _copy(ret[loc], deep, seen, copies);
+
+          while (--loc >= 0) {
+            ret[loc] = _copy(ret[loc], deep, seen, copies);
+          }
         }
       } else if (Copyable && Copyable.detect(obj)) {
         ret = obj.copy(deep, seen, copies);
@@ -27610,12 +29091,18 @@ define("ember-runtime/copy",
         ret = new Date(obj.getTime());
       } else {
         ret = {};
-        for(key in obj) {
-          if (!obj.hasOwnProperty(key)) continue;
+
+        for (key in obj) {
+          // support Null prototype
+          if (!Object.prototype.hasOwnProperty.call(obj, key)) {
+            continue;
+          }
 
           // Prevents browsers that don't respect non-enumerability from
           // copying internal Ember properties
-          if (key.substring(0,2) === '__') continue;
+          if (key.substring(0, 2) === '__') {
+            continue;
+          }
 
           ret[key] = deep ? _copy(obj[key], deep, seen, copies) : obj[key];
         }
@@ -27645,12 +29132,18 @@ define("ember-runtime/copy",
     */
     __exports__["default"] = function copy(obj, deep) {
       // fast paths
-      if ('object' !== typeof obj || obj === null) return obj; // can't copy primitives
-      if (Copyable && Copyable.detect(obj)) return obj.copy(deep);
+      if ('object' !== typeof obj || obj === null) {
+        return obj; // can't copy primitives
+      }
+
+      if (Copyable && Copyable.detect(obj)) {
+        return obj.copy(deep);
+      }
+
       return _copy(obj, deep, deep ? [] : null, deep ? [] : null);
     }
   });
-define("ember-runtime/core",
+enifed("ember-runtime/core",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -27678,17 +29171,21 @@ define("ember-runtime/core",
       @return {Boolean}
     */
     var isEqual = function isEqual(a, b) {
-      if (a && 'function'===typeof a.isEqual) return a.isEqual(b);
+      if (a && typeof a.isEqual === 'function') {
+        return a.isEqual(b);
+      }
+
       if (a instanceof Date && b instanceof Date) {
         return a.getTime() === b.getTime();
       }
+
       return a === b;
     };
     __exports__.isEqual = isEqual;
   });
-define("ember-runtime/ext/function",
-  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed"],
-  function(__dependency1__, __dependency2__, __dependency3__) {
+enifed("ember-runtime/ext/function",
+  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed","ember-metal/mixin"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     /**
     @module ember
@@ -27699,6 +29196,7 @@ define("ember-runtime/ext/function",
     // Ember.EXTEND_PROTOTYPES, Ember.assert
     var expandProperties = __dependency2__["default"];
     var computed = __dependency3__.computed;
+    var observer = __dependency4__.observer;
 
     var a_slice = Array.prototype.slice;
     var FunctionPrototype = Function.prototype;
@@ -27719,17 +29217,15 @@ define("ember-runtime/ext/function",
 
           fullName: function() {
             return this.get('firstName') + ' ' + this.get('lastName');
-
-            // Call this flag to mark the function as a property
-          }.property()
+          }.property() // Call this flag to mark the function as a property
         });
 
         var president = MyApp.President.create({
-          firstName: "Barack",
-          lastName: "Obama"
+          firstName: 'Barack',
+          lastName: 'Obama'
         });
 
-        president.get('fullName');    // "Barack Obama"
+        president.get('fullName'); // 'Barack Obama'
         ```
 
         Treating a function like a property is useful because they can work with
@@ -27765,7 +29261,7 @@ define("ember-runtime/ext/function",
         @method property
         @for Function
       */
-      FunctionPrototype.property = function() {
+      FunctionPrototype.property = function () {
         var ret = computed(this);
         // ComputedProperty.prototype.property expands properties; no need for us to
         // do so here.
@@ -27798,16 +29294,12 @@ define("ember-runtime/ext/function",
         @for Function
       */
       FunctionPrototype.observes = function() {
-        var addWatchedProperty = function (obs) { watched.push(obs); };
-        var watched = [];
-
-        for (var i=0; i<arguments.length; ++i) {
-          expandProperties(arguments[i], addWatchedProperty);
+        var length = arguments.length;
+        var args = new Array(length);
+        for (var x = 0; x < length; x++) {
+          args[x] = arguments[x];
         }
-
-        this.__ember_observes__ = watched;
-
-        return this;
+        return observer.apply(this, args.concat(this));
       };
 
       /**
@@ -27835,10 +29327,11 @@ define("ember-runtime/ext/function",
         @method observesImmediately
         @for Function
       */
-      FunctionPrototype.observesImmediately = function() {
-        for (var i=0, l=arguments.length; i<l; i++) {
+      FunctionPrototype.observesImmediately = function () {
+        for (var i = 0, l = arguments.length; i < l; i++) {
           var arg = arguments[i];
-          Ember.assert("Immediate observers must observe internal properties only, not properties on other objects.", arg.indexOf('.') === -1);
+          Ember.assert('Immediate observers must observe internal properties only, ' +
+            'not properties on other objects.', arg.indexOf('.') === -1);
         }
 
         // observes handles property expansion
@@ -27867,11 +29360,13 @@ define("ember-runtime/ext/function",
         @method observesBefore
         @for Function
       */
-      FunctionPrototype.observesBefore = function() {
-        var addWatchedProperty = function (obs) { watched.push(obs); };
+      FunctionPrototype.observesBefore = function () {
         var watched = [];
+        var addWatchedProperty = function (obs) {
+          watched.push(obs);
+        };
 
-        for (var i=0; i<arguments.length; ++i) {
+        for (var i = 0, l = arguments.length; i < l; ++i) {
           expandProperties(arguments[i], addWatchedProperty);
         }
 
@@ -27901,26 +29396,57 @@ define("ember-runtime/ext/function",
         @method on
         @for Function
       */
-      FunctionPrototype.on = function() {
+      FunctionPrototype.on = function () {
         var events = a_slice.call(arguments);
         this.__ember_listens__ = events;
+
         return this;
       };
     }
   });
-define("ember-runtime/ext/rsvp",
-  ["ember-metal/core","ember-metal/logger","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-runtime/ext/rsvp",
+  ["ember-metal/core","ember-metal/logger","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /* globals RSVP:true */
 
     var Ember = __dependency1__["default"];
     var Logger = __dependency2__["default"];
+    var run = __dependency3__["default"];
 
-    var RSVP = requireModule("rsvp");
-    var Test, testModuleName = 'ember-testing/test';
+    var RSVP = requireModule('rsvp');
+    var testModuleName = 'ember-testing/test';
+    var Test;
 
-    RSVP.onerrorDefault = function(error) {
+    var asyncStart = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncStart();
+      }
+    };
+
+    var asyncEnd = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncEnd();
+      }
+    };
+
+    RSVP.configure('async', function(callback, promise) {
+      var async = !run.currentRunLoop;
+
+      if (Ember.testing && async) { asyncStart(); }
+
+      run.backburner.schedule('actions', function(){
+        if (Ember.testing && async) { asyncEnd(); }
+        callback(promise);
+      });
+    });
+
+    RSVP.Promise.prototype.fail = function(callback, label){
+      Ember.deprecate('RSVP.Promise.fail has been renamed as RSVP.Promise.catch');
+      return this['catch'](callback, label);
+    };
+
+    RSVP.onerrorDefault = function (error) {
       if (error instanceof Error) {
         if (Ember.testing) {
           // ES6TODO: remove when possible
@@ -27946,7 +29472,7 @@ define("ember-runtime/ext/rsvp",
 
     __exports__["default"] = RSVP;
   });
-define("ember-runtime/ext/string",
+enifed("ember-runtime/ext/string",
   ["ember-metal/core","ember-runtime/system/string"],
   function(__dependency1__, __dependency2__) {
     "use strict";
@@ -27977,7 +29503,7 @@ define("ember-runtime/ext/string",
         @method fmt
         @for String
       */
-      StringPrototype.fmt = function() {
+      StringPrototype.fmt = function () {
         return fmt(this, arguments);
       };
 
@@ -27987,7 +29513,7 @@ define("ember-runtime/ext/string",
         @method w
         @for String
       */
-      StringPrototype.w = function() {
+      StringPrototype.w = function () {
         return w(this);
       };
 
@@ -27997,7 +29523,7 @@ define("ember-runtime/ext/string",
         @method loc
         @for String
       */
-      StringPrototype.loc = function() {
+      StringPrototype.loc = function () {
         return loc(this, arguments);
       };
 
@@ -28007,7 +29533,7 @@ define("ember-runtime/ext/string",
         @method camelize
         @for String
       */
-      StringPrototype.camelize = function() {
+      StringPrototype.camelize = function () {
         return camelize(this);
       };
 
@@ -28017,7 +29543,7 @@ define("ember-runtime/ext/string",
         @method decamelize
         @for String
       */
-      StringPrototype.decamelize = function() {
+      StringPrototype.decamelize = function () {
         return decamelize(this);
       };
 
@@ -28027,7 +29553,7 @@ define("ember-runtime/ext/string",
         @method dasherize
         @for String
       */
-      StringPrototype.dasherize = function() {
+      StringPrototype.dasherize = function () {
         return dasherize(this);
       };
 
@@ -28037,7 +29563,7 @@ define("ember-runtime/ext/string",
         @method underscore
         @for String
       */
-      StringPrototype.underscore = function() {
+      StringPrototype.underscore = function () {
         return underscore(this);
       };
 
@@ -28047,7 +29573,7 @@ define("ember-runtime/ext/string",
         @method classify
         @for String
       */
-      StringPrototype.classify = function() {
+      StringPrototype.classify = function () {
         return classify(this);
       };
 
@@ -28057,70 +29583,110 @@ define("ember-runtime/ext/string",
         @method capitalize
         @for String
       */
-      StringPrototype.capitalize = function() {
+      StringPrototype.capitalize = function () {
         return capitalize(this);
       };
     }
   });
-define("ember-runtime/keys",
-  ["ember-metal/enumerable_utils","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-runtime/mixins/-proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
-    var EnumerableUtils = __dependency1__["default"];
-    var create = __dependency2__.create;
-
     /**
-      Returns all of the keys defined on an object or hash. This is useful
-      when inspecting objects for debugging. On browsers that support it, this
-      uses the native `Object.keys` implementation.
-
-      @method keys
-      @for Ember
-      @param {Object} obj
-      @return {Array} Array containing keys of obj
+    @module ember
+    @submodule ember-runtime
     */
-    var keys = Object.keys;
-    if (!keys || create.isSimulated) {
-      var prototypeProperties = [
-        'constructor',
-        'hasOwnProperty',
-        'isPrototypeOf',
-        'propertyIsEnumerable',
-        'valueOf',
-        'toLocaleString',
-        'toString'
-      ],
-      pushPropertyName = function(obj, array, key) {
-        // Prevents browsers that don't respect non-enumerability from
-        // copying internal Ember properties
-        if (key.substring(0,2) === '__') return;
-        if (key === '_super') return;
-        if (EnumerableUtils.indexOf(array, key) >= 0) return;
-        if (!Object.prototype.hasOwnProperty.call(obj, key)) return;
 
-        array.push(key);
-      };
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var meta = __dependency4__.meta;
+    var addObserver = __dependency5__.addObserver;
+    var removeObserver = __dependency5__.removeObserver;
+    var addBeforeObserver = __dependency5__.addBeforeObserver;
+    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var computed = __dependency7__.computed;
+    var defineProperty = __dependency8__.defineProperty;
+    var Mixin = __dependency9__.Mixin;
+    var observer = __dependency9__.observer;
+    var fmt = __dependency10__.fmt;
+    var EmberObject = __dependency11__["default"];
 
-      keys = function keys(obj) {
-        var ret = [], key;
-        for (key in obj) {
-          pushPropertyName(obj, ret, key);
-        }
-
-        // IE8 doesn't enumerate property that named the same as prototype properties.
-        for (var i = 0, l = prototypeProperties.length; i < l; i++) {
-          key = prototypeProperties[i];
-
-          pushPropertyName(obj, ret, key);
-        }
-
-        return ret;
-      };
+    function contentPropertyWillChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; }  // if shadowed in proxy
+      propertyWillChange(this, key);
     }
 
-    __exports__["default"] = keys;
+    function contentPropertyDidChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; } // if shadowed in proxy
+      propertyDidChange(this, key);
+    }
+
+    /**
+      `Ember.ProxyMixin` forwards all properties not defined by the proxy itself
+      to a proxied `content` object.  See Ember.ObjectProxy for more details.
+
+      @class ProxyMixin
+      @namespace Ember
+    */
+    __exports__["default"] = Mixin.create({
+      /**
+        The object whose properties will be forwarded.
+
+        @property content
+        @type Ember.Object
+        @default null
+      */
+      content: null,
+      _contentDidChange: observer('content', function() {
+        Ember.assert("Can't set Proxy's content to itself", get(this, 'content') !== this);
+      }),
+
+      isTruthy: computed.bool('content'),
+
+      _debugContainerKey: null,
+
+      willWatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        addObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      didUnwatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        removeObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      unknownProperty: function (key) {
+        var content = get(this, 'content');
+        if (content) {
+          return get(content, key);
+        }
+      },
+
+      setUnknownProperty: function (key, value) {
+        var m = meta(this);
+        if (m.proto === this) {
+          // if marked as prototype then just defineProperty
+          // rather than delegate
+          defineProperty(this, key, null, value);
+          return value;
+        }
+
+        var content = get(this, 'content');
+        Ember.assert(fmt("Cannot delegate set('%@', %@) to the 'content' property of object proxy %@: its 'content' is undefined.", [key, value, this]), content);
+        return set(content, key, value);
+      }
+
+    });
   });
-define("ember-runtime/mixins/action_handler",
+enifed("ember-runtime/mixins/action_handler",
   ["ember-metal/merge","ember-metal/mixin","ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -28330,7 +29896,8 @@ define("ember-runtime/mixins/action_handler",
         @param {*} context a context to send with the action
       */
       send: function(actionName) {
-        var args = [].slice.call(arguments, 1), target;
+        var args = [].slice.call(arguments, 1);
+        var target;
 
         if (this._actions && this._actions[actionName]) {
           if (this._actions[actionName].apply(this, args) === true) {
@@ -28338,13 +29905,6 @@ define("ember-runtime/mixins/action_handler",
           } else {
             return;
           }
-        } else if (!Ember.FEATURES.isEnabled('ember-routing-drop-deprecated-action-style') && this.deprecatedSend && this.deprecatedSendHandles && this.deprecatedSendHandles(actionName)) {
-          Ember.warn("The current default is deprecated but will prefer to handle actions directly on the controller instead of a similarly named action in the actions hash. To turn off this deprecated feature set: Ember.FEATURES['ember-routing-drop-deprecated-action-style'] = true");
-          if (this.deprecatedSend.apply(this, [].slice.call(arguments)) === true) {
-            // handler return true, so this action will bubble
-          } else {
-            return;
-          }
         }
 
         if (target = get(this, 'target')) {
@@ -28356,9 +29916,9 @@ define("ember-runtime/mixins/action_handler",
 
     __exports__["default"] = ActionHandler;
   });
-define("ember-runtime/mixins/array",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+enifed("ember-runtime/mixins/array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -28370,24 +29930,41 @@ define("ember-runtime/mixins/array",
     //
     var Ember = __dependency1__["default"];
     // ES6TODO: Ember.A
-
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var computed = __dependency4__.computed;
-    var cacheFor = __dependency4__.cacheFor;
-    var isNone = __dependency5__.isNone;
-    var none = __dependency5__.none;
-    var Enumerable = __dependency6__["default"];
-    var map = __dependency7__.map;
-    var Mixin = __dependency8__.Mixin;
-    var required = __dependency8__.required;
-    var propertyWillChange = __dependency9__.propertyWillChange;
-    var propertyDidChange = __dependency9__.propertyDidChange;
-    var addListener = __dependency10__.addListener;
-    var removeListener = __dependency10__.removeListener;
-    var sendEvent = __dependency10__.sendEvent;
-    var hasListeners = __dependency10__.hasListeners;
-    var isWatching = __dependency11__.isWatching;
+    var computed = __dependency3__.computed;
+    var cacheFor = __dependency3__.cacheFor;
+    var isNone = __dependency4__.isNone;
+    var none = __dependency4__.none;
+    var Enumerable = __dependency5__["default"];
+    var map = __dependency6__.map;
+    var Mixin = __dependency7__.Mixin;
+    var required = __dependency7__.required;
+    var propertyWillChange = __dependency8__.propertyWillChange;
+    var propertyDidChange = __dependency8__.propertyDidChange;
+    var addListener = __dependency9__.addListener;
+    var removeListener = __dependency9__.removeListener;
+    var sendEvent = __dependency9__.sendEvent;
+    var hasListeners = __dependency9__.hasListeners;
+    var isWatching = __dependency10__.isWatching;
+
+    function arrayObserversHelper(obj, target, opts, operation, notify) {
+      var willChange = (opts && opts.willChange) || 'arrayWillChange';
+      var didChange  = (opts && opts.didChange) || 'arrayDidChange';
+      var hasObservers = get(obj, 'hasArrayObservers');
+
+      if (hasObservers === notify) {
+        propertyWillChange(obj, 'hasArrayObservers');
+      }
+
+      operation(obj, '@array:before', target, willChange);
+      operation(obj, '@array:change', target, didChange);
+
+      if (hasObservers === notify) {
+        propertyDidChange(obj, 'hasArrayObservers');
+      }
+
+      return obj;
+    }
 
     // ..........................................................
     // ARRAY
@@ -28449,8 +30026,9 @@ define("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['a', 'b', 'c', 'd'];
-        arr.objectAt(0);   // "a"
-        arr.objectAt(3);   // "d"
+
+        arr.objectAt(0);   // 'a'
+        arr.objectAt(3);   // 'd'
         arr.objectAt(-1);  // undefined
         arr.objectAt(4);   // undefined
         arr.objectAt(5);   // undefined
@@ -28461,7 +30039,10 @@ define("ember-runtime/mixins/array",
         @return {*} item at index or undefined
       */
       objectAt: function(idx) {
-        if ((idx < 0) || (idx >= get(this, 'length'))) return undefined;
+        if (idx < 0 || idx >= get(this, 'length')) {
+          return undefined;
+        }
+
         return get(this, idx);
       },
 
@@ -28470,8 +30051,9 @@ define("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['a', 'b', 'c', 'd'];
-        arr.objectsAt([0, 1, 2]);  // ["a", "b", "c"]
-        arr.objectsAt([2, 3, 4]);  // ["c", "d", undefined]
+
+        arr.objectsAt([0, 1, 2]);  // ['a', 'b', 'c']
+        arr.objectsAt([2, 3, 4]);  // ['c', 'd', undefined]
         ```
 
         @method objectsAt
@@ -28480,7 +30062,10 @@ define("ember-runtime/mixins/array",
        */
       objectsAt: function(indexes) {
         var self = this;
-        return map(indexes, function(idx) { return self.objectAt(idx); });
+
+        return map(indexes, function(idx) {
+          return self.objectAt(idx);
+        });
       },
 
       // overrides Ember.Enumerable version
@@ -28499,8 +30084,11 @@ define("ember-runtime/mixins/array",
         @return this
       */
       '[]': computed(function(key, value) {
-        if (value !== undefined) this.replace(0, get(this, 'length'), value) ;
-        return this ;
+        if (value !== undefined) {
+          this.replace(0, get(this, 'length'), value);
+        }
+
+        return this;
       }),
 
       firstObject: computed(function() {
@@ -28508,7 +30096,7 @@ define("ember-runtime/mixins/array",
       }),
 
       lastObject: computed(function() {
-        return this.objectAt(get(this, 'length')-1);
+        return this.objectAt(get(this, 'length') - 1);
       }),
 
       // optimized version from Enumerable
@@ -28524,6 +30112,7 @@ define("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['red', 'green', 'blue'];
+
         arr.slice(0);       // ['red', 'green', 'blue']
         arr.slice(0, 2);    // ['red', 'green']
         arr.slice(1, 100);  // ['green', 'blue']
@@ -28536,17 +30125,29 @@ define("ember-runtime/mixins/array",
       */
       slice: function(beginIndex, endIndex) {
         var ret = Ember.A();
-        var length = get(this, 'length') ;
-        if (isNone(beginIndex)) beginIndex = 0 ;
-        if (isNone(endIndex) || (endIndex > length)) endIndex = length ;
+        var length = get(this, 'length');
 
-        if (beginIndex < 0) beginIndex = length + beginIndex;
-        if (endIndex < 0) endIndex = length + endIndex;
-
-        while(beginIndex < endIndex) {
-          ret[ret.length] = this.objectAt(beginIndex++) ;
+        if (isNone(beginIndex)) {
+          beginIndex = 0;
         }
-        return ret ;
+
+        if (isNone(endIndex) || (endIndex > length)) {
+          endIndex = length;
+        }
+
+        if (beginIndex < 0) {
+          beginIndex = length + beginIndex;
+        }
+
+        if (endIndex < 0) {
+          endIndex = length + endIndex;
+        }
+
+        while (beginIndex < endIndex) {
+          ret[ret.length] = this.objectAt(beginIndex++);
+        }
+
+        return ret;
       },
 
       /**
@@ -28556,13 +30157,14 @@ define("ember-runtime/mixins/array",
         the end of the array. Returns -1 if no match is found.
 
         ```javascript
-        var arr = ["a", "b", "c", "d", "a"];
-        arr.indexOf("a");       //  0
-        arr.indexOf("z");       // -1
-        arr.indexOf("a", 2);    //  4
-        arr.indexOf("a", -1);   //  4
-        arr.indexOf("b", 3);    // -1
-        arr.indexOf("a", 100);  // -1
+        var arr = ['a', 'b', 'c', 'd', 'a'];
+
+        arr.indexOf('a');       //  0
+        arr.indexOf('z');       // -1
+        arr.indexOf('a', 2);    //  4
+        arr.indexOf('a', -1);   //  4
+        arr.indexOf('b', 3);    // -1
+        arr.indexOf('a', 100);  // -1
         ```
 
         @method indexOf
@@ -28571,14 +30173,23 @@ define("ember-runtime/mixins/array",
         @return {Number} index or -1 if not found
       */
       indexOf: function(object, startAt) {
-        var idx, len = get(this, 'length');
+        var len = get(this, 'length');
+        var idx;
 
-        if (startAt === undefined) startAt = 0;
-        if (startAt < 0) startAt += len;
-
-        for(idx = startAt; idx < len; idx++) {
-          if (this.objectAt(idx) === object) return idx;
+        if (startAt === undefined) {
+          startAt = 0;
         }
+
+        if (startAt < 0) {
+          startAt += len;
+        }
+
+        for (idx = startAt; idx < len; idx++) {
+          if (this.objectAt(idx) === object) {
+            return idx;
+          }
+        }
+
         return -1;
       },
 
@@ -28589,13 +30200,14 @@ define("ember-runtime/mixins/array",
         from the end of the array. Returns -1 if no match is found.
 
         ```javascript
-        var arr = ["a", "b", "c", "d", "a"];
-        arr.lastIndexOf("a");       //  4
-        arr.lastIndexOf("z");       // -1
-        arr.lastIndexOf("a", 2);    //  0
-        arr.lastIndexOf("a", -1);   //  4
-        arr.lastIndexOf("b", 3);    //  1
-        arr.lastIndexOf("a", 100);  //  4
+        var arr = ['a', 'b', 'c', 'd', 'a'];
+
+        arr.lastIndexOf('a');       //  4
+        arr.lastIndexOf('z');       // -1
+        arr.lastIndexOf('a', 2);    //  0
+        arr.lastIndexOf('a', -1);   //  4
+        arr.lastIndexOf('b', 3);    //  1
+        arr.lastIndexOf('a', 100);  //  4
         ```
 
         @method lastIndexOf
@@ -28604,14 +30216,23 @@ define("ember-runtime/mixins/array",
         @return {Number} index or -1 if not found
       */
       lastIndexOf: function(object, startAt) {
-        var idx, len = get(this, 'length');
+        var len = get(this, 'length');
+        var idx;
 
-        if (startAt === undefined || startAt >= len) startAt = len-1;
-        if (startAt < 0) startAt += len;
-
-        for(idx = startAt; idx >= 0; idx--) {
-          if (this.objectAt(idx) === object) return idx;
+        if (startAt === undefined || startAt >= len) {
+          startAt = len-1;
         }
+
+        if (startAt < 0) {
+          startAt += len;
+        }
+
+        for (idx = startAt; idx >= 0; idx--) {
+          if (this.objectAt(idx) === object) {
+            return idx;
+          }
+        }
+
         return -1;
       },
 
@@ -28643,16 +30264,9 @@ define("ember-runtime/mixins/array",
           `willChange` and `didChange` option.
         @return {Ember.Array} receiver
       */
-      addArrayObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'arrayWillChange',
-            didChange  = (opts && opts.didChange) || 'arrayDidChange';
 
-        var hasObservers = get(this, 'hasArrayObservers');
-        if (!hasObservers) propertyWillChange(this, 'hasArrayObservers');
-        addListener(this, '@array:before', target, willChange);
-        addListener(this, '@array:change', target, didChange);
-        if (!hasObservers) propertyDidChange(this, 'hasArrayObservers');
-        return this;
+      addArrayObserver: function(target, opts) {
+        return arrayObserversHelper(this, target, opts, addListener, false);
       },
 
       /**
@@ -28667,15 +30281,7 @@ define("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       removeArrayObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'arrayWillChange',
-            didChange  = (opts && opts.didChange) || 'arrayDidChange';
-
-        var hasObservers = get(this, 'hasArrayObservers');
-        if (hasObservers) propertyWillChange(this, 'hasArrayObservers');
-        removeListener(this, '@array:before', target, willChange);
-        removeListener(this, '@array:change', target, didChange);
-        if (hasObservers) propertyDidChange(this, 'hasArrayObservers');
-        return this;
+        return arrayObserversHelper(this, target, opts, removeListener, true);
       },
 
       /**
@@ -28703,26 +30309,36 @@ define("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       arrayContentWillChange: function(startIdx, removeAmt, addAmt) {
+        var removing, lim;
 
         // if no args are passed assume everything changes
-        if (startIdx===undefined) {
+        if (startIdx === undefined) {
           startIdx = 0;
           removeAmt = addAmt = -1;
         } else {
-          if (removeAmt === undefined) removeAmt=-1;
-          if (addAmt    === undefined) addAmt=-1;
+          if (removeAmt === undefined) {
+            removeAmt = -1;
+          }
+
+          if (addAmt === undefined) {
+            addAmt = -1;
+          }
         }
 
         // Make sure the @each proxy is set up if anyone is observing @each
-        if (isWatching(this, '@each')) { get(this, '@each'); }
+        if (isWatching(this, '@each')) {
+          get(this, '@each');
+        }
 
         sendEvent(this, '@array:before', [this, startIdx, removeAmt, addAmt]);
 
-        var removing, lim;
-        if (startIdx>=0 && removeAmt>=0 && get(this, 'hasEnumerableObservers')) {
+        if (startIdx >= 0 && removeAmt >= 0 && get(this, 'hasEnumerableObservers')) {
           removing = [];
-          lim = startIdx+removeAmt;
-          for(var idx=startIdx;idx<lim;idx++) removing.push(this.objectAt(idx));
+          lim = startIdx + removeAmt;
+
+          for (var idx = startIdx; idx < lim; idx++) {
+            removing.push(this.objectAt(idx));
+          }
         } else {
           removing = removeAmt;
         }
@@ -28747,21 +30363,29 @@ define("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       arrayContentDidChange: function(startIdx, removeAmt, addAmt) {
+        var adding, lim;
 
         // if no args are passed assume everything changes
-        if (startIdx===undefined) {
+        if (startIdx === undefined) {
           startIdx = 0;
           removeAmt = addAmt = -1;
         } else {
-          if (removeAmt === undefined) removeAmt=-1;
-          if (addAmt    === undefined) addAmt=-1;
+          if (removeAmt === undefined) {
+            removeAmt = -1;
+          }
+
+          if (addAmt === undefined) {
+            addAmt = -1;
+          }
         }
 
-        var adding, lim;
-        if (startIdx>=0 && addAmt>=0 && get(this, 'hasEnumerableObservers')) {
+        if (startIdx >= 0 && addAmt >= 0 && get(this, 'hasEnumerableObservers')) {
           adding = [];
-          lim = startIdx+addAmt;
-          for(var idx=startIdx;idx<lim;idx++) adding.push(this.objectAt(idx));
+          lim = startIdx + addAmt;
+
+          for (var idx = startIdx; idx < lim; idx++) {
+            adding.push(this.objectAt(idx));
+          }
         } else {
           adding = addAmt;
         }
@@ -28769,13 +30393,15 @@ define("ember-runtime/mixins/array",
         this.enumerableContentDidChange(removeAmt, adding);
         sendEvent(this, '@array:change', [this, startIdx, removeAmt, addAmt]);
 
-        var length      = get(this, 'length'),
-            cachedFirst = cacheFor(this, 'firstObject'),
-            cachedLast  = cacheFor(this, 'lastObject');
+        var length = get(this, 'length');
+        var cachedFirst = cacheFor(this, 'firstObject');
+        var cachedLast = cacheFor(this, 'lastObject');
+
         if (this.objectAt(0) !== cachedFirst) {
           propertyWillChange(this, 'firstObject');
           propertyDidChange(this, 'firstObject');
         }
+
         if (this.objectAt(length-1) !== cachedLast) {
           propertyWillChange(this, 'lastObject');
           propertyDidChange(this, 'lastObject');
@@ -28811,7 +30437,7 @@ define("ember-runtime/mixins/array",
       })
     });
   });
-define("ember-runtime/mixins/comparable",
+enifed("ember-runtime/mixins/comparable",
   ["ember-metal/mixin","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -28853,7 +30479,7 @@ define("ember-runtime/mixins/comparable",
       compare: required(Function)
     });
   });
-define("ember-runtime/mixins/controller",
+enifed("ember-runtime/mixins/controller",
   ["ember-metal/core","ember-metal/property_get","ember-runtime/system/object","ember-metal/mixin","ember-metal/computed","ember-runtime/mixins/action_handler","ember-runtime/mixins/controller_content_model_alias_deprecation","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -28917,22 +30543,11 @@ define("ember-runtime/mixins/controller",
       /**
         @private
        */
-      content: computed.alias('model'),
+      content: computed.alias('model')
 
-      deprecatedSendHandles: function(actionName) {
-        return !!this[actionName];
-      },
-
-      deprecatedSend: function(actionName) {
-        var args = [].slice.call(arguments, 1);
-        Ember.assert('' + this + " has the action " + actionName + " but it is not a function", typeof this[actionName] === 'function');
-        Ember.deprecate('Action handlers implemented directly on controllers are deprecated in favor of action handlers on an `actions` object ( action: `' + actionName + '` on ' + this + ')', false);
-        this[actionName].apply(this, args);
-        return;
-      }
     });
   });
-define("ember-runtime/mixins/controller_content_model_alias_deprecation",
+enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
   ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -28991,7 +30606,7 @@ define("ember-runtime/mixins/controller_content_model_alias_deprecation",
       }
     });
   });
-define("ember-runtime/mixins/copyable",
+enifed("ember-runtime/mixins/copyable",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/freezable","ember-runtime/system/string","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -29059,45 +30674,16 @@ define("ember-runtime/mixins/copyable",
       }
     });
   });
-define("ember-runtime/mixins/deferred",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-metal/run_loop","ember-runtime/ext/rsvp","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+enifed("ember-runtime/mixins/deferred",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-runtime/ext/rsvp","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.Test
     var get = __dependency2__.get;
     var Mixin = __dependency3__.Mixin;
     var computed = __dependency4__.computed;
-    var run = __dependency5__["default"];
-    var RSVP = __dependency6__["default"];
-
-    var asyncStart = function() {
-      if (Ember.Test && Ember.Test.adapter) {
-        Ember.Test.adapter.asyncStart();
-      }
-    };
-
-    var asyncEnd = function() {
-      if (Ember.Test && Ember.Test.adapter) {
-        Ember.Test.adapter.asyncEnd();
-      }
-    };
-
-    RSVP.configure('async', function(callback, promise) {
-      var async = !run.currentRunLoop;
-
-      if (Ember.testing && async) { asyncStart(); }
-
-      run.backburner.schedule('actions', function(){
-        if (Ember.testing && async) { asyncEnd(); }
-        callback(promise);
-      });
-    });
-
-    RSVP.Promise.prototype.fail = function(callback, label){
-      Ember.deprecate('RSVP.Promise.fail has been renamed as RSVP.Promise.catch');
-      return this['catch'](callback, label);
-    };
+    var RSVP = __dependency5__["default"];
 
     /**
     @module ember
@@ -29169,7 +30755,7 @@ define("ember-runtime/mixins/deferred",
       })
     });
   });
-define("ember-runtime/mixins/enumerable",
+enifed("ember-runtime/mixins/enumerable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/property_events","ember-metal/events","ember-runtime/compare","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
@@ -29520,7 +31106,7 @@ define("ember-runtime/mixins/enumerable",
         - `index` is the current index in the iteration.
         - `enumerable` is the enumerable object itself.
 
-        It should return the `true` to include the item in the results, `false`
+        It should return `true` to include the item in the results, `false`
         otherwise.
 
         Note that in addition to a callback, you can also pass an optional target
@@ -29610,9 +31196,9 @@ define("ember-runtime/mixins/enumerable",
         @return {Array} rejected array
       */
       rejectBy: function(key, value) {
-        var exactValue = function(item) { return get(item, key) === value; },
-            hasValue = function(item) { return !!get(item, key); },
-            use = (arguments.length === 2 ? exactValue : hasValue);
+        var exactValue = function(item) { return get(item, key) === value; };
+        var hasValue = function(item) { return !!get(item, key); };
+        var use = (arguments.length === 2 ? exactValue : hasValue);
 
         return this.reject(use);
       },
@@ -29809,11 +31395,11 @@ define("ember-runtime/mixins/enumerable",
         @return {Boolean} `true` if the passed function returns `true` for any item
       */
       any: function(callback, target) {
-        var len     = get(this, 'length'),
-            context = popCtx(),
-            found   = false,
-            last    = null,
-            next, idx;
+        var len     = get(this, 'length');
+        var context = popCtx();
+        var found   = false;
+        var last    = null;
+        var next, idx;
 
         if (target === undefined) { target = null; }
 
@@ -30066,10 +31652,10 @@ define("ember-runtime/mixins/enumerable",
         @return this
       */
       addEnumerableObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
-            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
-
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange';
+        var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
         var hasObservers = get(this, 'hasEnumerableObservers');
+
         if (!hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
         addListener(this, '@enumerable:before', target, willChange);
         addListener(this, '@enumerable:change', target, didChange);
@@ -30086,8 +31672,8 @@ define("ember-runtime/mixins/enumerable",
         @return this
       */
       removeEnumerableObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
-            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange';
+        var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
 
         var hasObservers = get(this, 'hasEnumerableObservers');
         if (hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
@@ -30197,9 +31783,9 @@ define("ember-runtime/mixins/enumerable",
         var sortKeys = arguments;
         return this.toArray().sort(function(a, b){
           for(var i = 0; i < sortKeys.length; i++) {
-            var key = sortKeys[i],
-            propA = get(a, key),
-            propB = get(b, key);
+            var key = sortKeys[i];
+            var propA = get(a, key);
+            var propB = get(b, key);
             // return 1 or -1 else continue to the next sortKey
             var compareValue = compare(propA, propB);
             if (compareValue) { return compareValue; }
@@ -30209,7 +31795,7 @@ define("ember-runtime/mixins/enumerable",
       }
     });
   });
-define("ember-runtime/mixins/evented",
+enifed("ember-runtime/mixins/evented",
   ["ember-metal/mixin","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -30366,7 +31952,7 @@ define("ember-runtime/mixins/evented",
       }
     });
   });
-define("ember-runtime/mixins/freezable",
+enifed("ember-runtime/mixins/freezable",
   ["ember-metal/mixin","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -30464,7 +32050,7 @@ define("ember-runtime/mixins/freezable",
     var FROZEN_ERROR = "Frozen object cannot be modified.";
     __exports__.FROZEN_ERROR = FROZEN_ERROR;
   });
-define("ember-runtime/mixins/mutable_array",
+enifed("ember-runtime/mixins/mutable_array",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -30748,7 +32334,7 @@ define("ember-runtime/mixins/mutable_array",
       },
 
       /**
-        Replace all the the receiver's content with content of the argument.
+        Replace all the receiver's content with content of the argument.
         If argument is an empty array receiver will be cleared.
 
         ```javascript
@@ -30818,7 +32404,7 @@ define("ember-runtime/mixins/mutable_array",
 
     });
   });
-define("ember-runtime/mixins/mutable_enumerable",
+enifed("ember-runtime/mixins/mutable_enumerable",
   ["ember-metal/enumerable_utils","ember-runtime/mixins/enumerable","ember-metal/mixin","ember-metal/property_events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -30939,7 +32525,7 @@ define("ember-runtime/mixins/mutable_enumerable",
       }
     });
   });
-define("ember-runtime/mixins/observable",
+enifed("ember-runtime/mixins/observable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/get_properties","ember-metal/set_properties","ember-metal/mixin","ember-metal/events","ember-metal/property_events","ember-metal/observer","ember-metal/computed","ember-metal/is_none","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -31081,7 +32667,7 @@ define("ember-runtime/mixins/observable",
       },
 
       /**
-        To get multiple properties at once, call `getProperties`
+        To get the values of multiple properties at once, call `getProperties`
         with a list of strings or an array:
 
         ```javascript
@@ -31449,12 +33035,12 @@ define("ember-runtime/mixins/observable",
       }
     });
   });
-define("ember-runtime/mixins/promise_proxy",
-  ["ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
+enifed("ember-runtime/mixins/promise_proxy",
+  ["ember-metal/property_get","ember-metal/set_properties","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var get = __dependency1__.get;
-    var set = __dependency2__.set;
+    var setProperties = __dependency2__["default"];
     var computed = __dependency3__.computed;
     var Mixin = __dependency4__.Mixin;
     var EmberError = __dependency5__["default"];
@@ -31468,16 +33054,22 @@ define("ember-runtime/mixins/promise_proxy",
      */
 
     function tap(proxy, promise) {
-      set(proxy, 'isFulfilled', false);
-      set(proxy, 'isRejected', false);
+      setProperties(proxy, {
+        isFulfilled: false,
+        isRejected: false
+      });
 
       return promise.then(function(value) {
-        set(proxy, 'isFulfilled', true);
-        set(proxy, 'content', value);
+        setProperties(proxy, {
+          content: value,
+          isFulfilled: true
+        });
         return value;
       }, function(reason) {
-        set(proxy, 'isRejected', true);
-        set(proxy, 'reason', reason);
+        setProperties(proxy, {
+          reason: reason,
+          isRejected: true
+        });
         throw reason;
       }, "Ember: PromiseProxy");
     }
@@ -31657,7 +33249,7 @@ define("ember-runtime/mixins/promise_proxy",
       };
     }
   });
-define("ember-runtime/mixins/sortable",
+enifed("ember-runtime/mixins/sortable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/mutable_enumerable","ember-runtime/compare","ember-metal/observer","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -31779,10 +33371,10 @@ define("ember-runtime/mixins/sortable",
       sortFunction: compare,
 
       orderBy: function(item1, item2) {
-        var result = 0,
-            sortProperties = get(this, 'sortProperties'),
-            sortAscending = get(this, 'sortAscending'),
-            sortFunction = get(this, 'sortFunction');
+        var result = 0;
+        var sortProperties = get(this, 'sortProperties');
+        var sortAscending = get(this, 'sortAscending');
+        var sortFunction = get(this, 'sortFunction');
 
         Ember.assert("you need to define `sortProperties`", !!sortProperties);
 
@@ -31799,8 +33391,8 @@ define("ember-runtime/mixins/sortable",
       },
 
       destroy: function() {
-        var content = get(this, 'content'),
-            sortProperties = get(this, 'sortProperties');
+        var content = get(this, 'content');
+        var sortProperties = get(this, 'sortProperties');
 
         if (content && sortProperties) {
           forEach(content, function(item) {
@@ -31823,10 +33415,10 @@ define("ember-runtime/mixins/sortable",
       */
 
       arrangedContent: computed('content', 'sortProperties.@each', function(key, value) {
-        var content = get(this, 'content'),
-            isSorted = get(this, 'isSorted'),
-            sortProperties = get(this, 'sortProperties'),
-            self = this;
+        var content = get(this, 'content');
+        var isSorted = get(this, 'isSorted');
+        var sortProperties = get(this, 'sortProperties');
+        var self = this;
 
         if (content && isSorted) {
           content = content.slice();
@@ -31845,8 +33437,8 @@ define("ember-runtime/mixins/sortable",
       }),
 
       _contentWillChange: beforeObserver('content', function() {
-        var content = get(this, 'content'),
-            sortProperties = get(this, 'sortProperties');
+        var content = get(this, 'content');
+        var sortProperties = get(this, 'sortProperties');
 
         if (content && sortProperties) {
           forEach(content, function(item) {
@@ -31899,8 +33491,8 @@ define("ember-runtime/mixins/sortable",
       },
 
       contentArrayDidChange: function(array, idx, removedCount, addedCount) {
-        var isSorted = get(this, 'isSorted'),
-            sortProperties = get(this, 'sortProperties');
+        var isSorted = get(this, 'isSorted');
+        var sortProperties = get(this, 'sortProperties');
 
         if (isSorted) {
           var addedObjects = array.slice(idx, idx+addedCount);
@@ -31926,12 +33518,12 @@ define("ember-runtime/mixins/sortable",
       },
 
       contentItemSortPropertyDidChange: function(item) {
-        var arrangedContent = get(this, 'arrangedContent'),
-            oldIndex = arrangedContent.indexOf(item),
-            leftItem = arrangedContent.objectAt(oldIndex - 1),
-            rightItem = arrangedContent.objectAt(oldIndex + 1),
-            leftResult = leftItem && this.orderBy(item, leftItem),
-            rightResult = rightItem && this.orderBy(item, rightItem);
+        var arrangedContent = get(this, 'arrangedContent');
+        var oldIndex = arrangedContent.indexOf(item);
+        var leftItem = arrangedContent.objectAt(oldIndex - 1);
+        var rightItem = arrangedContent.objectAt(oldIndex + 1);
+        var leftResult = leftItem && this.orderBy(item, leftItem);
+        var rightResult = rightItem && this.orderBy(item, rightItem);
 
         if (leftResult < 0 || rightResult > 0) {
           arrangedContent.removeObject(item);
@@ -31963,7 +33555,7 @@ define("ember-runtime/mixins/sortable",
       }
     });
   });
-define("ember-runtime/mixins/target_action_support",
+enifed("ember-runtime/mixins/target_action_support",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -32077,9 +33669,9 @@ define("ember-runtime/mixins/target_action_support",
       */
       triggerAction: function(opts) {
         opts = opts || {};
-        var action = opts.action || get(this, 'action'),
-            target = opts.target || get(this, 'targetObject'),
-            actionContext = opts.actionContext;
+        var action = opts.action || get(this, 'action');
+        var target = opts.target || get(this, 'targetObject');
+        var actionContext = opts.actionContext;
 
         function args(options, actionName) {
           var ret = [];
@@ -32113,7 +33705,7 @@ define("ember-runtime/mixins/target_action_support",
 
     __exports__["default"] = TargetActionSupport;
   });
-define("ember-runtime/system/application",
+enifed("ember-runtime/system/application",
   ["ember-runtime/system/namespace","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -32121,7 +33713,7 @@ define("ember-runtime/system/application",
 
     __exports__["default"] = Namespace.extend();
   });
-define("ember-runtime/system/array_proxy",
+enifed("ember-runtime/system/array_proxy",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/property_events","ember-metal/error","ember-runtime/system/object","ember-runtime/mixins/mutable_array","ember-runtime/mixins/enumerable","ember-runtime/system/string","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -32265,7 +33857,28 @@ define("ember-runtime/system/array_proxy",
         }
       },
 
+      /**
+        Override to implement content array `willChange` observer.
+
+        @method contentArrayWillChange
+
+        @param {Ember.Array} contentArray the content array
+        @param {Number} start starting index of the change
+        @param {Number} removeCount count of items removed
+        @param {Number} addCount count of items added
+
+      */
       contentArrayWillChange: K,
+      /**
+        Override to implement content array `didChange` observer.
+
+        @method contentArrayDidChange
+
+        @param {Ember.Array} contentArray the content array
+        @param {Number} start starting index of the change
+        @param {Number} removeCount count of items removed
+        @param {Number} addCount count of items added
+      */
       contentArrayDidChange: K,
 
       /**
@@ -32299,8 +33912,8 @@ define("ember-runtime/system/array_proxy",
       },
 
       _arrangedContentWillChange: beforeObserver('arrangedContent', function() {
-        var arrangedContent = get(this, 'arrangedContent'),
-            len = arrangedContent ? get(arrangedContent, 'length') : 0;
+        var arrangedContent = get(this, 'arrangedContent');
+        var len = arrangedContent ? get(arrangedContent, 'length') : 0;
 
         this.arrangedContentArrayWillChange(this, 0, len, undefined);
         this.arrangedContentWillChange(this);
@@ -32309,8 +33922,8 @@ define("ember-runtime/system/array_proxy",
       }),
 
       _arrangedContentDidChange: observer('arrangedContent', function() {
-        var arrangedContent = get(this, 'arrangedContent'),
-            len = arrangedContent ? get(arrangedContent, 'length') : 0;
+        var arrangedContent = get(this, 'arrangedContent');
+        var len = arrangedContent ? get(arrangedContent, 'length') : 0;
 
         Ember.assert("Can't set ArrayProxy's content to itself", arrangedContent !== this);
 
@@ -32390,9 +34003,10 @@ define("ember-runtime/system/array_proxy",
 
       removeAt: function(start, len) {
         if ('number' === typeof start) {
-          var content = get(this, 'content'),
-              arrangedContent = get(this, 'arrangedContent'),
-              indices = [], i;
+          var content = get(this, 'content');
+          var arrangedContent = get(this, 'arrangedContent');
+          var indices = [];
+          var i;
 
           if ((start < 0) || (start >= get(this, 'length'))) {
             throw new EmberError(OUT_OF_RANGE_EXCEPTION);
@@ -32477,7 +34091,7 @@ define("ember-runtime/system/array_proxy",
 
     __exports__["default"] = ArrayProxy;
   });
-define("ember-runtime/system/container",
+enifed("ember-runtime/system/container",
   ["ember-metal/property_set","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -32488,8 +34102,8 @@ define("ember-runtime/system/container",
 
     __exports__["default"] = Container;
   });
-define("ember-runtime/system/core_object",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-runtime/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
+enifed("ember-runtime/system/core_object",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-metal/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
         // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
@@ -32502,7 +34116,7 @@ define("ember-runtime/system/core_object",
     */
 
     var Ember = __dependency1__["default"];
-    // Ember.ENV.MANDATORY_SETTER, Ember.assert, Ember.K, Ember.config
+    // Ember.assert, Ember.K, Ember.config
 
     // NOTE: this object should never be included directly. Instead use `Ember.Object`.
     // We only define this separately so that `Ember.Set` can depend on it.
@@ -32514,7 +34128,6 @@ define("ember-runtime/system/core_object",
     var generateGuid = __dependency4__.generateGuid;
     var GUID_KEY = __dependency4__.GUID_KEY;
     var meta = __dependency4__.meta;
-    var META_KEY = __dependency4__.META_KEY;
     var makeArray = __dependency4__.makeArray;
     var rewatch = __dependency6__.rewatch;
     var finishChains = __dependency7__.finishChains;
@@ -32524,7 +34137,7 @@ define("ember-runtime/system/core_object",
     var required = __dependency9__.required;
     var indexOf = __dependency10__.indexOf;
     var EmberError = __dependency11__["default"];
-    var platform = __dependency5__.platform;
+    var o_defineProperty = __dependency5__.defineProperty;
     var keys = __dependency12__["default"];
     var ActionHandler = __dependency13__["default"];
     var defineProperty = __dependency14__.defineProperty;
@@ -32532,14 +34145,13 @@ define("ember-runtime/system/core_object",
     var ComputedProperty = __dependency16__.ComputedProperty;
     var run = __dependency17__["default"];
     var destroy = __dependency6__.destroy;
-
     var K = __dependency1__.K;
-    var o_defineProperty = platform.defineProperty;
+    var hasPropertyAccessors = __dependency5__.hasPropertyAccessors;
+
     var schedule = run.schedule;
     var applyMixin = Mixin._apply;
     var finishPartial = Mixin.finishPartial;
     var reopen = Mixin.prototype.reopen;
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
     var hasCachedComputedProperties = false;
 
     var undefinedDescriptor = {
@@ -32562,7 +34174,8 @@ define("ember-runtime/system/core_object",
       // method a lot faster. This is glue code so we want it to be as fast as
       // possible.
 
-      var wasApplied = false, initMixins, initProperties;
+      var wasApplied = false;
+      var initMixins, initProperties;
 
       var Class = function() {
         if (!wasApplied) {
@@ -32570,7 +34183,8 @@ define("ember-runtime/system/core_object",
         }
         o_defineProperty(this, GUID_KEY, nullDescriptor);
         o_defineProperty(this, '__nextSuper', undefinedDescriptor);
-        var m = meta(this), proto = m.proto;
+        var m = meta(this);
+        var proto = m.proto;
         m.proto = this;
         if (initMixins) {
           // capture locally so we can clear the closed over variable
@@ -32641,11 +34255,14 @@ define("ember-runtime/system/core_object",
               } else {
                 if (typeof this.setUnknownProperty === 'function' && !(keyName in this)) {
                   this.setUnknownProperty(keyName, value);
-                } else if (MANDATORY_SETTER) {
-                  defineProperty(this, keyName, null, value); // setup mandatory setter
                 } else {
-                  this[keyName] = value;
-                }
+                  
+                    if (hasPropertyAccessors) {
+                      defineProperty(this, keyName, null, value); // setup mandatory setter
+                    } else {
+                      this[keyName] = value;
+                    }
+                                  }
               }
             }
           }
@@ -32696,7 +34313,6 @@ define("ember-runtime/system/core_object",
     */
     var CoreObject = makeCtor();
     CoreObject.toString = function() { return "Ember.CoreObject"; };
-
     CoreObject.PrototypeMixin = Mixin.create({
       reopen: function() {
         var length = arguments.length;
@@ -32913,9 +34529,10 @@ define("ember-runtime/system/core_object",
         @return {String} string representation
       */
       toString: function toString() {
-        var hasToStringExtension = typeof this.toStringExtension === 'function',
-            extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
+        var hasToStringExtension = typeof this.toStringExtension === 'function';
+        var extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
         var ret = '<'+this.constructor.toString()+':'+guidFor(this)+extension+'>';
+
         this.toString = makeToString(ret);
         return ret;
       }
@@ -33023,8 +34640,9 @@ define("ember-runtime/system/core_object",
         @param {Mixin} [mixins]* One or more Mixin classes
         @param {Object} [arguments]* Object containing values to use within the new class
       */
-      extend: function() {
-        var Class = makeCtor(), proto;
+      extend: function extend() {
+        var Class = makeCtor();
+        var proto;
         Class.ClassMixin = Mixin.create(this.ClassMixin);
         Class.PrototypeMixin = Mixin.create(this.PrototypeMixin);
 
@@ -33270,8 +34888,8 @@ define("ember-runtime/system/core_object",
         @param key {String} property name
       */
       metaForProperty: function(key) {
-        var meta = this.proto()[META_KEY],
-            desc = meta && meta.descs[key];
+        var meta = this.proto()['__ember_meta__'];
+        var desc = meta && meta.descs[key];
 
         Ember.assert("metaForProperty() could not find a computed property with key '"+key+"'.", !!desc && desc instanceof ComputedProperty);
         return desc._meta || {};
@@ -33339,15 +34957,12 @@ define("ember-runtime/system/core_object",
             cache._computedProperties = undefined;
           }
         }
-
-        this._super();
       }
     });
 
-
     __exports__["default"] = CoreObject;
   });
-define("ember-runtime/system/deferred",
+enifed("ember-runtime/system/deferred",
   ["ember-metal/core","ember-runtime/mixins/deferred","ember-metal/property_get","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -33373,7 +34988,7 @@ define("ember-runtime/system/deferred",
 
     __exports__["default"] = Deferred;
   });
-define("ember-runtime/system/each_proxy",
+enifed("ember-runtime/system/each_proxy",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/enumerable_utils","ember-metal/array","ember-runtime/mixins/array","ember-runtime/system/object","ember-metal/computed","ember-metal/observer","ember-metal/events","ember-metal/properties","ember-metal/property_events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
@@ -33431,7 +35046,8 @@ define("ember-runtime/system/each_proxy",
     var IS_OBSERVER = /^.+:(before|change)$/;
 
     function addObserverForContentKey(content, keyName, proxy, idx, loc) {
-      var objects = proxy._objects, guid;
+      var objects = proxy._objects;
+      var guid;
       if (!objects) objects = proxy._objects = {};
 
       while(--loc>=idx) {
@@ -33513,7 +35129,8 @@ define("ember-runtime/system/each_proxy",
       // Invokes whenever the content array itself changes.
 
       arrayWillChange: function(content, idx, removedCnt, addedCnt) {
-        var keys = this._keys, key, lim;
+        var keys = this._keys;
+        var key, lim;
 
         lim = removedCnt>0 ? idx+removedCnt : -1;
         beginPropertyChanges(this);
@@ -33531,7 +35148,8 @@ define("ember-runtime/system/each_proxy",
       },
 
       arrayDidChange: function(content, idx, removedCnt, addedCnt) {
-        var keys = this._keys, lim;
+        var keys = this._keys;
+        var lim;
 
         lim = addedCnt>0 ? idx+addedCnt : -1;
         changeProperties(function() {
@@ -33572,8 +35190,9 @@ define("ember-runtime/system/each_proxy",
         if (!keys) keys = this._keys = {};
         if (!keys[keyName]) {
           keys[keyName] = 1;
-          var content = this._content,
-              len = get(content, 'length');
+          var content = this._content;
+          var len = get(content, 'length');
+
           addObserverForContentKey(content, keyName, this, 0, len);
         } else {
           keys[keyName]++;
@@ -33583,8 +35202,9 @@ define("ember-runtime/system/each_proxy",
       stopObservingContentKey: function(keyName) {
         var keys = this._keys;
         if (keys && (keys[keyName]>0) && (--keys[keyName]<=0)) {
-          var content = this._content,
-              len     = get(content, 'length');
+          var content = this._content;
+          var len     = get(content, 'length');
+
           removeObserverForContentKey(content, keyName, this, 0, len);
         }
       },
@@ -33601,7 +35221,7 @@ define("ember-runtime/system/each_proxy",
     __exports__.EachArray = EachArray;
     __exports__.EachProxy = EachProxy;
   });
-define("ember-runtime/system/lazy_load",
+enifed("ember-runtime/system/lazy_load",
   ["ember-metal/core","ember-metal/array","ember-runtime/system/native_array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -33675,7 +35295,7 @@ define("ember-runtime/system/lazy_load",
 
     __exports__.runLoadHooks = runLoadHooks;
   });
-define("ember-runtime/system/namespace",
+enifed("ember-runtime/system/namespace",
   ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/mixin","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -33720,7 +35340,7 @@ define("ember-runtime/system/namespace",
       },
 
       toString: function() {
-        var name = get(this, 'name');
+        var name = get(this, 'name') || get(this, 'modulePrefix');
         if (name) { return name; }
 
         findNamespaces();
@@ -33732,8 +35352,8 @@ define("ember-runtime/system/namespace",
       },
 
       destroy: function() {
-        var namespaces = Namespace.NAMESPACES,
-            toString = this.toString();
+        var namespaces = Namespace.NAMESPACES;
+        var toString = this.toString();
 
         if (toString) {
           Ember.lookup[toString] = undefined;
@@ -33812,7 +35432,8 @@ define("ember-runtime/system/namespace",
     }
 
     function findNamespaces() {
-      var lookup = Ember.lookup, obj, isNamespace;
+      var lookup = Ember.lookup;
+      var obj, isNamespace;
 
       if (Namespace.PROCESSED) { return; }
 
@@ -33869,8 +35490,8 @@ define("ember-runtime/system/namespace",
     }
 
     function processAllNamespaces() {
-      var unprocessedNamespaces = !Namespace.PROCESSED,
-          unprocessedMixins = Ember.anyUnprocessedMixins;
+      var unprocessedNamespaces = !Namespace.PROCESSED;
+      var unprocessedMixins = Ember.anyUnprocessedMixins;
 
       if (unprocessedNamespaces) {
         findNamespaces();
@@ -33878,7 +35499,9 @@ define("ember-runtime/system/namespace",
       }
 
       if (unprocessedNamespaces || unprocessedMixins) {
-        var namespaces = Namespace.NAMESPACES, namespace;
+        var namespaces = Namespace.NAMESPACES;
+        var namespace;
+
         for (var i=0, l=namespaces.length; i<l; i++) {
           namespace = namespaces[i];
           processNamespace([namespace.toString()], namespace, {});
@@ -33896,9 +35519,9 @@ define("ember-runtime/system/namespace",
 
     __exports__["default"] = Namespace;
   });
-define("ember-runtime/system/native_array",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+enifed("ember-runtime/system/native_array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/array","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -33913,12 +35536,14 @@ define("ember-runtime/system/native_array",
     var replace = __dependency4__._replace;
     var forEach = __dependency4__.forEach;
     var Mixin = __dependency5__.Mixin;
-    var EmberArray = __dependency6__["default"];
-    var MutableArray = __dependency7__["default"];
-    var Observable = __dependency8__["default"];
-    var Copyable = __dependency9__["default"];
-    var FROZEN_ERROR = __dependency10__.FROZEN_ERROR;
-    var copy = __dependency11__["default"];
+    var indexOf = __dependency6__.indexOf;
+    var lastIndexOf = __dependency6__.lastIndexOf;
+    var EmberArray = __dependency7__["default"];
+    var MutableArray = __dependency8__["default"];
+    var Observable = __dependency9__["default"];
+    var Copyable = __dependency10__["default"];
+    var FROZEN_ERROR = __dependency11__.FROZEN_ERROR;
+    var copy = __dependency12__["default"];
 
     // Add Ember.Array to Array.prototype. Remove methods with native
     // implementations and supply some more optimized versions of generic methods
@@ -33976,39 +35601,15 @@ define("ember-runtime/system/native_array",
       // from member items.
       unknownProperty: function(key, value) {
         var ret;// = this.reducedProperty(key, value) ;
-        if ((value !== undefined) && ret === undefined) {
+        if (value !== undefined && ret === undefined) {
           ret = this[key] = value;
         }
-        return ret ;
+        return ret;
       },
 
-      // If browser did not implement indexOf natively, then override with
-      // specialized version
-      indexOf: function(object, startAt) {
-        var idx, len = this.length;
+      indexOf: indexOf,
 
-        if (startAt === undefined) startAt = 0;
-        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
-        if (startAt < 0) startAt += len;
-
-        for(idx=startAt;idx<len;idx++) {
-          if (this[idx] === object) return idx ;
-        }
-        return -1;
-      },
-
-      lastIndexOf: function(object, startAt) {
-        var idx, len = this.length;
-
-        if (startAt === undefined) startAt = len-1;
-        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
-        if (startAt < 0) startAt += len;
-
-        for(idx=startAt;idx>=0;idx--) {
-          if (this[idx] === object) return idx ;
-        }
-        return -1;
-      },
+      lastIndexOf: lastIndexOf,
 
       copy: function(deep) {
         if (deep) {
@@ -34025,7 +35626,7 @@ define("ember-runtime/system/native_array",
       if (Array.prototype[methodName]) ignore.push(methodName);
     });
 
-    if (ignore.length>0) {
+    if (ignore.length > 0) {
       NativeArray = NativeArray.without.apply(NativeArray, ignore);
     }
 
@@ -34096,7 +35697,7 @@ define("ember-runtime/system/native_array",
     __exports__.NativeArray = NativeArray;
     __exports__["default"] = NativeArray;
   });
-define("ember-runtime/system/object",
+enifed("ember-runtime/system/object",
   ["ember-runtime/system/core_object","ember-runtime/mixins/observable","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -34125,42 +35726,12 @@ define("ember-runtime/system/object",
 
     __exports__["default"] = EmberObject;
   });
-define("ember-runtime/system/object_proxy",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+enifed("ember-runtime/system/object_proxy",
+  ["ember-runtime/system/object","ember-runtime/mixins/-proxy","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    /**
-    @module ember
-    @submodule ember-runtime
-    */
-    var Ember = __dependency1__["default"];
-    // Ember.assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var meta = __dependency4__.meta;
-    var addObserver = __dependency5__.addObserver;
-    var removeObserver = __dependency5__.removeObserver;
-    var addBeforeObserver = __dependency5__.addBeforeObserver;
-    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
-    var propertyWillChange = __dependency6__.propertyWillChange;
-    var propertyDidChange = __dependency6__.propertyDidChange;
-    var computed = __dependency7__.computed;
-    var defineProperty = __dependency8__.defineProperty;
-    var observer = __dependency9__.observer;
-    var fmt = __dependency10__.fmt;
-    var EmberObject = __dependency11__["default"];
-
-    function contentPropertyWillChange(content, contentKey) {
-      var key = contentKey.slice(8); // remove "content."
-      if (key in this) { return; }  // if shadowed in proxy
-      propertyWillChange(this, key);
-    }
-
-    function contentPropertyDidChange(content, contentKey) {
-      var key = contentKey.slice(8); // remove "content."
-      if (key in this) { return; } // if shadowed in proxy
-      propertyDidChange(this, key);
-    }
+    var EmberObject = __dependency1__["default"];
+    var _ProxyMixin = __dependency2__["default"];
 
     /**
       `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
@@ -34228,62 +35799,12 @@ define("ember-runtime/system/object_proxy",
       @class ObjectProxy
       @namespace Ember
       @extends Ember.Object
+      @extends Ember._ProxyMixin
     */
-    var ObjectProxy = EmberObject.extend({
-      /**
-        The object whose properties will be forwarded.
 
-        @property content
-        @type Ember.Object
-        @default null
-      */
-      content: null,
-      _contentDidChange: observer('content', function() {
-        Ember.assert("Can't set ObjectProxy's content to itself", get(this, 'content') !== this);
-      }),
-
-      isTruthy: computed.bool('content'),
-
-      _debugContainerKey: null,
-
-      willWatchProperty: function (key) {
-        var contentKey = 'content.' + key;
-        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
-        addObserver(this, contentKey, null, contentPropertyDidChange);
-      },
-
-      didUnwatchProperty: function (key) {
-        var contentKey = 'content.' + key;
-        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
-        removeObserver(this, contentKey, null, contentPropertyDidChange);
-      },
-
-      unknownProperty: function (key) {
-        var content = get(this, 'content');
-        if (content) {
-          return get(content, key);
-        }
-      },
-
-      setUnknownProperty: function (key, value) {
-        var m = meta(this);
-        if (m.proto === this) {
-          // if marked as prototype then just defineProperty
-          // rather than delegate
-          defineProperty(this, key, null, value);
-          return value;
-        }
-
-        var content = get(this, 'content');
-        Ember.assert(fmt("Cannot delegate set('%@', %@) to the 'content' property of object proxy %@: its 'content' is undefined.", [key, value, this]), content);
-        return set(content, key, value);
-      }
-
-    });
-
-    __exports__["default"] = ObjectProxy;
+    __exports__["default"] = EmberObject.extend(_ProxyMixin);
   });
-define("ember-runtime/system/set",
+enifed("ember-runtime/system/set",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/is_none","ember-runtime/system/string","ember-runtime/system/core_object","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-metal/error","ember-metal/property_events","ember-metal/mixin","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
@@ -34292,7 +35813,7 @@ define("ember-runtime/system/set",
     @submodule ember-runtime
     */
     var Ember = __dependency1__["default"];
-    // Ember.isNone
+    // Ember.isNone, Ember.A
 
     var get = __dependency2__.get;
     var set = __dependency3__.set;
@@ -34644,6 +36165,7 @@ define("ember-runtime/system/set",
       //
 
       init: function(items) {
+        Ember.deprecate('Ember.Set is deprecated and will be removed in a future release.');
         this._super();
         if (items) this.addObjects(items);
       },
@@ -34668,10 +36190,10 @@ define("ember-runtime/system/set",
         if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
         if (isNone(obj)) return this; // nothing to do
 
-        var guid = guidFor(obj),
-            idx  = this[guid],
-            len  = get(this, 'length'),
-            added ;
+        var guid = guidFor(obj);
+        var idx  = this[guid];
+        var len  = get(this, 'length');
+        var added;
 
         if (idx>=0 && idx<len && (this[idx] === obj)) return this; // added
 
@@ -34696,12 +36218,12 @@ define("ember-runtime/system/set",
         if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
         if (isNone(obj)) return this; // nothing to do
 
-        var guid = guidFor(obj),
-            idx  = this[guid],
-            len = get(this, 'length'),
-            isFirst = idx === 0,
-            isLast = idx === len-1,
-            last, removed;
+        var guid = guidFor(obj);
+        var idx  = this[guid];
+        var len = get(this, 'length');
+        var isFirst = idx === 0;
+        var isLast = idx === len-1;
+        var last, removed;
 
 
         if (idx>=0 && idx<len && (this[idx] === obj)) {
@@ -34754,9 +36276,9 @@ define("ember-runtime/system/set",
       }
     });
   });
-define("ember-runtime/system/string",
-  ["ember-metal/core","ember-metal/utils","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-runtime/system/string",
+  ["ember-metal/core","ember-metal/utils","ember-metal/cache","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -34767,23 +36289,68 @@ define("ember-runtime/system/string",
     var isArray = __dependency2__.isArray;
     var emberInspect = __dependency2__.inspect;
 
+    var Cache = __dependency3__["default"];
+
     var STRING_DASHERIZE_REGEXP = (/[ _]/g);
-    var STRING_DASHERIZE_CACHE = {};
+
+    var STRING_DASHERIZE_CACHE = new Cache(1000, function(key) {
+      return decamelize(key).replace(STRING_DASHERIZE_REGEXP, '-');
+    });
+
+    var CAMELIZE_CACHE = new Cache(1000, function(key) {
+      return key.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
+        return chr ? chr.toUpperCase() : '';
+      }).replace(/^([A-Z])/, function(match, separator, chr) {
+        return match.toLowerCase();
+      });
+    });
+
+    var CLASSIFY_CACHE = new Cache(1000, function(str) {
+      var parts = str.split(".");
+      var out = [];
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var camelized = camelize(parts[i]);
+        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
+      }
+
+      return out.join(".");
+    });
+
+    var UNDERSCORE_CACHE = new Cache(1000, function(str) {
+      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
+        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
+    });
+
+    var CAPITALIZE_CACHE = new Cache(1000, function(str) {
+      return str.charAt(0).toUpperCase() + str.substr(1);
+    });
+
+    var DECAMELIZE_CACHE = new Cache(1000, function(str) {
+      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
+    });
+
     var STRING_DECAMELIZE_REGEXP = (/([a-z\d])([A-Z])/g);
     var STRING_CAMELIZE_REGEXP = (/(\-|_|\.|\s)+(.)?/g);
     var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
     var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
 
     function fmt(str, formats) {
-      if (!isArray(formats) || arguments.length > 2) {
-        formats = Array.prototype.slice.call(arguments, 1);
+      var cachedFormats = formats;
+
+      if (!isArray(cachedFormats) || arguments.length > 2) {
+        cachedFormats = new Array(arguments.length - 1);
+
+        for (var i = 1, l = arguments.length; i < l; i++) {
+          cachedFormats[i - 1] = arguments[i];
+        }
       }
 
       // first, replace any ORDERED replacements.
       var idx  = 0; // the current index for non-numerical replacements
       return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
         argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++;
-        s = formats[argIndex];
+        s = cachedFormats[argIndex];
         return (s === null) ? '(null)' : (s === undefined) ? '' : emberInspect(s);
       });
     }
@@ -34802,51 +36369,27 @@ define("ember-runtime/system/string",
     }
 
     function decamelize(str) {
-      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
+      return DECAMELIZE_CACHE.get(str);
     }
 
     function dasherize(str) {
-      var cache = STRING_DASHERIZE_CACHE,
-          hit   = cache.hasOwnProperty(str),
-          ret;
-
-      if (hit) {
-        return cache[str];
-      } else {
-        ret = decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
-        cache[str] = ret;
-      }
-
-      return ret;
+      return STRING_DASHERIZE_CACHE.get(str);
     }
 
     function camelize(str) {
-      return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
-        return chr ? chr.toUpperCase() : '';
-      }).replace(/^([A-Z])/, function(match, separator, chr) {
-        return match.toLowerCase();
-      });
+      return CAMELIZE_CACHE.get(str);
     }
 
     function classify(str) {
-      var parts = str.split("."),
-          out = [];
-
-      for (var i=0, l=parts.length; i<l; i++) {
-        var camelized = camelize(parts[i]);
-        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
-      }
-
-      return out.join(".");
+      return CLASSIFY_CACHE.get(str);
     }
 
     function underscore(str) {
-      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
-        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
+      return UNDERSCORE_CACHE.get(str);
     }
 
     function capitalize(str) {
-      return str.charAt(0).toUpperCase() + str.substr(1);
+      return CAPITALIZE_CACHE.get(str);
     }
 
     /**
@@ -35048,7 +36591,7 @@ define("ember-runtime/system/string",
     __exports__.underscore = underscore;
     __exports__.capitalize = capitalize;
   });
-define("ember-runtime/system/subarray",
+enifed("ember-runtime/system/subarray",
   ["ember-metal/property_get","ember-metal/error","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -35091,15 +36634,15 @@ define("ember-runtime/system/subarray",
 
         @method addItem
 
-        @param {number} index The index of the item in the tracked array.
-        @param {boolean} match `true` iff the item is included in the subarray.
+        @param {Number} index The index of the item in the tracked array.
+        @param {Boolean} match `true` iff the item is included in the subarray.
 
         @return {number} The index of the item in the subarray.
       */
       addItem: function(index, match) {
-        var returnValue = -1,
-            itemType = match ? RETAIN : FILTER,
-            self = this;
+        var returnValue = -1;
+        var itemType = match ? RETAIN : FILTER;
+        var self = this;
 
         this._findOperation(index, function(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
           var newOperation, splitOperation;
@@ -35144,14 +36687,14 @@ define("ember-runtime/system/subarray",
 
         @method removeItem
 
-        @param {number} index The index of the item in the tracked array.
+        @param {Number} index The index of the item in the tracked array.
 
         @return {number} The index of the item in the subarray, or `-1` if the item
         was not in the subarray.
       */
       removeItem: function(index) {
-        var returnValue = -1,
-            self = this;
+        var returnValue = -1;
+        var self = this;
 
         this._findOperation(index, function (operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
           if (operation.type === RETAIN) {
@@ -35173,12 +36716,8 @@ define("ember-runtime/system/subarray",
 
 
       _findOperation: function (index, foundCallback, notFoundCallback) {
-        var operationIndex,
-            len,
-            operation,
-            rangeStart,
-            rangeEnd,
-            seenInSubArray = 0;
+        var seenInSubArray = 0;
+        var operationIndex, len, operation, rangeStart, rangeEnd;
 
         // OPTIMIZE: change to balanced tree
         // find leftmost operation to the right of `index`
@@ -35198,8 +36737,8 @@ define("ember-runtime/system/subarray",
       },
 
       _composeAt: function(index) {
-        var op = this._operations[index],
-            otherOp;
+        var op = this._operations[index];
+        var otherOp;
 
         if (!op) {
           // Composing out of bounds is a no-op, as when removing the last operation
@@ -35234,7 +36773,7 @@ define("ember-runtime/system/subarray",
       }
     };
   });
-define("ember-runtime/system/tracked_array",
+enifed("ember-runtime/system/tracked_array",
   ["ember-metal/property_get","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -35254,7 +36793,7 @@ define("ember-runtime/system/tracked_array",
 
       @class TrackedArray
       @namespace Ember
-      @param {array} [items=[]] The array to be tracked.  This is used just to get
+      @param {Array} [items=[]] The array to be tracked.  This is used just to get
       the initial items for the starting state of retain:n.
     */
     function TrackedArray(items) {
@@ -35286,15 +36825,11 @@ define("ember-runtime/system/tracked_array",
         var count = get(newItems, 'length');
         if (count < 1) { return; }
 
-        var match = this._findArrayOperation(index),
-            arrayOperation = match.operation,
-            arrayOperationIndex = match.index,
-            arrayOperationRangeStart = match.rangeStart,
-            composeIndex,
-            splitIndex,
-            splitItems,
-            splitArrayOperation,
-            newArrayOperation;
+        var match = this._findArrayOperation(index);
+        var arrayOperation = match.operation;
+        var arrayOperationIndex = match.index;
+        var arrayOperationRangeStart = match.rangeStart;
+        var composeIndex, splitIndex, splitItems, splitArrayOperation, newArrayOperation;
 
         newArrayOperation = new ArrayOperation(INSERT, count, newItems);
 
@@ -35326,12 +36861,11 @@ define("ember-runtime/system/tracked_array",
       removeItems: function (index, count) {
         if (count < 1) { return; }
 
-        var match = this._findArrayOperation(index),
-            arrayOperation = match.operation,
-            arrayOperationIndex = match.index,
-            arrayOperationRangeStart = match.rangeStart,
-            newArrayOperation,
-            composeIndex;
+        var match = this._findArrayOperation(index);
+        var arrayOperation = match.operation;
+        var arrayOperationIndex = match.index;
+        var arrayOperationRangeStart = match.rangeStart;
+        var newArrayOperation, composeIndex;
 
         newArrayOperation = new ArrayOperation(DELETE, count);
         if (!match.split) {
@@ -35359,11 +36893,11 @@ define("ember-runtime/system/tracked_array",
         `Ember.TrackedArray.{RETAIN, DELETE, INSERT}`
 
         @method apply
-        @param {function} callback
+        @param {Function} callback
       */
       apply: function (callback) {
-        var items = [],
-            offset = 0;
+        var items = [];
+        var offset = 0;
 
         forEach(this._operations, function (arrayOperation, operationIndex) {
           callback(arrayOperation.items, offset, arrayOperation.type, operationIndex);
@@ -35382,17 +36916,15 @@ define("ember-runtime/system/tracked_array",
 
         @method _findArrayOperation
 
-        @param {number} index the index of the item whose operation information
+        @param {Number} index the index of the item whose operation information
         should be returned.
         @private
       */
       _findArrayOperation: function (index) {
-        var arrayOperationIndex,
-            len,
-            split = false,
-            arrayOperation,
-            arrayOperationRangeStart,
-            arrayOperationRangeEnd;
+        var split = false;
+        var arrayOperationIndex, arrayOperation,
+            arrayOperationRangeStart, arrayOperationRangeEnd,
+            len;
 
         // OPTIMIZE: we could search these faster if we kept a balanced tree.
         // find leftmost arrayOperation to the right of `index`
@@ -35430,11 +36962,11 @@ define("ember-runtime/system/tracked_array",
 
       // see SubArray for a better implementation.
       _composeInsert: function (index) {
-        var newArrayOperation = this._operations[index],
-            leftArrayOperation = this._operations[index-1], // may be undefined
-            rightArrayOperation = this._operations[index+1], // may be undefined
-            leftOp = leftArrayOperation && leftArrayOperation.type,
-            rightOp = rightArrayOperation && rightArrayOperation.type;
+        var newArrayOperation = this._operations[index];
+        var leftArrayOperation = this._operations[index-1]; // may be undefined
+        var rightArrayOperation = this._operations[index+1]; // may be undefined
+        var leftOp = leftArrayOperation && leftArrayOperation.type;
+        var rightOp = rightArrayOperation && rightArrayOperation.type;
 
         if (leftOp === INSERT) {
             // merge left
@@ -35459,15 +36991,15 @@ define("ember-runtime/system/tracked_array",
       },
 
       _composeDelete: function (index) {
-        var arrayOperation = this._operations[index],
-            deletesToGo = arrayOperation.count,
-            leftArrayOperation = this._operations[index-1], // may be undefined
-            leftOp = leftArrayOperation && leftArrayOperation.type,
-            nextArrayOperation,
-            nextOp,
-            nextCount,
-            removeNewAndNextOp = false,
-            removedItems = [];
+        var arrayOperation = this._operations[index];
+        var deletesToGo = arrayOperation.count;
+        var leftArrayOperation = this._operations[index-1]; // may be undefined
+        var leftOp = leftArrayOperation && leftArrayOperation.type;
+        var nextArrayOperation;
+        var nextOp;
+        var nextCount;
+        var removeNewAndNextOp = false;
+        var removedItems = [];
 
         if (leftOp === DELETE) {
           arrayOperation = leftArrayOperation;
@@ -35540,10 +37072,10 @@ define("ember-runtime/system/tracked_array",
 
       @method ArrayOperation
       @private
-      @param {string} type The type of the operation.  One of
+      @param {String} type The type of the operation.  One of
       `Ember.TrackedArray.{RETAIN, INSERT, DELETE}`
-      @param {number} count The number of items in this operation.
-      @param {array} items The items of the operation, if included.  RETAIN and
+      @param {Number} count The number of items in this operation.
+      @param {Array} items The items of the operation, if included.  RETAIN and
       INSERT include their items, DELETE does not.
     */
     function ArrayOperation (operation, count, items) {
@@ -35559,10 +37091,10 @@ define("ember-runtime/system/tracked_array",
       @method ArrayOperationMatch
       @private
       @param {ArrayOperation} operation
-      @param {number} index The index of `operation` in the array of operations.
-      @param {boolean} split Whether or not the item index searched for would
+      @param {Number} index The index of `operation` in the array of operations.
+      @param {Boolean} split Whether or not the item index searched for would
       require a split for a new operation type.
-      @param {number} rangeStart The index of the first item in the operation,
+      @param {Number} rangeStart The index of the first item in the operation,
       with respect to the tracked array.  The index of the last item can be computed
       from `rangeStart` and `operation.count`.
     */
@@ -35573,7 +37105,7 @@ define("ember-runtime/system/tracked_array",
       this.rangeStart = rangeStart;
     }
   });
-define("ember-testing",
+enifed("ember-testing",
   ["ember-metal/core","ember-testing/initializers","ember-testing/support","ember-testing/setup_for_testing","ember-testing/test","ember-testing/adapters/adapter","ember-testing/adapters/qunit","ember-testing/helpers"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
     "use strict";
@@ -35601,7 +37133,7 @@ define("ember-testing",
     Ember.Test.QUnitAdapter = QUnitAdapter;
     Ember.setupForTesting = setupForTesting;
   });
-define("ember-testing/adapters/adapter",
+enifed("ember-testing/adapters/adapter",
   ["ember-metal/core","ember-metal/utils","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -35666,7 +37198,7 @@ define("ember-testing/adapters/adapter",
 
     __exports__["default"] = Adapter;
   });
-define("ember-testing/adapters/qunit",
+enifed("ember-testing/adapters/qunit",
   ["ember-testing/adapters/adapter","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -35693,7 +37225,7 @@ define("ember-testing/adapters/qunit",
       }
     });
   });
-define("ember-testing/helpers",
+enifed("ember-testing/helpers",
   ["ember-metal/property_get","ember-metal/error","ember-metal/run_loop","ember-views/system/jquery","ember-testing/test"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
     "use strict";
@@ -35771,26 +37303,33 @@ define("ember-testing/helpers",
       return app.testHelpers.wait();
     }
 
-    function triggerEvent(app, selector, context, type, options){
-      if (arguments.length === 3) {
+    function triggerEvent(app, selector, contextOrType, typeOrOptions, possibleOptions){
+      var arity = arguments.length;
+      var context, type, options;
+
+      if (arity === 3) {
         // context and options are optional, so this is
         // app, selector, type
-        type = context;
         context = null;
+        type = contextOrType;
         options = {};
-      }
-
-      if (arguments.length === 4) {
+      } else if (arity === 4) {
         // context and options are optional, so this is
-        if (typeof type === "object") {  // either
+        if (typeof typeOrOptions === "object") {  // either
           // app, selector, type, options
-          options = type;
-          type = context;
           context = null;
+          type = contextOrType;
+          options = typeOrOptions;
         } else { // or
           // app, selector, context, type
+          context = contextOrType;
+          type = typeOrOptions;
           options = {};
         }
+      } else {
+        context = contextOrType;
+        type = typeOrOptions;
+        options = possibleOptions;
       }
 
       var $el = app.testHelpers.findWithAssert(selector, context);
@@ -35802,21 +37341,27 @@ define("ember-testing/helpers",
       return app.testHelpers.wait();
     }
 
-    function keyEvent(app, selector, context, type, keyCode) {
+    function keyEvent(app, selector, contextOrType, typeOrKeyCode, keyCode) {
+      var context, type;
+
       if (typeof keyCode === 'undefined') {
-        keyCode = type;
-        type = context;
         context = null;
+        keyCode = typeOrKeyCode;
+        type = contextOrType;
+      } else {
+        context = contextOrType;
+        type = typeOrKeyCode;
       }
 
       return app.testHelpers.triggerEvent(selector, context, type, { keyCode: keyCode, which: keyCode });
     }
 
-    function fillIn(app, selector, context, text) {
-      var $el;
+    function fillIn(app, selector, contextOrText, text) {
+      var $el, context;
       if (typeof text === 'undefined') {
-        text = context;
-        context = null;
+        text = contextOrText;
+      } else {
+        context = contextOrText;
       }
       $el = app.testHelpers.findWithAssert(selector, context);
       run(function() {
@@ -36103,7 +37648,7 @@ define("ember-testing/helpers",
     */
     asyncHelper('triggerEvent', triggerEvent);
   });
-define("ember-testing/initializers",
+enifed("ember-testing/initializers",
   ["ember-runtime/system/lazy_load"],
   function(__dependency1__) {
     "use strict";
@@ -36125,7 +37670,7 @@ define("ember-testing/initializers",
       }
     });
   });
-define("ember-testing/setup_for_testing",
+enifed("ember-testing/setup_for_testing",
   ["ember-metal/core","ember-testing/adapters/qunit","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -36180,7 +37725,7 @@ define("ember-testing/setup_for_testing",
       jQuery(document).on('ajaxComplete', decrementAjaxPendingRequests);
     }
   });
-define("ember-testing/support",
+enifed("ember-testing/support",
   ["ember-metal/core","ember-views/system/jquery"],
   function(__dependency1__, __dependency2__) {
     "use strict";
@@ -36240,7 +37785,7 @@ define("ember-testing/support",
       });
     });
   });
-define("ember-testing/test",
+enifed("ember-testing/test",
   ["ember-metal/core","ember-metal/run_loop","ember-metal/platform","ember-runtime/compare","ember-runtime/ext/rsvp","ember-testing/setup_for_testing","ember-application/system/application","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -36525,12 +38070,12 @@ define("ember-testing/test",
     };
 
     function helper(app, name) {
-      var fn = helpers[name].method,
-          meta = helpers[name].meta;
+      var fn = helpers[name].method;
+      var meta = helpers[name].meta;
 
       return function() {
-        var args = slice.call(arguments),
-            lastPromise = Test.lastPromise;
+        var args = slice.call(arguments);
+        var lastPromise = Test.lastPromise;
 
         args.unshift(app);
 
@@ -36764,9 +38309,9 @@ define("ember-testing/test",
 
     __exports__["default"] = Test;
   });
-define("ember-views",
-  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/core_view","ember-views/views/view","ember-views/views/view_collection","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
+enifed("ember-views",
+  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/core_view","ember-views/views/view","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
     /**
     Ember Views
@@ -36780,7 +38325,6 @@ define("ember-views",
     // BEGIN IMPORTS
     var Ember = __dependency1__["default"];
     var jQuery = __dependency2__["default"];
-    var setInnerHTML = __dependency3__.setInnerHTML;
     var isSimpleClick = __dependency3__.isSimpleClick;
     var RenderBuffer = __dependency4__["default"];
      // for the side effect of extending Ember.run.queues
@@ -36789,13 +38333,12 @@ define("ember-views",
 
     var CoreView = __dependency7__["default"];
     var View = __dependency8__["default"];
-    var ViewCollection = __dependency9__["default"];
-    var ContainerView = __dependency10__["default"];
-    var CollectionView = __dependency11__["default"];
-    var Component = __dependency12__["default"];
+    var ContainerView = __dependency9__["default"];
+    var CollectionView = __dependency10__["default"];
+    var Component = __dependency11__["default"];
 
-    var EventDispatcher = __dependency13__["default"];
-    var ViewTargetActionSupport = __dependency14__["default"];
+    var EventDispatcher = __dependency12__["default"];
+    var ViewTargetActionSupport = __dependency13__["default"];
     // END IMPORTS
 
     /**
@@ -36812,7 +38355,6 @@ define("ember-views",
     Ember.RenderBuffer = RenderBuffer;
 
     var ViewUtils = Ember.ViewUtils = {};
-    ViewUtils.setInnerHTML = setInnerHTML;
     ViewUtils.isSimpleClick = isSimpleClick;
 
     Ember.CoreView = CoreView;
@@ -36820,7 +38362,6 @@ define("ember-views",
     Ember.View.states = states;
     Ember.View.cloneStates = cloneStates;
 
-    Ember._ViewCollection = ViewCollection;
     Ember.ContainerView = ContainerView;
     Ember.CollectionView = CollectionView;
     Ember.Component = Component;
@@ -36829,7 +38370,7 @@ define("ember-views",
 
     __exports__["default"] = Ember;
   });
-define("ember-views/mixins/component_template_deprecation",
+enifed("ember-views/mixins/component_template_deprecation",
   ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -36872,8 +38413,8 @@ define("ember-views/mixins/component_template_deprecation",
         // there is another Mixin loaded first.
         this._super.apply(this, arguments);
 
-        var deprecatedProperty, replacementProperty,
-            layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
+        var deprecatedProperty, replacementProperty;
+        var layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
 
         if (props.templateName && !layoutSpecified) {
           deprecatedProperty = 'templateName';
@@ -36897,7 +38438,7 @@ define("ember-views/mixins/component_template_deprecation",
       }
     });
   });
-define("ember-views/mixins/view_target_action_support",
+enifed("ember-views/mixins/view_target_action_support",
   ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -36960,9 +38501,31 @@ define("ember-views/mixins/view_target_action_support",
       actionContext: alias('context')
     });
   });
-define("ember-views/system/event_dispatcher",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/views/view","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+enifed("ember-views/system/action_manager",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    function ActionManager() {}
+
+    /**
+      Global action id hash.
+
+      @private
+      @property registeredActions
+      @type Object
+    */
+    ActionManager.registeredActions = {};
+
+    __exports__["default"] = ActionManager;
+  });
+enifed("ember-views/system/event_dispatcher",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/system/action_manager","ember-views/views/view","ember-metal/merge","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -36979,9 +38542,9 @@ define("ember-views/system/event_dispatcher",
     var fmt = __dependency7__.fmt;
     var EmberObject = __dependency8__["default"];
     var jQuery = __dependency9__["default"];
-    var View = __dependency10__["default"];
-
-    var ActionHelper;
+    var ActionManager = __dependency10__["default"];
+    var View = __dependency11__["default"];
+    var merge = __dependency12__["default"];
 
     //ES6TODO:
     // find a better way to do Ember.View.views without global state
@@ -37100,7 +38663,7 @@ define("ember-views/system/event_dispatcher",
       setup: function(addedEvents, rootElement) {
         var event, events = get(this, 'events');
 
-        jQuery.extend(events, addedEvents || {});
+        merge(events, addedEvents || {});
 
         if (!isNone(rootElement)) {
           set(this, 'rootElement', rootElement);
@@ -37141,8 +38704,8 @@ define("ember-views/system/event_dispatcher",
         var self = this;
 
         rootElement.on(event + '.ember', '.ember-view', function(evt, triggeringManager) {
-          var view = View.views[this.id],
-              result = true;
+          var view = View.views[this.id];
+          var result = true;
 
           var manager = self.canDispatchToEventManager ? self._findNearestEventManager(view, eventName) : null;
 
@@ -37156,11 +38719,8 @@ define("ember-views/system/event_dispatcher",
         });
 
         rootElement.on(event + '.ember', '[data-ember-action]', function(evt) {
-          //ES6TODO: Needed for ActionHelper (generally not available in ember-views test suite)
-          if (!ActionHelper) { ActionHelper = requireModule("ember-routing-handlebars/helpers/action")["ActionHelper"]; }
-
-          var actionId = jQuery(evt.currentTarget).attr('data-ember-action'),
-              action   = ActionHelper.registeredActions[actionId];
+          var actionId = jQuery(evt.currentTarget).attr('data-ember-action');
+          var action   = ActionManager.registeredActions[actionId];
 
           // We have to check for action here since in some cases, jQuery will trigger
           // an event on `removeChild` (i.e. focusout) after we've already torn down the
@@ -37211,11 +38771,11 @@ define("ember-views/system/event_dispatcher",
       },
 
       toString: function() {
-        return '(EventDisptacher)';
+        return '(EventDispatcher)';
       }
     });
   });
-define("ember-views/system/ext",
+enifed("ember-views/system/ext",
   ["ember-metal/run_loop"],
   function(__dependency1__) {
     "use strict";
@@ -37233,7 +38793,7 @@ define("ember-views/system/ext",
     run._addQueue('render', 'actions');
     run._addQueue('afterRender', 'render');
   });
-define("ember-views/system/jquery",
+enifed("ember-views/system/jquery",
   ["ember-metal/core","ember-runtime/system/string","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -37254,8 +38814,8 @@ define("ember-views/system/jquery",
     */
 
     var jQuery = (Ember.imports && Ember.imports.jQuery) || (this && this.jQuery);
-    if (!jQuery && typeof require === 'function') {
-      jQuery = require('jquery');
+    if (!jQuery && typeof eriuqer === 'function') {
+      jQuery = eriuqer('jquery');
     }
 
     Ember.assert("Ember Views require jQuery between 1.7 and 2.1", jQuery && (jQuery().jquery.match(/^((1\.(7|8|9|10|11))|(2\.(0|1)))(\.\d+)?(pre|rc\d?)?/) || Ember.ENV.FORCE_JQUERY));
@@ -37277,31 +38837,74 @@ define("ember-views/system/jquery",
 
     __exports__["default"] = jQuery;
   });
-define("ember-views/system/render_buffer",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/system/utils","ember-views/system/jquery","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+enifed("ember-views/system/render_buffer",
+  ["ember-views/system/jquery","morph","ember-metal/core","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-views
     */
 
-    var Ember = __dependency1__["default"];
-    // jQuery
+    var jQuery = __dependency1__["default"];
+    var DOMHelper = __dependency2__.DOMHelper;
+    var Ember = __dependency3__["default"];
+    var create = __dependency4__.create;
 
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var setInnerHTML = __dependency4__.setInnerHTML;
-    var jQuery = __dependency5__["default"];
+    // The HTML spec allows for "omitted start tags". These tags are optional
+    // when their intended child is the first thing in the parent tag. For
+    // example, this is a tbody start tag:
+    //
+    // <table>
+    //   <tbody>
+    //     <tr>
+    //
+    // The tbody may be omitted, and the browser will accept and render:
+    //
+    // <table>
+    //   <tr>
+    //
+    // However, the omitted start tag will still be added to the DOM. Here
+    // we test the string and context to see if the browser is about to
+    // perform this cleanup, but with a special allowance for disregarding
+    // <script tags. This disregarding of <script being the first child item
+    // may bend the offical spec a bit, and is only needed for Handlebars
+    // templates.
+    //
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
+    // describes which tags are omittable. The spec for tbody and colgroup
+    // explains this behavior:
+    //
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
+    //
+    var omittedStartTagChildren = {
+      tr: document.createElement('tbody'),
+      col: document.createElement('colgroup')
+    };
+
+    var omittedStartTagChildTest = /(?:<script)*.*?<([\w:]+)/i;
+
+    function detectOmittedStartTag(string, contextualElement){
+      // Omitted start tags are only inside table tags.
+      if (contextualElement.tagName === 'TABLE') {
+        var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
+        if (omittedStartTagChildMatch) {
+          // It is already asserted that the contextual element is a table
+          // and not the proper start tag. Just look up the start tag.
+          return omittedStartTagChildren[omittedStartTagChildMatch[1].toLowerCase()];
+        }
+      }
+    }
 
     function ClassSet() {
-      this.seen = {};
+      this.seen = create(null);
       this.list = [];
     }
 
     ClassSet.prototype = {
       add: function(string) {
-        if (string in this.seen) { return; }
+        if (this.seen[string] === true) { return; }
         this.seen[string] = true;
 
         this.list.push(string);
@@ -37355,8 +38958,8 @@ define("ember-views/system/render_buffer",
     // From http://msdn.microsoft.com/en-us/library/ie/ms536389(v=vs.85).aspx:
     // "To include the NAME attribute at run time on objects created with the createElement method, use the eTag."
     var canSetNameOnInputs = (function() {
-      var div = document.createElement('div'),
-          el = document.createElement('input');
+      var div = document.createElement('div');
+      var el = document.createElement('input');
 
       el.setAttribute('name', 'foo');
       div.appendChild(el);
@@ -37365,34 +38968,51 @@ define("ember-views/system/render_buffer",
     })();
 
     /**
-      `Ember.RenderBuffer` gathers information regarding the view and generates the
-      final representation. `Ember.RenderBuffer` will generate HTML which can be pushed
+      `Ember.renderBuffer` gathers information regarding the view and generates the
+      final representation. `Ember.renderBuffer` will generate HTML which can be pushed
       to the DOM.
 
        ```javascript
-       var buffer = Ember.RenderBuffer('div');
+       var buffer = Ember.renderBuffer('div', contextualElement);
       ```
 
-      @class RenderBuffer
+      @method renderBuffer
       @namespace Ember
-      @constructor
       @param {String} tagName tag name (such as 'div' or 'p') used for the buffer
     */
-    __exports__["default"] = function RenderBuffer(tagName) {
-      return new _RenderBuffer(tagName); // jshint ignore:line
+    __exports__["default"] = function renderBuffer(tagName, contextualElement) {
+      return new _RenderBuffer(tagName, contextualElement); // jshint ignore:line
     }
 
-    function _RenderBuffer(tagName) {
-      this.tagNames = [tagName || null];
-      this.buffer = "";
+    function _RenderBuffer(tagName, contextualElement) {
+      this.tagName = tagName;
+      this._outerContextualElement = contextualElement;
+      this.buffer = null;
+      this.childViews = [];
+      this.dom = new DOMHelper();
     }
 
     _RenderBuffer.prototype = {
 
+      reset: function(tagName, contextualElement) {
+        this.tagName = tagName;
+        this.buffer = null;
+        this._element = null;
+        this._outerContextualElement = contextualElement;
+        this.elementClasses = null;
+        this.elementId = null;
+        this.elementAttributes = null;
+        this.elementProperties = null;
+        this.elementTag = null;
+        this.elementStyle = null;
+        this.childViews.length = 0;
+      },
+
       // The root view's element
       _element: null,
 
-      _hasElement: true,
+      // The root view's contextualElement
+      _outerContextualElement: null,
 
       /**
         An internal set used to de-dupe class names when `addClass()` is
@@ -37467,7 +39087,7 @@ define("ember-views/system/render_buffer",
         example, if you wanted to create a `p` tag, then you would call
 
         ```javascript
-        Ember.RenderBuffer('p')
+        Ember.RenderBuffer('p', contextualElement)
         ```
 
         @property elementTag
@@ -37491,6 +39111,37 @@ define("ember-views/system/render_buffer",
       */
       elementStyle: null,
 
+      pushChildView: function (view) {
+        var index = this.childViews.length;
+        this.childViews[index] = view;
+        this.push("<script id='morph-"+index+"' type='text/x-placeholder'>\x3C/script>");
+      },
+
+      hydrateMorphs: function (contextualElement) {
+        var childViews = this.childViews;
+        var el = this._element;
+        for (var i=0,l=childViews.length; i<l; i++) {
+          var childView = childViews[i];
+          var ref = el.querySelector('#morph-'+i);
+
+          Ember.assert('An error occured while setting up template bindings. Please check ' +
+                       (childView && childView._parentView && childView._parentView._debugTemplateName ?
+                            '"' + childView._parentView._debugTemplateName + '" template ' :
+                            ''
+                       )  + 'for invalid markup or bindings within HTML comments.',
+                       ref);
+
+          var parent = ref.parentNode;
+
+          childView._morph = this.dom.insertMorphBefore(
+            parent,
+            ref,
+            parent.nodeType === 1 ? parent : contextualElement
+          );
+          parent.removeChild(ref);
+        }
+      },
+
       /**
         Adds a string of HTML to the `RenderBuffer`.
 
@@ -37498,8 +39149,11 @@ define("ember-views/system/render_buffer",
         @param {String} string HTML to push into the buffer
         @chainable
       */
-      push: function(string) {
-        this.buffer += string;
+      push: function(content) {
+        if (this.buffer === null) {
+          this.buffer = '';
+        }
+        this.buffer += content;
         return this;
       },
 
@@ -37521,7 +39175,8 @@ define("ember-views/system/render_buffer",
 
       setClasses: function(classNames) {
         this.elementClasses = null;
-        var len = classNames.length, i;
+        var len = classNames.length;
+        var i;
         for (i = 0; i < len; i++) {
           this.addClass(classNames[i]);
         }
@@ -37627,102 +39282,15 @@ define("ember-views/system/render_buffer",
         return this;
       },
 
-      begin: function(tagName) {
-        this.tagNames.push(tagName || null);
-        return this;
-      },
-
-      pushOpeningTag: function() {
-        var tagName = this.currentTagName();
-        if (!tagName) { return; }
-
-        if (this._hasElement && !this._element && this.buffer.length === 0) {
-          this._element = this.generateElement();
-          return;
-        }
-
-        var buffer = this.buffer,
-            id = this.elementId,
-            classes = this.classes,
-            attrs = this.elementAttributes,
-            props = this.elementProperties,
-            style = this.elementStyle,
-            attr, prop;
-
-        buffer += '<' + stripTagName(tagName);
-
-        if (id) {
-          buffer += ' id="' + escapeAttribute(id) + '"';
-          this.elementId = null;
-        }
-        if (classes) {
-          buffer += ' class="' + escapeAttribute(classes.join(' ')) + '"';
-          this.classes = null;
-          this.elementClasses = null;
-        }
-
-        if (style) {
-          buffer += ' style="';
-
-          for (prop in style) {
-            if (style.hasOwnProperty(prop)) {
-              buffer += prop + ':' + escapeAttribute(style[prop]) + ';';
-            }
-          }
-
-          buffer += '"';
-
-          this.elementStyle = null;
-        }
-
-        if (attrs) {
-          for (attr in attrs) {
-            if (attrs.hasOwnProperty(attr)) {
-              buffer += ' ' + attr + '="' + escapeAttribute(attrs[attr]) + '"';
-            }
-          }
-
-          this.elementAttributes = null;
-        }
-
-        if (props) {
-          for (prop in props) {
-            if (props.hasOwnProperty(prop)) {
-              var value = props[prop];
-              if (value || typeof(value) === 'number') {
-                if (value === true) {
-                  buffer += ' ' + prop + '="' + prop + '"';
-                } else {
-                  buffer += ' ' + prop + '="' + escapeAttribute(props[prop]) + '"';
-                }
-              }
-            }
-          }
-
-          this.elementProperties = null;
-        }
-
-        buffer += '>';
-        this.buffer = buffer;
-      },
-
-      pushClosingTag: function() {
-        var tagName = this.tagNames.pop();
-        if (tagName) { this.buffer += '</' + stripTagName(tagName) + '>'; }
-      },
-
-      currentTagName: function() {
-        return this.tagNames[this.tagNames.length-1];
-      },
-
       generateElement: function() {
-        var tagName = this.tagNames.pop(), // pop since we don't need to close
-            id = this.elementId,
-            classes = this.classes,
-            attrs = this.elementAttributes,
-            props = this.elementProperties,
-            style = this.elementStyle,
-            styleBuffer = '', attr, prop, tagString;
+        var tagName = this.tagName;
+        var id = this.elementId;
+        var classes = this.classes;
+        var attrs = this.elementAttributes;
+        var props = this.elementProperties;
+        var style = this.elementStyle;
+        var styleBuffer = '';
+        var attr, prop, tagString;
 
         if (attrs && attrs.name && !canSetNameOnInputs) {
           // IE allows passing a tag to createElement. See note on `canSetNameOnInputs` above as well.
@@ -37731,15 +39299,15 @@ define("ember-views/system/render_buffer",
           tagString = tagName;
         }
 
-        var element = document.createElement(tagString),
-            $element = jQuery(element);
+        var element = this.dom.createElement(tagString, this.outerContextualElement());
+        var $element = jQuery(element);
 
         if (id) {
-          $element.attr('id', id);
+          this.dom.setAttribute(element, 'id', id);
           this.elementId = null;
         }
         if (classes) {
-          $element.attr('class', classes.join(' '));
+          this.dom.setAttribute(element, 'class', classes.join(' '));
           this.classes = null;
           this.elementClasses = null;
         }
@@ -37751,7 +39319,7 @@ define("ember-views/system/render_buffer",
             }
           }
 
-          $element.attr('style', styleBuffer);
+          this.dom.setAttribute(element, 'style', styleBuffer);
 
           this.elementStyle = null;
         }
@@ -37759,7 +39327,7 @@ define("ember-views/system/render_buffer",
         if (attrs) {
           for (attr in attrs) {
             if (attrs.hasOwnProperty(attr)) {
-              $element.attr(attr, attrs[attr]);
+              this.dom.setAttribute(element, attr, attrs[attr]);
             }
           }
 
@@ -37776,7 +39344,7 @@ define("ember-views/system/render_buffer",
           this.elementProperties = null;
         }
 
-        return element;
+        this._element = element;
       },
 
       /**
@@ -37785,12 +39353,26 @@ define("ember-views/system/render_buffer",
           of this buffer
       */
       element: function() {
-        var html = this.innerString();
-
-        if (html) {
-          this._element = setInnerHTML(this._element, html);
+        var content = this.innerContent();
+        // No content means a text node buffer, with the content
+        // in _element. HandlebarsBoundView is an example.
+        if (content === null)  {
+          return this._element;
         }
 
+        var contextualElement = this.innerContextualElement(content);
+        this.dom.detectNamespace(contextualElement);
+
+        if (!this._element) {
+          this._element = document.createDocumentFragment();
+        }
+
+        var nodes = this.dom.parseHTML(content, contextualElement);
+        while (nodes[0]) {
+          this._element.appendChild(nodes[0]);
+        }
+        this.hydrateMorphs(contextualElement);
+
         return this._element;
       },
 
@@ -37801,9 +39383,10 @@ define("ember-views/system/render_buffer",
         @return {String} The generated HTML
       */
       string: function() {
-        if (this._hasElement && this._element) {
+        if (this._element) {
           // Firefox versions < 11 do not have support for element.outerHTML.
-          var thisElement = this.element(), outerHTML = thisElement.outerHTML;
+          var thisElement = this.element();
+          var outerHTML = thisElement.outerHTML;
           if (typeof outerHTML === 'undefined') {
             return jQuery('<div/>').append(thisElement).html();
           }
@@ -37813,157 +39396,236 @@ define("ember-views/system/render_buffer",
         }
       },
 
+      outerContextualElement: function() {
+        if (!this._outerContextualElement) {
+          Ember.deprecate("The render buffer expects an outer contextualElement to exist." +
+                          " This ensures DOM that requires context is correctly generated (tr, SVG tags)." +
+                          " Defaulting to document.body, but this will be removed in the future");
+          this.outerContextualElement = document.body;
+        }
+        return this._outerContextualElement;
+      },
+
+      innerContextualElement: function(html) {
+        var innerContextualElement;
+        if (this._element && this._element.nodeType === 1) {
+          innerContextualElement = this._element;
+        } else {
+          innerContextualElement = this.outerContextualElement();
+        }
+
+        var omittedStartTag;
+        if (html) {
+          omittedStartTag = detectOmittedStartTag(html, innerContextualElement);
+        }
+        return omittedStartTag || innerContextualElement;
+      },
+
       innerString: function() {
+        var content = this.innerContent();
+        if (content && !content.nodeType) {
+          return content;
+        }
+      },
+
+      innerContent: function() {
         return this.buffer;
       }
     };
   });
-define("ember-views/system/utils",
-  ["ember-metal/core","exports"],
-  function(__dependency1__, __exports__) {
+enifed("ember-views/system/renderer",
+  ["ember-metal/core","ember-metal-views/renderer","ember-metal/platform","ember-views/system/render_buffer","ember-metal/run_loop","ember-metal/property_set","ember-metal/instrumentation","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
-    /* globals XMLSerializer */
-
     var Ember = __dependency1__["default"];
-    // Ember.assert
+    var Renderer = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var renderBuffer = __dependency4__["default"];
+    var run = __dependency5__["default"];
+    var set = __dependency6__.set;
+    var _instrumentStart = __dependency7__._instrumentStart;
+    var subscribers = __dependency7__.subscribers;
 
+    function EmberRenderer() {
+      this.buffer = renderBuffer();
+      Renderer.call(this);
+    }
+    EmberRenderer.prototype = create(Renderer.prototype);
+    EmberRenderer.prototype.constructor = EmberRenderer;
+
+    var BAD_TAG_NAME_TEST_REGEXP = /[^a-zA-Z0-9\-]/;
+    var BAD_TAG_NAME_REPLACE_REGEXP = /[^a-zA-Z0-9\-]/g;
+
+    function stripTagName(tagName) {
+      if (!tagName) {
+        return tagName;
+      }
+
+      if (!BAD_TAG_NAME_TEST_REGEXP.test(tagName)) {
+        return tagName;
+      }
+
+      return tagName.replace(BAD_TAG_NAME_REPLACE_REGEXP, '');
+    }
+
+    EmberRenderer.prototype.scheduleRender =
+      function EmberRenderer_scheduleRender(ctx, fn) {
+        return run.scheduleOnce('render', ctx, fn);
+      };
+
+    EmberRenderer.prototype.cancelRender =
+      function EmberRenderer_cancelRender(id) {
+        run.cancel(id);
+      };
+
+    EmberRenderer.prototype.createChildViewsMorph =
+      function EmberRenderer_createChildViewsMorph(view, _element) {
+        if (view.createChildViewsMorph) {
+          return view.createChildViewsMorph(_element);
+        }
+        var element = _element;
+        if (view.tagName === '') {
+          if (view._morph) {
+            view._childViewsMorph = view._morph;
+          } else {
+            element = document.createDocumentFragment();
+            view._childViewsMorph = this._dom.appendMorph(element);
+          }
+        } else {
+          view._childViewsMorph = this._dom.createMorph(element, element.lastChild, null);
+        }
+        return element;
+      };
+
+    EmberRenderer.prototype.createElement =
+      function EmberRenderer_createElement(view, contextualElement) {
+        // If this is the top-most view, start a new buffer. Otherwise,
+        // create a new buffer relative to the original using the
+        // provided buffer operation (for example, `insertAfter` will
+        // insert a new buffer after the "parent buffer").
+        var tagName = view.tagName;
+        var classNameBindings = view.classNameBindings;
+        var taglessViewWithClassBindings = tagName === '' && classNameBindings.length > 0;
+
+        if (tagName === null || tagName === undefined) {
+          tagName = 'div';
+        }
+
+        Ember.assert('You cannot use `classNameBindings` on a tag-less view: ' + view.toString(), !taglessViewWithClassBindings);
+
+        var buffer = view.buffer = this.buffer;
+        buffer.reset(tagName, contextualElement);
+
+        if (view.beforeRender) {
+          view.beforeRender(buffer);
+        }
+
+        if (tagName !== '') {
+          if (view.applyAttributesToBuffer) {
+            view.applyAttributesToBuffer(buffer);
+          }
+          buffer.generateElement();
+        }
+
+        if (view.render) {
+          view.render(buffer);
+        }
+
+        if (view.afterRender) {
+          view.afterRender(buffer);
+        }
+
+        var element = buffer.element();
+
+        if (view.isContainer) {
+          this.createChildViewsMorph(view, element);
+        }
+
+        view.buffer = null;
+        if (element && element.nodeType === 1) {
+          // We have hooks, we shouldn't make element observable
+          // consider just doing view.element = element
+          set(view, 'element', element);
+        }
+        return element;
+      };
+
+    EmberRenderer.prototype.destroyView = function destroyView(view) {
+      view.removedFromDOM = true;
+      view.destroy();
+    };
+
+    EmberRenderer.prototype.childViews = function childViews(view) {
+      return view._childViews;
+    };
+
+    Renderer.prototype.willCreateElement = function (view) {
+      if (subscribers.length && view.instrumentDetails) {
+        view._instrumentEnd = _instrumentStart('render.'+view.instrumentName, function viewInstrumentDetails() {
+          var details = {};
+          view.instrumentDetails(details);
+          return details;
+        });
+      }
+      if (view._transitionTo) {
+        view._transitionTo('inBuffer');
+      }
+    }; // inBuffer
+    Renderer.prototype.didCreateElement = function (view) {
+      if (view._transitionTo) {
+        view._transitionTo('hasElement');
+      }
+      if (view._instrumentEnd) {
+        view._instrumentEnd();
+      }
+    }; // hasElement
+    Renderer.prototype.willInsertElement = function (view) {
+      if (view.trigger) { view.trigger('willInsertElement'); }
+    }; // will place into DOM
+    Renderer.prototype.didInsertElement = function (view) {
+      if (view._transitionTo) {
+        view._transitionTo('inDOM');
+      }
+      if (view.trigger) { view.trigger('didInsertElement'); }
+    }; // inDOM // placed into DOM
+
+    Renderer.prototype.willRemoveElement = function (view) {};
+
+    Renderer.prototype.willDestroyElement = function (view) {
+      if (view.trigger) { view.trigger('willDestroyElement'); }
+      if (view.trigger) { view.trigger('willClearRender'); }
+    };
+
+    Renderer.prototype.didDestroyElement = function (view) {
+      set(view, 'element', null);
+      if (view._transitionTo) {
+        view._transitionTo('preRender');
+      }
+    }; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
+
+    __exports__["default"] = EmberRenderer;
+  });
+enifed("ember-views/system/utils",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
     /**
     @module ember
     @submodule ember-views
     */
 
-    /* BEGIN METAMORPH HELPERS */
-
-    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
-    // is a "zero-scope" element. This problem can be worked around by making
-    // the first node an invisible text node. We, like Modernizr, use &shy;
-
-    var needsShy = typeof document !== 'undefined' && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "<div></div>";
-      testEl.firstChild.innerHTML = "<script></script>";
-      return testEl.firstChild.innerHTML === '';
-    })();
-
-    // IE 8 (and likely earlier) likes to move whitespace preceeding
-    // a script tag to appear after it. This means that we can
-    // accidentally remove whitespace when updating a morph.
-    var movesWhitespace = typeof document !== 'undefined' && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
-      return testEl.childNodes[0].nodeValue === 'Test:' &&
-              testEl.childNodes[2].nodeValue === ' Value';
-    })();
-
-    // Use this to find children by ID instead of using jQuery
-    var findChildById = function(element, id) {
-      if (element.getAttribute('id') === id) { return element; }
-
-      var len = element.childNodes.length, idx, node, found;
-      for (idx=0; idx<len; idx++) {
-        node = element.childNodes[idx];
-        found = node.nodeType === 1 && findChildById(node, id);
-        if (found) { return found; }
-      }
-    };
-
-    var setInnerHTMLWithoutFix = function(element, html) {
-      if (needsShy) {
-        html = '&shy;' + html;
-      }
-
-      var matches = [];
-      if (movesWhitespace) {
-        // Right now we only check for script tags with ids with the
-        // goal of targeting morphs.
-        html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
-          matches.push([id, spaces]);
-          return tag;
-        });
-      }
-
-      element.innerHTML = html;
-
-      // If we have to do any whitespace adjustments do them now
-      if (matches.length > 0) {
-        var len = matches.length, idx;
-        for (idx=0; idx<len; idx++) {
-          var script = findChildById(element, matches[idx][0]),
-              node = document.createTextNode(matches[idx][1]);
-          script.parentNode.insertBefore(node, script);
-        }
-      }
-
-      if (needsShy) {
-        var shyElement = element.firstChild;
-        while (shyElement.nodeType === 1 && !shyElement.nodeName) {
-          shyElement = shyElement.firstChild;
-        }
-        if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
-          shyElement.nodeValue = shyElement.nodeValue.slice(1);
-        }
-      }
-    };
-
-    /* END METAMORPH HELPERS */
-
-
-    var innerHTMLTags = {};
-    var canSetInnerHTML = function(tagName) {
-      if (innerHTMLTags[tagName] !== undefined) {
-        return innerHTMLTags[tagName];
-      }
-
-      var canSet = true;
-
-      // IE 8 and earlier don't allow us to do innerHTML on select
-      if (tagName.toLowerCase() === 'select') {
-        var el = document.createElement('select');
-        setInnerHTMLWithoutFix(el, '<option value="test">Test</option>');
-        canSet = el.options.length === 1;
-      }
-
-      innerHTMLTags[tagName] = canSet;
-
-      return canSet;
-    };
-
-    function setInnerHTML(element, html) {
-      var tagName = element.tagName;
-
-      if (canSetInnerHTML(tagName)) {
-        setInnerHTMLWithoutFix(element, html);
-      } else {
-        // Firefox versions < 11 do not have support for element.outerHTML.
-        var outerHTML = element.outerHTML || new XMLSerializer().serializeToString(element);
-        Ember.assert("Can't set innerHTML on "+element.tagName+" in this browser", outerHTML);
-
-        var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0],
-            endTag = '</'+tagName+'>';
-
-        var wrapper = document.createElement('div');
-        setInnerHTMLWithoutFix(wrapper, startTag + html + endTag);
-        element = wrapper.firstChild;
-        while (element.tagName !== tagName) {
-          element = element.nextSibling;
-        }
-      }
-
-      return element;
-    }
-
-    __exports__.setInnerHTML = setInnerHTML;function isSimpleClick(event) {
-      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey,
-          secondaryClick = event.which > 1; // IE9 may return undefined
+    function isSimpleClick(event) {
+      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
+      var secondaryClick = event.which > 1; // IE9 may return undefined
 
       return !modifier && !secondaryClick;
     }
 
     __exports__.isSimpleClick = isSimpleClick;
   });
-define("ember-views/views/collection_view",
-  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-runtime/mixins/array","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+enifed("ember-views/views/collection_view",
+  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-handlebars/ext","ember-runtime/mixins/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
 
     /**
@@ -37984,7 +39646,8 @@ define("ember-views/views/collection_view",
     var View = __dependency10__["default"];
     var observer = __dependency11__.observer;
     var beforeObserver = __dependency11__.beforeObserver;
-    var EmberArray = __dependency12__["default"];
+    var handlebarsGetView = __dependency12__.handlebarsGetView;
+    var EmberArray = __dependency13__["default"];
 
     /**
       `Ember.CollectionView` is an `Ember.View` descendent responsible for managing
@@ -38007,27 +39670,32 @@ define("ember-views/views/collection_view",
       The view for each item in the collection will have its `content` property set
       to the item.
 
-      ## Specifying itemViewClass
+      ## Specifying `itemViewClass`
 
       By default the view class for each item in the managed collection will be an
       instance of `Ember.View`. You can supply a different class by setting the
       `CollectionView`'s `itemViewClass` property.
 
-      Given an empty `<body>` and the following code:
+      Given the following application code:
 
       ```javascript
-      someItemsView = Ember.CollectionView.create({
+      var App = Ember.Application.create();
+      App.ItemListView = Ember.CollectionView.extend({
         classNames: ['a-collection'],
         content: ['A','B','C'],
         itemViewClass: Ember.View.extend({
           template: Ember.Handlebars.compile("the letter: {{view.content}}")
         })
       });
-
-      someItemsView.appendTo('body');
       ```
 
-      Will result in the following HTML structure
+      And a simple application template:
+
+      ```handlebars
+      {{view 'item-list'}}
+      ```
+
+      The following HTML will result:
 
       ```html
       <div class="ember-view a-collection">
@@ -38043,21 +39711,26 @@ define("ember-views/views/collection_view",
       "ul", "ol", "table", "thead", "tbody", "tfoot", "tr", or "select" will result
       in the item views receiving an appropriately matched `tagName` property.
 
-      Given an empty `<body>` and the following code:
+      Given the following application code:
 
       ```javascript
-      anUnorderedListView = Ember.CollectionView.create({
+      var App = Ember.Application.create();
+      App.UnorderedListView = Ember.CollectionView.create({
         tagName: 'ul',
         content: ['A','B','C'],
         itemViewClass: Ember.View.extend({
           template: Ember.Handlebars.compile("the letter: {{view.content}}")
         })
       });
-
-      anUnorderedListView.appendTo('body');
       ```
 
-      Will result in the following HTML structure
+      And a simple application template:
+
+      ```handlebars
+      {{view 'unordered-list-view'}}
+      ```
+
+      The following HTML will result:
 
       ```html
       <ul class="ember-view a-collection">
@@ -38068,7 +39741,7 @@ define("ember-views/views/collection_view",
       ```
 
       Additional `tagName` pairs can be provided by adding to
-      `Ember.CollectionView.CONTAINER_MAP `
+      `Ember.CollectionView.CONTAINER_MAP`. For example:
 
       ```javascript
       Ember.CollectionView.CONTAINER_MAP['article'] = 'section'
@@ -38081,7 +39754,7 @@ define("ember-views/views/collection_view",
       `createChildView` method can be overidden:
 
       ```javascript
-      CustomCollectionView = Ember.CollectionView.extend({
+      App.CustomCollectionView = Ember.CollectionView.extend({
         createChildView: function(viewClass, attrs) {
           if (attrs.content.kind == 'album') {
             viewClass = App.AlbumView;
@@ -38101,18 +39774,23 @@ define("ember-views/views/collection_view",
       will be the `CollectionView`s only child.
 
       ```javascript
-      aListWithNothing = Ember.CollectionView.create({
-        classNames: ['nothing']
+      var App = Ember.Application.create();
+      App.ListWithNothing = Ember.CollectionView.create({
+        classNames: ['nothing'],
         content: null,
         emptyView: Ember.View.extend({
           template: Ember.Handlebars.compile("The collection is empty")
         })
       });
-
-      aListWithNothing.appendTo('body');
       ```
 
-      Will result in the following HTML structure
+      And a simple application template:
+
+      ```handlebars
+      {{view 'list-with-nothing'}}
+      ```
+
+      The following HTML will result:
 
       ```html
       <div class="ember-view nothing">
@@ -38270,18 +39948,8 @@ define("ember-views/views/collection_view",
         // Loop through child views that correspond with the removed items.
         // Note that we loop from the end of the array to the beginning because
         // we are mutating it as we go.
-        var childViews = this._childViews, childView, idx, len;
-
-        len = this._childViews.length;
-
-        var removingAll = removedCount === len;
-
-        if (removingAll) {
-          this.currentState.empty(this);
-          this.invokeRecursively(function(view) {
-            view.removedFromDOM = true;
-          }, false);
-        }
+        var childViews = this._childViews;
+        var childView, idx;
 
         for (idx = start + removedCount - 1; idx >= start; idx--) {
           childView = childViews[idx];
@@ -38304,21 +39972,14 @@ define("ember-views/views/collection_view",
         @param {Number} added number of object added to content
       */
       arrayDidChange: function(content, start, removed, added) {
-        var addedViews = [], view, item, idx, len, itemViewClass,
-          emptyView;
+        var addedViews = [];
+        var view, item, idx, len, itemViewClass, emptyView;
 
         len = content ? get(content, 'length') : 0;
 
         if (len) {
           itemViewClass = get(this, 'itemViewClass');
-
-          if ('string' === typeof itemViewClass && isGlobalPath(itemViewClass)) {
-            itemViewClass = get(itemViewClass) || itemViewClass;
-          }
-
-          Ember.assert(fmt("itemViewClass must be a subclass of Ember.View, not %@",
-                           [itemViewClass]),
-                           'string' === typeof itemViewClass || View.detect(itemViewClass));
+          itemViewClass = handlebarsGetView(content, itemViewClass, this.container);
 
           for (idx = start; idx < start+added; idx++) {
             item = content.objectAt(idx);
@@ -38403,7 +40064,7 @@ define("ember-views/views/collection_view",
 
     __exports__["default"] = CollectionView;
   });
-define("ember-views/views/component",
+enifed("ember-views/views/component",
   ["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -38553,8 +40214,8 @@ define("ember-views/views/component",
       template: computed(function(key, value) {
         if (value !== undefined) { return value; }
 
-        var templateName = get(this, 'templateName'),
-            template = this.templateForName(templateName, 'template');
+        var templateName = get(this, 'templateName');
+        var template = this.templateForName(templateName, 'template');
 
         Ember.assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || template);
 
@@ -38579,9 +40240,9 @@ define("ember-views/views/component",
       },
 
       _yield: function(context, options) {
-        var view = options.data.view,
-            parentView = this._parentView,
-            template = get(this, 'template');
+        var view = options.data.view;
+        var parentView = this._parentView;
+        var template = get(this, 'template');
 
         if (template) {
           Ember.assert("A Component must have a parent view in order to yield.", parentView);
@@ -38692,8 +40353,8 @@ define("ember-views/views/component",
         @param [context] {*} a context to send with the action
       */
       sendAction: function(action) {
-        var actionName,
-            contexts = a_slice.call(arguments, 1);
+        var actionName;
+        var contexts = a_slice.call(arguments, 1);
 
         // Send the default action
         if (action === undefined) {
@@ -38721,9 +40382,9 @@ define("ember-views/views/component",
 
     __exports__["default"] = Component;
   });
-define("ember-views/views/container_view",
-  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/view_collection","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
+enifed("ember-views/views/container_view",
+  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert, Ember.K
@@ -38734,22 +40395,21 @@ define("ember-views/views/container_view",
     var set = __dependency5__.set;
 
     var View = __dependency6__["default"];
-    var ViewCollection = __dependency7__["default"];
 
-    var cloneStates = __dependency8__.cloneStates;
-    var EmberViewStates = __dependency8__.states;
+    var cloneStates = __dependency7__.cloneStates;
+    var EmberViewStates = __dependency7__.states;
 
-    var EmberError = __dependency9__["default"];
+    var EmberError = __dependency8__["default"];
 
-    var forEach = __dependency10__.forEach;
+    var forEach = __dependency9__.forEach;
 
-    var computed = __dependency11__.computed;
-    var run = __dependency12__["default"];
-    var defineProperty = __dependency13__.defineProperty;
-    var renderBuffer = __dependency14__["default"];
-    var observer = __dependency15__.observer;
-    var beforeObserver = __dependency15__.beforeObserver;
-    var emberA = __dependency16__.A;
+    var computed = __dependency10__.computed;
+    var run = __dependency11__["default"];
+    var defineProperty = __dependency12__.defineProperty;
+    var renderBuffer = __dependency13__["default"];
+    var observer = __dependency14__.observer;
+    var beforeObserver = __dependency14__.beforeObserver;
+    var emberA = __dependency15__.A;
 
     /**
     @module ember
@@ -38909,6 +40569,7 @@ define("ember-views/views/container_view",
       @extends Ember.View
     */
     var ContainerView = View.extend(MutableArray, {
+      isContainer: true,
       _states: states,
 
       willWatchProperty: function(prop){
@@ -38987,9 +40648,6 @@ define("ember-views/views/container_view",
         @param {Ember.RenderBuffer} buffer the buffer to render to
       */
       render: function(buffer) {
-        this.forEachChildView(function(view) {
-          view.renderToBuffer(buffer);
-        });
       },
 
       instrumentName: 'container',
@@ -39108,69 +40766,40 @@ define("ember-views/views/container_view",
       },
 
       ensureChildrenAreInDOM: function(view) {
-        var childViews = view._childViews, i, len, childView, previous, buffer, viewCollection = new ViewCollection();
+        var childViews = view._childViews;
+        var renderer = view._renderer;
 
+        var i, len, childView;
         for (i = 0, len = childViews.length; i < len; i++) {
           childView = childViews[i];
-
-          if (!buffer) { buffer = renderBuffer(); buffer._hasElement = false; }
-
-          if (childView.renderToBufferIfNeeded(buffer)) {
-            viewCollection.push(childView);
-          } else if (viewCollection.length) {
-            insertViewCollection(view, viewCollection, previous, buffer);
-            buffer = null;
-            previous = childView;
-            viewCollection.clear();
-          } else {
-            previous = childView;
+          if (!childView._elementCreated) {
+            renderer.renderTree(childView, view, i);
           }
         }
-
-        if (viewCollection.length) {
-          insertViewCollection(view, viewCollection, previous, buffer);
-        }
       }
     });
 
-    function insertViewCollection(view, viewCollection, previous, buffer) {
-      viewCollection.triggerRecursively('willInsertElement');
-
-      if (previous) {
-        previous.domManager.after(previous, buffer.string());
-      } else {
-        view.domManager.prepend(view, buffer.string());
-      }
-
-      viewCollection.forEach(function(v) {
-        v._transitionTo('inDOM');
-        v.propertyDidChange('element');
-        v.triggerRecursively('didInsertElement');
-      });
-    }
-
-
     __exports__["default"] = ContainerView;
   });
-define("ember-views/views/core_view",
-  ["ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","ember-views/system/render_buffer","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+enifed("ember-views/views/core_view",
+  ["ember-views/system/renderer","ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
-    var cloneStates = __dependency1__.cloneStates;
-    var states = __dependency1__.states;
-    var EmberObject = __dependency2__["default"];
-    var Evented = __dependency3__["default"];
-    var ActionHandler = __dependency4__["default"];
+    var Rerender = __dependency1__["default"];
 
-    var get = __dependency5__.get;
-    var computed = __dependency6__.computed;
+    var cloneStates = __dependency2__.cloneStates;
+    var states = __dependency2__.states;
+    var EmberObject = __dependency3__["default"];
+    var Evented = __dependency4__["default"];
+    var ActionHandler = __dependency5__["default"];
 
-    var typeOf = __dependency7__.typeOf;
+    var get = __dependency6__.get;
+    var set = __dependency7__.set;
+    var computed = __dependency8__.computed;
 
-    var instrument = __dependency8__.instrument;
+    var typeOf = __dependency9__.typeOf;
 
-
-    var renderBuffer = __dependency9__["default"];
+    var instrument = __dependency10__.instrument;
 
     /**
       `Ember.CoreView` is an abstract class that exists to give view-like behavior
@@ -39189,6 +40818,8 @@ define("ember-views/views/core_view",
     */
     var CoreView = EmberObject.extend(Evented, ActionHandler, {
       isView: true,
+      isVirtual: false,
+      isContainer: false,
 
       _states: cloneStates(states),
 
@@ -39234,55 +40865,6 @@ define("ember-views/views/core_view",
         hash.view = this;
       },
 
-      /**
-        Invoked by the view system when this view needs to produce an HTML
-        representation. This method will create a new render buffer, if needed,
-        then apply any default attributes, such as class names and visibility.
-        Finally, the `render()` method is invoked, which is responsible for
-        doing the bulk of the rendering.
-
-        You should not need to override this method; instead, implement the
-        `template` property, or if you need more control, override the `render`
-        method.
-
-        @method renderToBuffer
-        @param {Ember.RenderBuffer} buffer the render buffer. If no buffer is
-          passed, a default buffer, using the current view's `tagName`, will
-          be used.
-        @private
-      */
-      renderToBuffer: function(buffer) {
-        var name = 'render.' + this.instrumentName,
-            details = {};
-
-        this.instrumentDetails(details);
-
-        return instrument(name, details, function instrumentRenderToBuffer() {
-          return this._renderToBuffer(buffer);
-        }, this);
-      },
-
-      _renderToBuffer: function(_buffer) {
-        // If this is the top-most view, start a new buffer. Otherwise,
-        // create a new buffer relative to the original using the
-        // provided buffer operation (for example, `insertAfter` will
-        // insert a new buffer after the "parent buffer").
-        var tagName = this.tagName;
-
-        if (tagName === null || tagName === undefined) {
-          tagName = 'div';
-        }
-
-        var buffer = this.buffer = _buffer && _buffer.begin(tagName) || renderBuffer(tagName);
-        this._transitionTo('inBuffer', false);
-
-        this.beforeRender(buffer);
-        this.render(buffer);
-        this.afterRender(buffer);
-
-        return buffer;
-      },
-
       /**
         Override the default event firing from `Ember.Evented` to
         also call methods with the given name.
@@ -39305,18 +40887,6 @@ define("ember-views/views/core_view",
         }
       },
 
-      deprecatedSendHandles: function(actionName) {
-        return !!this[actionName];
-      },
-
-      deprecatedSend: function(actionName) {
-        var args = [].slice.call(arguments, 1);
-        Ember.assert('' + this + " has the action " + actionName + " but it is not a function", typeof this[actionName] === 'function');
-        Ember.deprecate('Action handlers implemented directly on views are deprecated in favor of action handlers on an `actions` object ( action: `' + actionName + '` on ' + this + ')', false);
-        this[actionName].apply(this, args);
-        return;
-      },
-
       has: function(name) {
         return typeOf(this[name]) === 'function' || this._super(name);
       },
@@ -39326,9 +40896,12 @@ define("ember-views/views/core_view",
 
         if (!this._super()) { return; }
 
+
         // destroy the element -- this will avoid each child view destroying
         // the element over and over again...
-        if (!this.removedFromDOM) { this.destroyElement(); }
+        if (!this.removedFromDOM && this._renderer) {
+          this._renderer.remove(this, true);
+        }
 
         // remove from parent if found. Don't call removeFromParent,
         // as removeFromParent will try to remove the element from
@@ -39341,15 +40914,17 @@ define("ember-views/views/core_view",
       },
 
       clearRenderedChildren: Ember.K,
-      triggerRecursively: Ember.K,
-      invokeRecursively: Ember.K,
       _transitionTo: Ember.K,
       destroyElement: Ember.K
     });
 
+    CoreView.reopenClass({
+      renderer: new Rerender()
+    });
+
     __exports__["default"] = CoreView;
   });
-define("ember-views/views/states",
+enifed("ember-views/views/states",
   ["ember-metal/platform","ember-metal/merge","ember-views/views/states/default","ember-views/views/states/pre_render","ember-views/views/states/in_buffer","ember-views/views/states/has_element","ember-views/views/states/in_dom","ember-views/views/states/destroying","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -39390,7 +40965,7 @@ define("ember-views/views/states",
     };
     __exports__.states = states;
   });
-define("ember-views/views/states/default",
+enifed("ember-views/views/states/default",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -39425,23 +41000,16 @@ define("ember-views/views/states/default",
       },
 
       destroyElement: function(view) {
-        set(view, 'element', null);
-        if (view._scheduledInsert) {
-          run.cancel(view._scheduledInsert);
-          view._scheduledInsert = null;
-        }
+        if (view._renderer)
+          view._renderer.remove(view, false);
         return view;
       },
 
-      renderToBufferIfNeeded: function () {
-        return false;
-      },
-
       rerender: Ember.K,
       invokeObserver: Ember.K
     };
   });
-define("ember-views/views/states/destroying",
+enifed("ember-views/views/states/destroying",
   ["ember-metal/merge","ember-metal/platform","ember-runtime/system/string","ember-views/views/states/default","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -39468,27 +41036,12 @@ define("ember-views/views/states/destroying",
       },
       destroyElement: function() {
         throw new EmberError(fmt(destroyingError, ['destroyElement']));
-      },
-      empty: function() {
-        throw new EmberError(fmt(destroyingError, ['empty']));
-      },
-
-      setElement: function() {
-        throw new EmberError(fmt(destroyingError, ["set('element', ...)"]));
-      },
-
-      renderToBufferIfNeeded: function() {
-        return false;
-      },
-
-      // Since element insertion is scheduled, don't do anything if
-      // the view has been destroyed between scheduling and execution
-      insertElement: Ember.K
+      }
     });
 
     __exports__["default"] = destroying;
   });
-define("ember-views/views/states/has_element",
+enifed("ember-views/views/states/has_element",
   ["ember-views/views/states/default","ember-metal/run_loop","ember-metal/merge","ember-metal/platform","ember-views/system/jquery","ember-metal/error","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -39511,7 +41064,7 @@ define("ember-views/views/states/has_element",
 
     merge(hasElement, {
       $: function(view, sel) {
-        var elem = get(view, 'element');
+        var elem = view.get('concreteView').element;
         return sel ? jQuery(sel, elem) : jQuery(elem);
       },
 
@@ -39522,25 +41075,17 @@ define("ember-views/views/states/has_element",
         return jQuery("#" + get(view, 'elementId'))[0];
       },
 
-      setElement: function(view, value) {
-        if (value === null) {
-          view._transitionTo('preRender');
-        } else {
-          throw new EmberError("You cannot set an element to a non-null value when the element is already in the DOM.");
-        }
-
-        return value;
-      },
-
       // once the view has been inserted into the DOM, rerendering is
       // deferred to allow bindings to synchronize.
       rerender: function(view) {
-        view.triggerRecursively('willClearRender');
-
-        view.clearRenderedChildren();
-
-        view.domManager.replace(view);
-        return view;
+        if (view._root._morph && !view._elementInserted) {
+          throw new EmberError("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.");
+        }
+        // TODO: should be scheduled with renderer
+        run.scheduleOnce('render', function () {
+          if (view.isDestroying) return;
+          view._renderer.renderTree(view, view._parentView);
+        });
       },
 
       // once the view is already in the DOM, destroying it removes it
@@ -39548,27 +41093,10 @@ define("ember-views/views/states/has_element",
       // preRender state if inDOM.
 
       destroyElement: function(view) {
-        view._notifyWillDestroyElement();
-        view.domManager.remove(view);
-        set(view, 'element', null);
-        if (view._scheduledInsert) {
-          run.cancel(view._scheduledInsert);
-          view._scheduledInsert = null;
-        }
+        view._renderer.remove(view, false);
         return view;
       },
 
-      empty: function(view) {
-        var _childViews = view._childViews, len, idx;
-        if (_childViews) {
-          len = _childViews.length;
-          for (idx = 0; idx < len; idx++) {
-            _childViews[idx]._notifyWillDestroyElement();
-          }
-        }
-        view.domManager.empty(view);
-      },
-
       // Handle events from `Ember.EventDispatcher`
       handleEvent: function(view, eventName, evt) {
         if (view.has(eventName)) {
@@ -39587,7 +41115,7 @@ define("ember-views/views/states/has_element",
 
     __exports__["default"] = hasElement;
   });
-define("ember-views/views/states/in_buffer",
+enifed("ember-views/views/states/in_buffer",
   ["ember-views/views/states/default","ember-metal/error","ember-metal/core","ember-metal/platform","ember-metal/merge","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -39626,58 +41154,22 @@ define("ember-views/views/states/in_buffer",
       // view will render that view and append the resulting
       // buffer into its buffer.
       appendChild: function(view, childView, options) {
-        var buffer = view.buffer, _childViews = view._childViews;
+        var buffer = view.buffer;
+        var _childViews = view._childViews;
 
         childView = view.createChildView(childView, options);
         if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
         _childViews.push(childView);
 
-        childView.renderToBuffer(buffer);
+        if (!childView._morph) {
+          buffer.pushChildView(childView);
+        }
 
         view.propertyDidChange('childViews');
 
         return childView;
       },
 
-      // when a view is rendered in a buffer, destroying the
-      // element will simply destroy the buffer and put the
-      // state back into the preRender state.
-      destroyElement: function(view) {
-        view.clearBuffer();
-        var viewCollection = view._notifyWillDestroyElement();
-        viewCollection.transitionTo('preRender', false);
-
-        return view;
-      },
-
-      empty: function() {
-        Ember.assert("Emptying a view in the inBuffer state is not allowed and " +
-                     "should not happen under normal circumstances. Most likely " +
-                     "there is a bug in your application. This may be due to " +
-                     "excessive property change notifications.");
-      },
-
-      renderToBufferIfNeeded: function (view, buffer) {
-        return false;
-      },
-
-      // It should be impossible for a rendered view to be scheduled for
-      // insertion.
-      insertElement: function() {
-        throw new EmberError("You can't insert an element that has already been rendered");
-      },
-
-      setElement: function(view, value) {
-        if (value === null) {
-          view._transitionTo('preRender');
-        } else {
-          view.clearBuffer();
-          view._transitionTo('hasElement');
-        }
-
-        return value;
-      },
-
       invokeObserver: function(target, observer) {
         observer.call(target);
       }
@@ -39685,7 +41177,7 @@ define("ember-views/views/states/in_buffer",
 
     __exports__["default"] = inBuffer;
   });
-define("ember-views/views/states/in_dom",
+enifed("ember-views/views/states/in_dom",
   ["ember-metal/core","ember-metal/platform","ember-metal/merge","ember-metal/error","ember-views/views/states/has_element","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -39725,21 +41217,15 @@ define("ember-views/views/states/in_dom",
         if (!View) { View = requireModule('ember-views/views/view')["default"]; } // ES6TODO: this sucks. Have to avoid cycles...
 
         if (!this.isVirtual) delete View.views[view.elementId];
-      },
-
-      insertElement: function(view, fn) {
-        throw new EmberError("You can't insert an element into the DOM that has already been inserted");
       }
     });
 
     __exports__["default"] = inDOM;
   });
-define("ember-views/views/states/pre_render",
+enifed("ember-views/views/states/pre_render",
   ["ember-views/views/states/default","ember-metal/platform","ember-metal/merge","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    /* global Node */
-
     var _default = __dependency1__["default"];
     var create = __dependency2__.create;
     var merge = __dependency3__["default"];
@@ -39751,44 +41237,10 @@ define("ember-views/views/states/pre_render",
     */
     var preRender = create(_default);
 
-    merge(preRender, {
-      // a view leaves the preRender state once its element has been
-      // created (createElement).
-      insertElement: function(view, fn) {
-        view.createElement();
-        var viewCollection = view.viewHierarchyCollection();
-
-        viewCollection.trigger('willInsertElement');
-
-        fn.call(view);
-
-        // We transition to `inDOM` if the element exists in the DOM
-        var element = view.get('element');
-        if (jQuery.contains(document.body, element)) {
-          viewCollection.transitionTo('inDOM', false);
-          viewCollection.trigger('didInsertElement');
-        }
-      },
-
-      renderToBufferIfNeeded: function(view, buffer) {
-        view.renderToBuffer(buffer);
-        return true;
-      },
-
-      empty: Ember.K,
-
-      setElement: function(view, value) {
-        if (value !== null) {
-          view._transitionTo('hasElement');
-        }
-        return value;
-      }
-    });
-
     __exports__["default"] = preRender;
   });
-define("ember-views/views/view",
-  ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","ember-views/views/view_collection","exports"],
+enifed("ember-views/views/view",
+  ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __exports__) {
     "use strict";
     // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
@@ -39818,47 +41270,36 @@ define("ember-views/views/view",
     var isArray = __dependency11__.isArray;
     var isNone = __dependency14__.isNone;
     var Mixin = __dependency13__.Mixin;
-    var deprecateProperty = __dependency10__.deprecateProperty;
-    var emberA = __dependency15__.A;
+    var deprecateProperty = __dependency15__.deprecateProperty;
+    var emberA = __dependency16__.A;
 
-    var dasherize = __dependency16__.dasherize;
+    var dasherize = __dependency17__.dasherize;
 
     // ES6TODO: functions on EnumerableUtils should get their own export
-    var forEach = __dependency17__.forEach;
-    var addObject = __dependency17__.addObject;
-    var removeObject = __dependency17__.removeObject;
+    var forEach = __dependency18__.forEach;
+    var addObject = __dependency18__.addObject;
+    var removeObject = __dependency18__.removeObject;
 
     var beforeObserver = __dependency13__.beforeObserver;
-    var copy = __dependency18__["default"];
-    var isGlobalPath = __dependency19__.isGlobalPath;
+    var copy = __dependency19__["default"];
+    var isGlobalPath = __dependency20__.isGlobalPath;
 
-    var propertyWillChange = __dependency20__.propertyWillChange;
-    var propertyDidChange = __dependency20__.propertyDidChange;
+    var propertyWillChange = __dependency21__.propertyWillChange;
+    var propertyDidChange = __dependency21__.propertyDidChange;
 
-    var jQuery = __dependency21__["default"];
+    var jQuery = __dependency22__["default"];
      // for the side effect of extending Ember.run.queues
 
-    var CoreView = __dependency23__["default"];
-    var ViewCollection = __dependency24__["default"];
+    var CoreView = __dependency24__["default"];
 
     /**
     @module ember
     @submodule ember-views
     */
-
-    var ContainerView;
-
-    function nullViewsBuffer(view) {
-      view.buffer = null;
-
-    }
-
-    function clearCachedElement(view) {
-      meta(view).cache.element = undefined;
-    }
-
     var childViewsProperty = computed(function() {
-      var childViews = this._childViews, ret = emberA(), view = this;
+      var childViews = this._childViews;
+      var ret = emberA();
+      var view = this;
 
       forEach(childViews, function(view) {
         var currentChildViews;
@@ -39872,12 +41313,6 @@ define("ember-views/views/view",
       });
 
       ret.replace = function (idx, removedCount, addedViews) {
-        if (!ContainerView) { ContainerView = requireModule('ember-views/views/container_view')['default']; } // ES6TODO: stupid circular dep
-
-        if (view instanceof ContainerView) {
-          Ember.deprecate("Manipulating an Ember.ContainerView through its childViews property is deprecated. Please use the ContainerView instance itself as an Ember.MutableArray.");
-          return view.replace(idx, removedCount, addedViews);
-        }
         throw new EmberError("childViews is immutable");
       };
 
@@ -40396,8 +41831,9 @@ define("ember-views/views/view",
       on the descendent.
 
       ```javascript
-      OuterView = Ember.View.extend({
-        template: Ember.Handlebars.compile("outer {{#view InnerView}}inner{{/view}} outer"),
+      var App = Ember.Application.create();
+      App.OuterView = Ember.View.extend({
+        template: Ember.Handlebars.compile("outer {{#view 'inner'}}inner{{/view}} outer"),
         eventManager: Ember.Object.create({
           mouseEnter: function(event, view) {
             // view might be instance of either
@@ -40407,7 +41843,7 @@ define("ember-views/views/view",
         })
       });
 
-      InnerView = Ember.View.extend({
+      App.InnerView = Ember.View.extend({
         click: function(event) {
           // will be called if rendered inside
           // an OuterView because OuterView's
@@ -40551,8 +41987,8 @@ define("ember-views/views/view",
       template: computed('templateName', function(key, value) {
         if (value !== undefined) { return value; }
 
-        var templateName = get(this, 'templateName'),
-            template = this.templateForName(templateName, 'template');
+        var templateName = get(this, 'templateName');
+        var template = this.templateForName(templateName, 'template');
 
         Ember.assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || template);
 
@@ -40586,8 +42022,8 @@ define("ember-views/views/view",
         @type Function
       */
       layout: computed(function(key) {
-        var layoutName = get(this, 'layoutName'),
-            layout = this.templateForName(layoutName, 'layout');
+        var layoutName = get(this, 'layoutName');
+        var layout = this.templateForName(layoutName, 'layout');
 
         Ember.assert("You specified the layoutName " + layoutName + " for " + this + ", but it did not exist.", !layoutName || layout);
 
@@ -40746,8 +42182,8 @@ define("ember-views/views/view",
         @return Ember.View
       */
       nearestOfType: function(klass) {
-        var view = get(this, 'parentView'),
-            isOfType = klass instanceof Mixin ?
+        var view = get(this, 'parentView');
+        var isOfType = klass instanceof Mixin ?
                        function(view) { return klass.detect(view); } :
                        function(view) { return klass.detect(view.constructor); };
 
@@ -40893,21 +42329,6 @@ define("ember-views/views/view",
         return this.currentState.rerender(this);
       },
 
-      clearRenderedChildren: function() {
-        var lengthBefore = this.lengthBeforeRender,
-            lengthAfter  = this.lengthAfterRender;
-
-        // If there were child views created during the last call to render(),
-        // remove them under the assumption that they will be re-created when
-        // we re-render.
-
-        // VIEW-TODO: Unit test this path.
-        var childViews = this._childViews;
-        for (var i=lengthAfter-1; i>=lengthBefore; i--) {
-          if (childViews[i]) { childViews[i].destroy(); }
-        }
-      },
-
       /**
         Iterates over the view's `classNameBindings` array, inserts the value
         of the specified property into the `classNames` array, then creates an
@@ -40918,8 +42339,8 @@ define("ember-views/views/view",
         @private
       */
       _applyClassNameBindings: function(classBindings) {
-        var classNames = this.classNames,
-        elem, newClass, dasherizedClass;
+        var classNames = this.classNames;
+        var elem, newClass, dasherizedClass;
 
         // Loop through all of the configured bindings. These will be either
         // property names ('isUrgent') or property paths relative to the view
@@ -40998,13 +42419,15 @@ define("ember-views/views/view",
         @private
       */
       _applyAttributeBindings: function(buffer, attributeBindings) {
-        var attributeValue,
-            unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
+        var attributeValue;
+        var unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
 
         forEach(attributeBindings, function(binding) {
-          var split = binding.split(':'),
-              property = split[0],
-              attributeName = split[1] || property;
+          var split = binding.split(':');
+          var property = split[0];
+          var attributeName = split[1] || property;
+
+          Ember.assert('You cannot use class as an attributeBinding, use classNameBindings instead.', attributeName !== 'class');
 
           if (property in this) {
             this._setupAttributeBindingObservation(property, attributeName);
@@ -41094,13 +42517,7 @@ define("ember-views/views/view",
         @property element
         @type DOMElement
       */
-      element: computed('_parentView', function(key, value) {
-        if (value !== undefined) {
-          return this.currentState.setElement(this, value);
-        } else {
-          return this.currentState.getElement(this);
-        }
-      }),
+      element: null,
 
       /**
         Returns a jQuery object for this view's element. If you pass in a selector
@@ -41119,9 +42536,9 @@ define("ember-views/views/view",
       },
 
       mutateChildViews: function(callback) {
-        var childViews = this._childViews,
-            idx = childViews.length,
-            view;
+        var childViews = this._childViews;
+        var idx = childViews.length;
+        var view;
 
         while(--idx >= 0) {
           view = childViews[idx];
@@ -41136,8 +42553,8 @@ define("ember-views/views/view",
 
         if (!childViews) { return this; }
 
-        var len = childViews.length,
-            view, idx;
+        var len = childViews.length;
+        var view, idx;
 
         for (idx = 0; idx < len; idx++) {
           view = childViews[idx];
@@ -41167,14 +42584,13 @@ define("ember-views/views/view",
         @param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
         @return {Ember.View} receiver
       */
-      appendTo: function(target) {
-        // Schedule the DOM element to be created and appended to the given
-        // element after bindings have synchronized.
-        this._insertElementLater(function() {
-          Ember.assert("You tried to append to (" + target + ") but that isn't in the DOM", jQuery(target).length > 0);
-          Ember.assert("You cannot append to an existing Ember.View. Consider using Ember.ContainerView instead.", !jQuery(target).is('.ember-view') && !jQuery(target).parents().is('.ember-view'));
-          this.$().appendTo(target);
-        });
+      appendTo: function(selector) {
+        var target = jQuery(selector);
+
+        Ember.assert("You tried to append to (" + selector + ") but that isn't in the DOM", target.length > 0);
+        Ember.assert("You cannot append to an existing Ember.View. Consider using Ember.ContainerView instead.", !target.is('.ember-view') && !target.parents().is('.ember-view'));
+
+        this.constructor.renderer.appendTo(this, target[0]);
 
         return this;
       },
@@ -41192,49 +42608,17 @@ define("ember-views/views/view",
         @param {String|DOMElement|jQuery} target A selector, element, HTML string, or jQuery object
         @return {Ember.View} received
       */
-      replaceIn: function(target) {
-        Ember.assert("You tried to replace in (" + target + ") but that isn't in the DOM", jQuery(target).length > 0);
-        Ember.assert("You cannot replace an existing Ember.View. Consider using Ember.ContainerView instead.", !jQuery(target).is('.ember-view') && !jQuery(target).parents().is('.ember-view'));
+      replaceIn: function(selector) {
+        var target = jQuery(selector);
 
-        this._insertElementLater(function() {
-          jQuery(target).empty();
-          this.$().appendTo(target);
-        });
+        Ember.assert("You tried to replace in (" + selector + ") but that isn't in the DOM", target.length > 0);
+        Ember.assert("You cannot replace an existing Ember.View. Consider using Ember.ContainerView instead.", !target.is('.ember-view') && !target.parents().is('.ember-view'));
+
+        this.constructor.renderer.replaceIn(this, target[0]);
 
         return this;
       },
 
-      /**
-        Schedules a DOM operation to occur during the next render phase. This
-        ensures that all bindings have finished synchronizing before the view is
-        rendered.
-
-        To use, pass a function that performs a DOM operation.
-
-        Before your function is called, this view and all child views will receive
-        the `willInsertElement` event. After your function is invoked, this view
-        and all of its child views will receive the `didInsertElement` event.
-
-        ```javascript
-        view._insertElementLater(function() {
-          this.createElement();
-          this.$().appendTo('body');
-        });
-        ```
-
-        @method _insertElementLater
-        @param {Function} fn the function that inserts the element into the DOM
-        @private
-      */
-      _insertElementLater: function(fn) {
-        this._scheduledInsert = run.scheduleOnce('render', this, '_insertElement', fn);
-      },
-
-      _insertElement: function (fn) {
-        this._scheduledInsert = null;
-        this.currentState.insertElement(this, fn);
-      },
-
       /**
         Appends the view's element to the document body. If the view does
         not have an HTML representation yet, `createElement()` will be called
@@ -41268,9 +42652,6 @@ define("ember-views/views/view",
         // In the interim, we will just re-render if that happens. It is more
         // important than elements get garbage collected.
         if (!this.removedFromDOM) { this.destroyElement(); }
-        this.invokeRecursively(function(view) {
-          if (view.clearRenderedChildren) { view.clearRenderedChildren(); }
-        });
       },
 
       elementId: null,
@@ -41292,20 +42673,20 @@ define("ember-views/views/view",
       },
 
       /**
-        Creates a DOM representation of the view and all of its
-        child views by recursively calling the `render()` method.
+        Creates a DOM representation of the view and all of its child views by
+        recursively calling the `render()` method.
 
-        After the element has been created, `didInsertElement` will
+        After the element has been inserted into the DOM, `didInsertElement` will
         be called on this view and all of its child views.
 
         @method createElement
         @return {Ember.View} receiver
       */
       createElement: function() {
-        if (get(this, 'element')) { return this; }
+        if (this.element) { return this; }
 
-        var buffer = this.renderToBuffer();
-        set(this, 'element', buffer.element());
+        this._didCreateElementWithoutMorph = true;
+        this.constructor.renderer.renderTree(this);
 
         return this;
       },
@@ -41322,6 +42703,9 @@ define("ember-views/views/view",
         or after the view was re-rendered. Override this function to do any
         set up that requires an element in the document body.
 
+        When a view has children, didInsertElement will be called on the
+        child view(s) first, bubbling upwards through the hierarchy.
+
         @event didInsertElement
       */
       didInsertElement: Ember.K,
@@ -41335,65 +42719,6 @@ define("ember-views/views/view",
       */
       willClearRender: Ember.K,
 
-      /**
-        Run this callback on the current view (unless includeSelf is false) and recursively on child views.
-
-        @method invokeRecursively
-        @param fn {Function}
-        @param includeSelf {Boolean} Includes itself if true.
-        @private
-      */
-      invokeRecursively: function(fn, includeSelf) {
-        var childViews = (includeSelf === false) ? this._childViews : [this];
-        var currentViews, view, currentChildViews;
-
-        while (childViews.length) {
-          currentViews = childViews.slice();
-          childViews = [];
-
-          for (var i=0, l=currentViews.length; i<l; i++) {
-            view = currentViews[i];
-            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
-            fn(view);
-            if (currentChildViews) {
-              childViews.push.apply(childViews, currentChildViews);
-            }
-          }
-        }
-      },
-
-      triggerRecursively: function(eventName) {
-        var childViews = [this], currentViews, view, currentChildViews;
-
-        while (childViews.length) {
-          currentViews = childViews.slice();
-          childViews = [];
-
-          for (var i=0, l=currentViews.length; i<l; i++) {
-            view = currentViews[i];
-            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
-            if (view.trigger) { view.trigger(eventName); }
-            if (currentChildViews) {
-              childViews.push.apply(childViews, currentChildViews);
-            }
-
-          }
-        }
-      },
-
-      viewHierarchyCollection: function() {
-        var currentView, viewCollection = new ViewCollection([this]);
-
-        for (var i = 0; i < viewCollection.length; i++) {
-          currentView = viewCollection.objectAt(i);
-          if (currentView._childViews) {
-            viewCollection.push.apply(viewCollection, currentView._childViews);
-          }
-        }
-
-        return viewCollection;
-      },
-
       /**
         Destroys any existing element along with the element for any child views
         as well. If the view does not currently have a element, then this method
@@ -41421,40 +42746,13 @@ define("ember-views/views/view",
         this function to do any teardown that requires an element, like removing
         event listeners.
 
+        Please note: any property changes made during this event will have no
+        effect on object observers.
+
         @event willDestroyElement
       */
       willDestroyElement: Ember.K,
 
-      /**
-        Triggers the `willDestroyElement` event (which invokes the
-        `willDestroyElement()` method if it exists) on this view and all child
-        views.
-
-        Before triggering `willDestroyElement`, it first triggers the
-        `willClearRender` event recursively.
-
-        @method _notifyWillDestroyElement
-        @private
-      */
-      _notifyWillDestroyElement: function() {
-        var viewCollection = this.viewHierarchyCollection();
-        viewCollection.trigger('willClearRender');
-        viewCollection.trigger('willDestroyElement');
-        return viewCollection;
-      },
-
-      /**
-        If this view's element changes, we need to invalidate the caches of our
-        child views so that we do not retain references to DOM elements that are
-        no longer needed.
-
-        @method _elementDidChange
-        @private
-      */
-      _elementDidChange: observer('element', function() {
-        this.forEachChildView(clearCachedElement);
-      }),
-
       /**
         Called when the parentView property has changed.
 
@@ -41469,26 +42767,9 @@ define("ember-views/views/view",
         this._super(hash);
       },
 
-      _renderToBuffer: function(buffer) {
-        this.lengthBeforeRender = this._childViews.length;
-        buffer = this._super(buffer);
-        this.lengthAfterRender = this._childViews.length;
+      beforeRender: function(buffer) {},
 
-        return buffer;
-      },
-
-      renderToBufferIfNeeded: function (buffer) {
-        return this.currentState.renderToBufferIfNeeded(this, buffer);
-      },
-
-      beforeRender: function(buffer) {
-        this.applyAttributesToBuffer(buffer);
-        buffer.pushOpeningTag();
-      },
-
-      afterRender: function(buffer) {
-        buffer.pushClosingTag();
-      },
+      afterRender: function(buffer) {},
 
       applyAttributesToBuffer: function(buffer) {
         // Creates observers for all registered class name and attribute bindings,
@@ -41651,7 +42932,9 @@ define("ember-views/views/view",
         @private
       */
       init: function() {
-        this.elementId = this.elementId || guidFor(this);
+        if (!this.isVirtual && !this.elementId) {
+          this.elementId = guidFor(this);
+        }
 
         this._super();
 
@@ -41739,29 +43022,19 @@ define("ember-views/views/view",
         @method destroy
       */
       destroy: function() {
-        var childViews = this._childViews,
-            // get parentView before calling super because it'll be destroyed
-            nonVirtualParentView = get(this, 'parentView'),
-            viewName = this.viewName,
-            childLen, i;
+        var childViews = this._childViews;
+        // get parentView before calling super because it'll be destroyed
+        var nonVirtualParentView = get(this, 'parentView');
+        var viewName = this.viewName;
+        var childLen, i;
 
         if (!this._super()) { return; }
 
-        childLen = childViews.length;
-        for (i=childLen-1; i>=0; i--) {
-          childViews[i].removedFromDOM = true;
-        }
-
         // remove from non-virtual parent view if viewName was specified
         if (viewName && nonVirtualParentView) {
           nonVirtualParentView.set(viewName, null);
         }
 
-        childLen = childViews.length;
-        for (i=childLen-1; i>=0; i--) {
-          childViews[i].destroy();
-        }
-
         return this;
       },
 
@@ -41840,16 +43113,18 @@ define("ember-views/views/view",
 
       _toggleVisibility: function() {
         var $el = this.$();
-        if (!$el) { return; }
-
         var isVisible = get(this, 'isVisible');
 
         if (this._isVisible === isVisible) { return ; }
 
-        $el.toggle(isVisible);
-
+        // It's important to keep these in sync, even if we don't yet have
+        // an element in the DOM to manipulate:
         this._isVisible = isVisible;
 
+        if (!$el) { return; }
+
+        $el.toggle(isVisible);
+
         if (this._isAncestorHidden()) { return; }
 
         if (isVisible) {
@@ -41893,10 +43168,6 @@ define("ember-views/views/view",
 
         return false;
       },
-
-      clearBuffer: function() {
-        this.invokeRecursively(nullViewsBuffer);
-      },
       transitionTo: function(state, children) {
         Ember.deprecate("Ember.View#transitionTo has been deprecated, it is for internal use only");
         this._transitionTo(state, children);
@@ -41904,18 +43175,10 @@ define("ember-views/views/view",
       _transitionTo: function(state, children) {
         var priorState = this.currentState;
         var currentState = this.currentState = this._states[state];
-
         this._state = state;
 
         if (priorState && priorState.exit) { priorState.exit(this); }
         if (currentState.enter) { currentState.enter(this); }
-        if (state === 'inDOM') { meta(this).cache.element = undefined; }
-
-        if (children !== false) {
-          this.forEachChildView(function(view) {
-            view._transitionTo(state);
-          });
-        }
       },
 
       // .......................................................
@@ -41944,13 +43207,13 @@ define("ember-views/views/view",
           return;
         }
 
-        var view = this,
-            stateCheckedObserver = function() {
-              view.currentState.invokeObserver(this, observer);
-            },
-            scheduledObserver = function() {
-              run.scheduleOnce('render', this, stateCheckedObserver);
-            };
+        var view = this;
+        var stateCheckedObserver = function() {
+          view.currentState.invokeObserver(this, observer);
+        };
+        var scheduledObserver = function() {
+          run.scheduleOnce('render', this, stateCheckedObserver);
+        };
 
         addObserver(root, path, target, scheduledObserver);
 
@@ -41994,48 +43257,6 @@ define("ember-views/views/view",
       run.once(View, 'notifyMutationListeners');
     }
 
-    var DOMManager = {
-      prepend: function(view, html) {
-        view.$().prepend(html);
-        notifyMutationListeners();
-      },
-
-      after: function(view, html) {
-        view.$().after(html);
-        notifyMutationListeners();
-      },
-
-      html: function(view, html) {
-        view.$().html(html);
-        notifyMutationListeners();
-      },
-
-      replace: function(view) {
-        var element = get(view, 'element');
-
-        set(view, 'element', null);
-
-        view._insertElementLater(function() {
-          jQuery(element).replaceWith(get(view, 'element'));
-          notifyMutationListeners();
-        });
-      },
-
-      remove: function(view) {
-        view.$().remove();
-        notifyMutationListeners();
-      },
-
-      empty: function(view) {
-        view.$().empty();
-        notifyMutationListeners();
-      }
-    };
-
-    View.reopen({
-      domManager: DOMManager
-    });
-
     View.reopenClass({
 
       /**
@@ -42058,11 +43279,10 @@ define("ember-views/views/view",
         @private
       */
       _parsePropertyPath: function(path) {
-        var split = path.split(':'),
-            propertyPath = split[0],
-            classNames = "",
-            className,
-            falsyClassName;
+        var split = path.split(':');
+        var propertyPath = split[0];
+        var classNames = "";
+        var className, falsyClassName;
 
         // check if the property is defined as prop:class or prop:trueClass:falseClass
         if (split.length > 1) {
@@ -42146,7 +43366,7 @@ define("ember-views/views/view",
     });
 
     var mutation = EmberObject.extend(Evented).create();
-
+    // TODO MOVE TO RENDERER HOOKS
     View.addMutationListener = function(callback) {
       mutation.on('change', callback);
     };
@@ -42204,82 +43424,11 @@ define("ember-views/views/view",
 
     __exports__["default"] = View;
   });
-define("ember-views/views/view_collection",
-  ["ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var forEach = __dependency1__.forEach;
-
-    function ViewCollection(initialViews) {
-      var views = this.views = initialViews || [];
-      this.length = views.length;
-    }
-
-    ViewCollection.prototype = {
-      length: 0,
-
-      trigger: function(eventName) {
-        var views = this.views, view;
-        for (var i = 0, l = views.length; i < l; i++) {
-          view = views[i];
-          if (view.trigger) { view.trigger(eventName); }
-        }
-      },
-
-      triggerRecursively: function(eventName) {
-        var views = this.views;
-        for (var i = 0, l = views.length; i < l; i++) {
-          views[i].triggerRecursively(eventName);
-        }
-      },
-
-      invokeRecursively: function(fn) {
-        var views = this.views, view;
-
-        for (var i = 0, l = views.length; i < l; i++) {
-          view = views[i];
-          fn(view);
-        }
-      },
-
-      transitionTo: function(state, children) {
-        var views = this.views;
-        for (var i = 0, l = views.length; i < l; i++) {
-          views[i]._transitionTo(state, children);
-        }
-      },
-
-      push: function() {
-        this.length += arguments.length;
-        var views = this.views;
-        return views.push.apply(views, arguments);
-      },
-
-      objectAt: function(idx) {
-        return this.views[idx];
-      },
-
-      forEach: function(callback) {
-        var views = this.views;
-        return forEach(views, callback);
-      },
-
-      clear: function() {
-        this.length = 0;
-        this.views.length = 0;
-      }
-    };
-
-    __exports__["default"] = ViewCollection;
-  });
-define("ember",
+enifed("ember",
   ["ember-metal","ember-runtime","ember-handlebars","ember-views","ember-routing","ember-routing-handlebars","ember-application","ember-extension-support"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
-        // Remove "use strict"; from transpiled module until
-    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
-    //
-    // REMOVE_USE_STRICT: true
-
+    "use strict";
+    /* global navigator */
     // require the main entry points for each of these packages
     // this is so that the global exports occur properly
 
@@ -42295,521 +43444,831 @@ define("ember",
     @module ember
     */
 
-    function throwWithMessage(msg) {
-      return function() {
-        throw new Ember.Error(msg);
-      };
-    }
-
-    function generateRemovedClass(className) {
-      var msg = " has been moved into a plugin: https://github.com/emberjs/ember-states";
-
-      return {
-        extend: throwWithMessage(className + msg),
-        create: throwWithMessage(className + msg)
-      };
-    }
-
-    Ember.StateManager = generateRemovedClass("Ember.StateManager");
-
-    /**
-      This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
-
-      @class StateManager
-      @namespace Ember
-    */
-
-    Ember.State = generateRemovedClass("Ember.State");
-
-    /**
-      This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
-
-      @class State
-      @namespace Ember
-    */
+    Ember.deprecate('Usage of Ember is deprecated for Internet Explorer 6 and 7, support will be removed in the next major version.', !navigator.userAgent.match(/MSIE [67]/));
   });
-define("metamorph",
-  [],
-  function() {
+enifed("morph",
+  ["./morph/morph","./morph/dom-helper","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    // ==========================================================================
-    // Project:   metamorph
-    // Copyright: ©2014 Tilde, Inc. All rights reserved.
-    // ==========================================================================
+    var Morph = __dependency1__["default"];
+    var Morph;
+    __exports__.Morph = Morph;
+    var DOMHelper = __dependency2__["default"];
+    var DOMHelper;
+    __exports__.DOMHelper = DOMHelper;
+  });
+enifed("morph/dom-helper",
+  ["../morph/morph","./dom-helper/build-html-dom","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Morph = __dependency1__["default"];
+    var buildHTMLDOM = __dependency2__.buildHTMLDOM;
+    var svgNamespace = __dependency2__.svgNamespace;
+    var svgHTMLIntegrationPoints = __dependency2__.svgHTMLIntegrationPoints;
 
-    var K = function() {},
-        guid = 0,
-        disableRange = (function(){
-          if ('undefined' !== typeof MetamorphENV) {
-            return MetamorphENV.DISABLE_RANGE_API;
-          } else if ('undefined' !== ENV) {
-            return ENV.DISABLE_RANGE_API;
-          } else {
-            return false;
-          }
-        })(),
+    var deletesBlankTextNodes = (function(){
+      var element = document.createElement('div');
+      element.appendChild( document.createTextNode('') );
+      var clonedElement = element.cloneNode(true);
+      return clonedElement.childNodes.length === 0;
+    })();
 
-        // Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
-        supportsRange = (!disableRange) && typeof document !== 'undefined' && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
+    var ignoresCheckedAttribute = (function(){
+      var element = document.createElement('input');
+      element.setAttribute('checked', 'checked');
+      var clonedElement = element.cloneNode(false);
+      return !clonedElement.checked;
+    })();
 
-        // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
-        // is a "zero-scope" element. This problem can be worked around by making
-        // the first node an invisible text node. We, like Modernizr, use &shy;
-        needsShy = typeof document !== 'undefined' && (function() {
-          var testEl = document.createElement('div');
-          testEl.innerHTML = "<div></div>";
-          testEl.firstChild.innerHTML = "<script></script>";
-          return testEl.firstChild.innerHTML === '';
-        })(),
+    function isSVG(ns){
+      return ns === svgNamespace;
+    }
 
-
-        // IE 8 (and likely earlier) likes to move whitespace preceeding
-        // a script tag to appear after it. This means that we can
-        // accidentally remove whitespace when updating a morph.
-        movesWhitespace = document && (function() {
-          var testEl = document.createElement('div');
-          testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
-          return testEl.childNodes[0].nodeValue === 'Test:' &&
-                  testEl.childNodes[2].nodeValue === ' Value';
-        })();
-
-    // Constructor that supports either Metamorph('foo') or new
-    // Metamorph('foo');
-    //
-    // Takes a string of HTML as the argument.
-
-    var Metamorph = function(html) {
-      var self;
-
-      if (this instanceof Metamorph) {
-        self = this;
+    // This is not the namespace of the element, but of
+    // the elements inside that elements.
+    function interiorNamespace(element){
+      if (
+        element &&
+        element.namespaceURI === svgNamespace &&
+        !svgHTMLIntegrationPoints[element.tagName]
+      ) {
+        return svgNamespace;
       } else {
-        self = new K();
+        return null;
       }
+    }
 
-      self.innerHTML = html;
-      var myGuid = 'metamorph-'+(guid++);
-      self.start = myGuid + '-start';
-      self.end = myGuid + '-end';
+    // The HTML spec allows for "omitted start tags". These tags are optional
+    // when their intended child is the first thing in the parent tag. For
+    // example, this is a tbody start tag:
+    //
+    // <table>
+    //   <tbody>
+    //     <tr>
+    //
+    // The tbody may be omitted, and the browser will accept and render:
+    //
+    // <table>
+    //   <tr>
+    //
+    // However, the omitted start tag will still be added to the DOM. Here
+    // we test the string and context to see if the browser is about to
+    // perform this cleanup.
+    //
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
+    // describes which tags are omittable. The spec for tbody and colgroup
+    // explains this behavior:
+    //
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
+    //
 
-      return self;
+    var omittedStartTagChildTest = /<([\w:]+)/;
+    function detectOmittedStartTag(string, contextualElement){
+      // Omitted start tags are only inside table tags.
+      if (contextualElement.tagName === 'TABLE') {
+        var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
+        if (omittedStartTagChildMatch) {
+          var omittedStartTagChild = omittedStartTagChildMatch[1];
+          // It is already asserted that the contextual element is a table
+          // and not the proper start tag. Just see if a tag was omitted.
+          return omittedStartTagChild === 'tr' ||
+                 omittedStartTagChild === 'col';
+        }
+      }
+    }
+
+    function buildSVGDOM(html, dom){
+      var div = dom.document.createElement('div');
+      div.innerHTML = '<svg>'+html+'</svg>';
+      return div.firstChild.childNodes;
+    }
+
+    /*
+     * A class wrapping DOM functions to address environment compatibility,
+     * namespaces, contextual elements for morph un-escaped content
+     * insertion.
+     *
+     * When entering a template, a DOMHelper should be passed:
+     *
+     *   template(context, { hooks: hooks, dom: new DOMHelper() });
+     *
+     * TODO: support foreignObject as a passed contextual element. It has
+     * a namespace (svg) that does not match its internal namespace
+     * (xhtml).
+     *
+     * @class DOMHelper
+     * @constructor
+     * @param {HTMLDocument} _document The document DOM methods are proxied to
+     */
+    function DOMHelper(_document){
+      this.document = _document || window.document;
+      this.namespace = null;
+    }
+
+    var prototype = DOMHelper.prototype;
+    prototype.constructor = DOMHelper;
+
+    prototype.insertBefore = function(element, childElement, referenceChild) {
+      return element.insertBefore(childElement, referenceChild);
     };
 
-    K.prototype = Metamorph.prototype;
-
-    var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, afterFunc, prependFunc, startTagFunc, endTagFunc;
-
-    outerHTMLFunc = function() {
-      return this.startTag() + this.innerHTML + this.endTag();
+    prototype.appendChild = function(element, childElement) {
+      return element.appendChild(childElement);
     };
 
-    startTagFunc = function() {
-      /*
-       * We replace chevron by its hex code in order to prevent escaping problems.
-       * Check this thread for more explaination:
-       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
-       */
-      return "<script id='" + this.start + "' type='text/x-placeholder'>\x3C/script>";
+    prototype.appendText = function(element, text) {
+      return element.appendChild(this.document.createTextNode(text));
     };
 
-    endTagFunc = function() {
-      /*
-       * We replace chevron by its hex code in order to prevent escaping problems.
-       * Check this thread for more explaination:
-       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
-       */
-      return "<script id='" + this.end + "' type='text/x-placeholder'>\x3C/script>";
+    prototype.setAttribute = function(element, name, value) {
+      element.setAttribute(name, value);
     };
 
-    // If we have the W3C range API, this process is relatively straight forward.
-    if (supportsRange) {
-
-      // Get a range for the current morph. Optionally include the starting and
-      // ending placeholders.
-      rangeFor = function(morph, outerToo) {
-        var range = document.createRange();
-        var before = document.getElementById(morph.start);
-        var after = document.getElementById(morph.end);
-
-        if (outerToo) {
-          range.setStartBefore(before);
-          range.setEndAfter(after);
+    if (document.createElementNS) {
+      // Only opt into namespace detection if a contextualElement
+      // is passed.
+      prototype.createElement = function(tagName, contextualElement) {
+        var namespace = this.namespace;
+        if (contextualElement) {
+          if (tagName === 'svg') {
+            namespace = svgNamespace;
+          } else {
+            namespace = interiorNamespace(contextualElement);
+          }
+        }
+        if (namespace) {
+          return this.document.createElementNS(namespace, tagName);
         } else {
-          range.setStartAfter(before);
-          range.setEndBefore(after);
+          return this.document.createElement(tagName);
         }
-
-        return range;
       };
-
-      htmlFunc = function(html, outerToo) {
-        // get a range for the current metamorph object
-        var range = rangeFor(this, outerToo);
-
-        // delete the contents of the range, which will be the
-        // nodes between the starting and ending placeholder.
-        range.deleteContents();
-
-        // create a new document fragment for the HTML
-        var fragment = range.createContextualFragment(html);
-
-        // insert the fragment into the range
-        range.insertNode(fragment);
-      };
-
-      /**
-      * @public
-      *
-      * Remove this object (including starting and ending
-      * placeholders).
-      *
-      * @method remove
-      */
-      removeFunc = function() {
-        // get a range for the current metamorph object including
-        // the starting and ending placeholders.
-        var range = rangeFor(this, true);
-
-        // delete the entire range.
-        range.deleteContents();
-      };
-
-      appendToFunc = function(node) {
-        var range = document.createRange();
-        range.setStart(node);
-        range.collapse(false);
-        var frag = range.createContextualFragment(this.outerHTML());
-        node.appendChild(frag);
-      };
-
-      afterFunc = function(html) {
-        var range = document.createRange();
-        var after = document.getElementById(this.end);
-
-        range.setStartAfter(after);
-        range.setEndAfter(after);
-
-        var fragment = range.createContextualFragment(html);
-        range.insertNode(fragment);
-      };
-
-      prependFunc = function(html) {
-        var range = document.createRange();
-        var start = document.getElementById(this.start);
-
-        range.setStartAfter(start);
-        range.setEndAfter(start);
-
-        var fragment = range.createContextualFragment(html);
-        range.insertNode(fragment);
-      };
-
     } else {
-      /*
-       * This code is mostly taken from jQuery, with one exception. In jQuery's case, we
-       * have some HTML and we need to figure out how to convert it into some nodes.
-       *
-       * In this case, jQuery needs to scan the HTML looking for an opening tag and use
-       * that as the key for the wrap map. In our case, we know the parent node, and
-       * can use its type as the key for the wrap map.
-       **/
-      Metamorph._wrapMap = {
-        select: [ 1, "<select multiple='multiple'>", "</select>" ],
-        fieldset: [ 1, "<fieldset>", "</fieldset>" ],
-        table: [ 1, "<table>", "</table>" ],
-        tbody: [ 2, "<table><tbody>", "</tbody></table>" ],
-        tr: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-        colgroup: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-        map: [ 1, "<map>", "</map>" ],
-        _default: [ 0, "", "" ]
-      };
-
-      var findChildById = function(element, id) {
-        if (element.getAttribute('id') === id) { return element; }
-
-        var len = element.childNodes.length, idx, node, found;
-        for (idx=0; idx<len; idx++) {
-          node = element.childNodes[idx];
-          found = node.nodeType === 1 && findChildById(node, id);
-          if (found) { return found; }
-        }
-      };
-
-      var setInnerHTML = function(element, html) {
-        var matches = [];
-        if (movesWhitespace) {
-          // Right now we only check for script tags with ids with the
-          // goal of targeting morphs.
-          html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
-            matches.push([id, spaces]);
-            return tag;
-          });
-        }
-
-        element.innerHTML = html;
-
-        // If we have to do any whitespace adjustments do them now
-        if (matches.length > 0) {
-          var len = matches.length, idx;
-          for (idx=0; idx<len; idx++) {
-            var script = findChildById(element, matches[idx][0]),
-                node = document.createTextNode(matches[idx][1]);
-            script.parentNode.insertBefore(node, script);
-          }
-        }
-      };
-
-      /*
-       * Given a parent node and some HTML, generate a set of nodes. Return the first
-       * node, which will allow us to traverse the rest using nextSibling.
-       *
-       * We need to do this because innerHTML in IE does not really parse the nodes.
-       */
-      var firstNodeFor = function(parentNode, html) {
-        var wrapMap = Metamorph._wrapMap;
-        var arr = wrapMap[parentNode.tagName.toLowerCase()] || wrapMap._default;
-        var depth = arr[0], start = arr[1], end = arr[2];
-
-        if (needsShy) { html = '&shy;'+html; }
-
-        var element = document.createElement('div');
-
-        setInnerHTML(element, start + html + end);
-
-        for (var i=0; i<=depth; i++) {
-          element = element.firstChild;
-        }
-
-        // Look for &shy; to remove it.
-        if (needsShy) {
-          var shyElement = element;
-
-          // Sometimes we get nameless elements with the shy inside
-          while (shyElement.nodeType === 1 && !shyElement.nodeName) {
-            shyElement = shyElement.firstChild;
-          }
-
-          // At this point it's the actual unicode character.
-          if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
-            shyElement.nodeValue = shyElement.nodeValue.slice(1);
-          }
-        }
-
-        return element;
-      };
-
-      /*
-       * In some cases, Internet Explorer can create an anonymous node in
-       * the hierarchy with no tagName. You can create this scenario via:
-       *
-       *     div = document.createElement("div");
-       *     div.innerHTML = "<table>&shy<script></script><tr><td>hi</td></tr></table>";
-       *     div.firstChild.firstChild.tagName //=> ""
-       *
-       * If our script markers are inside such a node, we need to find that
-       * node and use *it* as the marker.
-       */
-      var realNode = function(start) {
-        while (start.parentNode.tagName === "") {
-          start = start.parentNode;
-        }
-
-        return start;
-      };
-
-      /*
-       * When automatically adding a tbody, Internet Explorer inserts the
-       * tbody immediately before the first <tr>. Other browsers create it
-       * before the first node, no matter what.
-       *
-       * This means the the following code:
-       *
-       *     div = document.createElement("div");
-       *     div.innerHTML = "<table><script id='first'></script><tr><td>hi</td></tr><script id='last'></script></table>
-       *
-       * Generates the following DOM in IE:
-       *
-       *     + div
-       *       + table
-       *         - script id='first'
-       *         + tbody
-       *           + tr
-       *             + td
-       *               - "hi"
-       *           - script id='last'
-       *
-       * Which means that the two script tags, even though they were
-       * inserted at the same point in the hierarchy in the original
-       * HTML, now have different parents.
-       *
-       * This code reparents the first script tag by making it the tbody's
-       * first child.
-       *
-       */
-      var fixParentage = function(start, end) {
-        if (start.parentNode !== end.parentNode) {
-          end.parentNode.insertBefore(start, end.parentNode.firstChild);
-        }
-      };
-
-      htmlFunc = function(html, outerToo) {
-        // get the real starting node. see realNode for details.
-        var start = realNode(document.getElementById(this.start));
-        var end = document.getElementById(this.end);
-        var parentNode = end.parentNode;
-        var node, nextSibling, last;
-
-        // make sure that the start and end nodes share the same
-        // parent. If not, fix it.
-        fixParentage(start, end);
-
-        // remove all of the nodes after the starting placeholder and
-        // before the ending placeholder.
-        node = start.nextSibling;
-        while (node) {
-          nextSibling = node.nextSibling;
-          last = node === end;
-
-          // if this is the last node, and we want to remove it as well,
-          // set the `end` node to the next sibling. This is because
-          // for the rest of the function, we insert the new nodes
-          // before the end (note that insertBefore(node, null) is
-          // the same as appendChild(node)).
-          //
-          // if we do not want to remove it, just break.
-          if (last) {
-            if (outerToo) { end = node.nextSibling; } else { break; }
-          }
-
-          node.parentNode.removeChild(node);
-
-          // if this is the last node and we didn't break before
-          // (because we wanted to remove the outer nodes), break
-          // now.
-          if (last) { break; }
-
-          node = nextSibling;
-        }
-
-        // get the first node for the HTML string, even in cases like
-        // tables and lists where a simple innerHTML on a div would
-        // swallow some of the content.
-        node = firstNodeFor(start.parentNode, html);
-
-        if (outerToo) {
-          start.parentNode.removeChild(start);
-        }
-
-        // copy the nodes for the HTML between the starting and ending
-        // placeholder.
-        while (node) {
-          nextSibling = node.nextSibling;
-          parentNode.insertBefore(node, end);
-          node = nextSibling;
-        }
-      };
-
-      // remove the nodes in the DOM representing this metamorph.
-      //
-      // this includes the starting and ending placeholders.
-      removeFunc = function() {
-        var start = realNode(document.getElementById(this.start));
-        var end = document.getElementById(this.end);
-
-        this.html('');
-        start.parentNode.removeChild(start);
-        end.parentNode.removeChild(end);
-      };
-
-      appendToFunc = function(parentNode) {
-        var node = firstNodeFor(parentNode, this.outerHTML());
-        var nextSibling;
-
-        while (node) {
-          nextSibling = node.nextSibling;
-          parentNode.appendChild(node);
-          node = nextSibling;
-        }
-      };
-
-      afterFunc = function(html) {
-        // get the real starting node. see realNode for details.
-        var end = document.getElementById(this.end);
-        var insertBefore = end.nextSibling;
-        var parentNode = end.parentNode;
-        var nextSibling;
-        var node;
-
-        // get the first node for the HTML string, even in cases like
-        // tables and lists where a simple innerHTML on a div would
-        // swallow some of the content.
-        node = firstNodeFor(parentNode, html);
-
-        // copy the nodes for the HTML between the starting and ending
-        // placeholder.
-        while (node) {
-          nextSibling = node.nextSibling;
-          parentNode.insertBefore(node, insertBefore);
-          node = nextSibling;
-        }
-      };
-
-      prependFunc = function(html) {
-        var start = document.getElementById(this.start);
-        var parentNode = start.parentNode;
-        var nextSibling;
-        var node;
-
-        node = firstNodeFor(parentNode, html);
-        var insertBefore = start.nextSibling;
-
-        while (node) {
-          nextSibling = node.nextSibling;
-          parentNode.insertBefore(node, insertBefore);
-          node = nextSibling;
-        }
+      prototype.createElement = function(tagName) {
+        return this.document.createElement(tagName);
       };
     }
 
-    Metamorph.prototype.html = function(html) {
-      this.checkRemoved();
-      if (html === undefined) { return this.innerHTML; }
-
-      htmlFunc.call(this, html);
-
-      this.innerHTML = html;
+    prototype.setNamespace = function(ns) {
+      this.namespace = ns;
     };
 
-    Metamorph.prototype.replaceWith = function(html) {
-      this.checkRemoved();
-      htmlFunc.call(this, html, true);
+    prototype.detectNamespace = function(element) {
+      this.namespace = interiorNamespace(element);
     };
 
-    Metamorph.prototype.remove = removeFunc;
-    Metamorph.prototype.outerHTML = outerHTMLFunc;
-    Metamorph.prototype.appendTo = appendToFunc;
-    Metamorph.prototype.after = afterFunc;
-    Metamorph.prototype.prepend = prependFunc;
-    Metamorph.prototype.startTag = startTagFunc;
-    Metamorph.prototype.endTag = endTagFunc;
-
-    Metamorph.prototype.isRemoved = function() {
-      var before = document.getElementById(this.start);
-      var after = document.getElementById(this.end);
-
-      return !before || !after;
+    prototype.createDocumentFragment = function(){
+      return this.document.createDocumentFragment();
     };
 
-    Metamorph.prototype.checkRemoved = function() {
-      if (this.isRemoved()) {
-        throw new Error("Cannot perform operations on a Metamorph that is not in the DOM.");
+    prototype.createTextNode = function(text){
+      return this.document.createTextNode(text);
+    };
+
+    prototype.repairClonedNode = function(element, blankChildTextNodes, isChecked){
+      if (deletesBlankTextNodes && blankChildTextNodes.length > 0) {
+        for (var i=0, len=blankChildTextNodes.length;i<len;i++){
+          var textNode = this.document.createTextNode(''),
+              offset = blankChildTextNodes[i],
+              before = element.childNodes[offset];
+          if (before) {
+            element.insertBefore(textNode, before);
+          } else {
+            element.appendChild(textNode);
+          }
+        }
+      }
+      if (ignoresCheckedAttribute && isChecked) {
+        element.setAttribute('checked', 'checked');
       }
     };
 
-    return Metamorph;
-  });
+    prototype.cloneNode = function(element, deep){
+      var clone = element.cloneNode(!!deep);
+      return clone;
+    };
 
-define("route-recognizer",
+    prototype.createMorph = function(parent, start, end, contextualElement){
+      if (!contextualElement && parent.nodeType === 1) {
+        contextualElement = parent;
+      }
+      return new Morph(parent, start, end, this, contextualElement);
+    };
+
+    // This helper is just to keep the templates good looking,
+    // passing integers instead of element references.
+    prototype.createMorphAt = function(parent, startIndex, endIndex, contextualElement){
+      var childNodes = parent.childNodes,
+          start = startIndex === -1 ? null : childNodes[startIndex],
+          end = endIndex === -1 ? null : childNodes[endIndex];
+      return this.createMorph(parent, start, end, contextualElement);
+    };
+
+    prototype.insertMorphBefore = function(element, referenceChild, contextualElement) {
+      var start = this.document.createTextNode('');
+      var end = this.document.createTextNode('');
+      element.insertBefore(start, referenceChild);
+      element.insertBefore(end, referenceChild);
+      return this.createMorph(element, start, end, contextualElement);
+    };
+
+    prototype.appendMorph = function(element, contextualElement) {
+      var start = this.document.createTextNode('');
+      var end = this.document.createTextNode('');
+      element.appendChild(start);
+      element.appendChild(end);
+      return this.createMorph(element, start, end, contextualElement);
+    };
+
+    prototype.parseHTML = function(html, contextualElement) {
+      var isSVGContent = (
+        isSVG(this.namespace) &&
+        !svgHTMLIntegrationPoints[contextualElement.tagName]
+      );
+
+      if (isSVGContent) {
+        return buildSVGDOM(html, this);
+      } else {
+        var nodes = buildHTMLDOM(html, contextualElement, this);
+        if (detectOmittedStartTag(html, contextualElement)) {
+          var node = nodes[0];
+          while (node && node.nodeType !== 1) {
+            node = node.nextSibling;
+          }
+          return node.childNodes;
+        } else {
+          return nodes;
+        }
+      }
+    };
+
+    __exports__["default"] = DOMHelper;
+  });
+enifed("morph/dom-helper/build-html-dom",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var svgHTMLIntegrationPoints = {foreignObject: 1, desc: 1, title: 1};
+    __exports__.svgHTMLIntegrationPoints = svgHTMLIntegrationPoints;var svgNamespace = 'http://www.w3.org/2000/svg';
+    __exports__.svgNamespace = svgNamespace;
+    // Safari does not like using innerHTML on SVG HTML integration
+    // points (desc/title/foreignObject).
+    var needsIntegrationPointFix = document && document.createElementNS && (function() {
+      // In FF title will not accept innerHTML.
+      var testEl = document.createElementNS(svgNamespace, 'title');
+      testEl.innerHTML = "<div></div>";
+      return testEl.childNodes.length === 0 || testEl.childNodes[0].nodeType !== 1;
+    })();
+
+    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+    // is a "zero-scope" element. This problem can be worked around by making
+    // the first node an invisible text node. We, like Modernizr, use &shy;
+    var needsShy = document && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "<div></div>";
+      testEl.firstChild.innerHTML = "<script><\/script>";
+      return testEl.firstChild.innerHTML === '';
+    })();
+
+    // IE 8 (and likely earlier) likes to move whitespace preceeding
+    // a script tag to appear after it. This means that we can
+    // accidentally remove whitespace when updating a morph.
+    var movesWhitespace = document && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "Test: <script type='text/x-placeholder'><\/script>Value";
+      return testEl.childNodes[0].nodeValue === 'Test:' &&
+              testEl.childNodes[2].nodeValue === ' Value';
+    })();
+
+    // IE8 create a selected attribute where they should only
+    // create a property
+    var createsSelectedAttribute = document && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "<select><option></option></select>";
+      return testEl.childNodes[0].childNodes[0].getAttribute('selected') === 'selected';
+    })();
+
+    var detectAutoSelectedOption;
+    if (createsSelectedAttribute) {
+      var detectAutoSelectedOptionRegex = /<option[^>]*selected/;
+      detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
+        return select.selectedIndex === 0 &&
+               !detectAutoSelectedOptionRegex.test(html);
+      };
+    } else {
+      detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
+        var selectedAttribute = option.getAttribute('selected');
+        return select.selectedIndex === 0 && (
+                 selectedAttribute === null ||
+                 ( selectedAttribute !== '' && selectedAttribute.toLowerCase() !== 'selected' )
+                );
+      };
+    }
+
+    // IE 9 and earlier don't allow us to set innerHTML on col, colgroup, frameset,
+    // html, style, table, tbody, tfoot, thead, title, tr. Detect this and add
+    // them to an initial list of corrected tags.
+    //
+    // Here we are only dealing with the ones which can have child nodes.
+    //
+    var tagNamesRequiringInnerHTMLFix, tableNeedsInnerHTMLFix;
+    var tableInnerHTMLTestElement = document.createElement('table');
+    try {
+      tableInnerHTMLTestElement.innerHTML = '<tbody></tbody>';
+    } catch (e) {
+    } finally {
+      tableNeedsInnerHTMLFix = (tableInnerHTMLTestElement.childNodes.length === 0);
+    }
+    if (tableNeedsInnerHTMLFix) {
+      tagNamesRequiringInnerHTMLFix = {
+        colgroup: ['table'],
+        table: [],
+        tbody: ['table'],
+        tfoot: ['table'],
+        thead: ['table'],
+        tr: ['table', 'tbody']
+      };
+    }
+
+    // IE 8 doesn't allow setting innerHTML on a select tag. Detect this and
+    // add it to the list of corrected tags.
+    //
+    var selectInnerHTMLTestElement = document.createElement('select');
+    selectInnerHTMLTestElement.innerHTML = '<option></option>';
+    if (selectInnerHTMLTestElement) {
+      tagNamesRequiringInnerHTMLFix = tagNamesRequiringInnerHTMLFix || {};
+      tagNamesRequiringInnerHTMLFix.select = [];
+    }
+
+    function scriptSafeInnerHTML(element, html) {
+      // without a leading text node, IE will drop a leading script tag.
+      html = '&shy;'+html;
+
+      element.innerHTML = html;
+
+      var nodes = element.childNodes;
+
+      // Look for &shy; to remove it.
+      var shyElement = nodes[0];
+      while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+        shyElement = shyElement.firstChild;
+      }
+      // At this point it's the actual unicode character.
+      if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+        var newValue = shyElement.nodeValue.slice(1);
+        if (newValue.length) {
+          shyElement.nodeValue = shyElement.nodeValue.slice(1);
+        } else {
+          shyElement.parentNode.removeChild(shyElement);
+        }
+      }
+
+      return nodes;
+    }
+
+    function buildDOMWithFix(html, contextualElement){
+      var tagName = contextualElement.tagName;
+
+      // Firefox versions < 11 do not have support for element.outerHTML.
+      var outerHTML = contextualElement.outerHTML || new XMLSerializer().serializeToString(contextualElement);
+      if (!outerHTML) {
+        throw "Can't set innerHTML on "+tagName+" in this browser";
+      }
+
+      var wrappingTags = tagNamesRequiringInnerHTMLFix[tagName.toLowerCase()];
+      var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0];
+      var endTag = '</'+tagName+'>';
+
+      var wrappedHTML = [startTag, html, endTag];
+
+      var i = wrappingTags.length;
+      var wrappedDepth = 1 + i;
+      while(i--) {
+        wrappedHTML.unshift('<'+wrappingTags[i]+'>');
+        wrappedHTML.push('</'+wrappingTags[i]+'>');
+      }
+
+      var wrapper = document.createElement('div');
+      scriptSafeInnerHTML(wrapper, wrappedHTML.join(''));
+      var element = wrapper;
+      while (wrappedDepth--) {
+        element = element.firstChild;
+        while (element && element.nodeType !== 1) {
+          element = element.nextSibling;
+        }
+      }
+      while (element && element.tagName !== tagName) {
+        element = element.nextSibling;
+      }
+      return element ? element.childNodes : [];
+    }
+
+    var buildDOM;
+    if (needsShy) {
+      buildDOM = function buildDOM(html, contextualElement, dom){
+        contextualElement = dom.cloneNode(contextualElement, false);
+        scriptSafeInnerHTML(contextualElement, html);
+        return contextualElement.childNodes;
+      };
+    } else {
+      buildDOM = function buildDOM(html, contextualElement, dom){
+        contextualElement = dom.cloneNode(contextualElement, false);
+        contextualElement.innerHTML = html;
+        return contextualElement.childNodes;
+      };
+    }
+
+    var buildIESafeDOM;
+    if (tagNamesRequiringInnerHTMLFix || movesWhitespace) {
+      buildIESafeDOM = function buildIESafeDOM(html, contextualElement, dom) {
+        // Make a list of the leading text on script nodes. Include
+        // script tags without any whitespace for easier processing later.
+        var spacesBefore = [];
+        var spacesAfter = [];
+        html = html.replace(/(\s*)(<script)/g, function(match, spaces, tag) {
+          spacesBefore.push(spaces);
+          return tag;
+        });
+
+        html = html.replace(/(<\/script>)(\s*)/g, function(match, tag, spaces) {
+          spacesAfter.push(spaces);
+          return tag;
+        });
+
+        // Fetch nodes
+        var nodes;
+        if (tagNamesRequiringInnerHTMLFix[contextualElement.tagName.toLowerCase()]) {
+          // buildDOMWithFix uses string wrappers for problematic innerHTML.
+          nodes = buildDOMWithFix(html, contextualElement);
+        } else {
+          nodes = buildDOM(html, contextualElement, dom);
+        }
+
+        // Build a list of script tags, the nodes themselves will be
+        // mutated as we add test nodes.
+        var i, j, node, nodeScriptNodes;
+        var scriptNodes = [];
+        for (i=0;node=nodes[i];i++) {
+          if (node.nodeType !== 1) {
+            continue;
+          }
+          if (node.tagName === 'SCRIPT') {
+            scriptNodes.push(node);
+          } else {
+            nodeScriptNodes = node.getElementsByTagName('script');
+            for (j=0;j<nodeScriptNodes.length;j++) {
+              scriptNodes.push(nodeScriptNodes[j]);
+            }
+          }
+        }
+
+        // Walk the script tags and put back their leading text nodes.
+        var scriptNode, textNode, spaceBefore, spaceAfter;
+        for (i=0;scriptNode=scriptNodes[i];i++) {
+          spaceBefore = spacesBefore[i];
+          if (spaceBefore && spaceBefore.length > 0) {
+            textNode = dom.document.createTextNode(spaceBefore);
+            scriptNode.parentNode.insertBefore(textNode, scriptNode);
+          }
+
+          spaceAfter = spacesAfter[i];
+          if (spaceAfter && spaceAfter.length > 0) {
+            textNode = dom.document.createTextNode(spaceAfter);
+            scriptNode.parentNode.insertBefore(textNode, scriptNode.nextSibling);
+          }
+        }
+
+        return nodes;
+      };
+    } else {
+      buildIESafeDOM = buildDOM;
+    }
+
+    // When parsing innerHTML, the browser may set up DOM with some things
+    // not desired. For example, with a select element context and option
+    // innerHTML the first option will be marked selected.
+    //
+    // This method cleans up some of that, resetting those values back to
+    // their defaults.
+    //
+    function buildSafeDOM(html, contextualElement, dom) {
+      var childNodes = buildIESafeDOM(html, contextualElement, dom);
+
+      if (contextualElement.tagName === 'SELECT') {
+        // Walk child nodes
+        for (var i = 0; childNodes[i]; i++) {
+          // Find and process the first option child node
+          if (childNodes[i].tagName === 'OPTION') {
+            if (detectAutoSelectedOption(childNodes[i].parentNode, childNodes[i], html)) {
+              // If the first node is selected but does not have an attribute,
+              // presume it is not really selected.
+              childNodes[i].parentNode.selectedIndex = -1;
+            }
+            break;
+          }
+        }
+      }
+
+      return childNodes;
+    }
+
+    var buildHTMLDOM;
+    if (needsIntegrationPointFix) {
+      buildHTMLDOM = function buildHTMLDOM(html, contextualElement, dom){
+        if (svgHTMLIntegrationPoints[contextualElement.tagName]) {
+          return buildSafeDOM(html, document.createElement('div'), dom);
+        } else {
+          return buildSafeDOM(html, contextualElement, dom);
+        }
+      };
+    } else {
+      buildHTMLDOM = buildSafeDOM;
+    }
+
+    __exports__.buildHTMLDOM = buildHTMLDOM;
+  });
+enifed("morph/morph",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var splice = Array.prototype.splice;
+
+    function ensureStartEnd(start, end) {
+      if (start === null || end === null) {
+        throw new Error('a fragment parent must have boundary nodes in order to detect insertion');
+      }
+    }
+
+    function ensureContext(contextualElement) {
+      if (!contextualElement || contextualElement.nodeType !== 1) {
+        throw new Error('An element node must be provided for a contextualElement, you provided ' +
+                        (contextualElement ? 'nodeType ' + contextualElement.nodeType : 'nothing'));
+      }
+    }
+
+    // TODO: this is an internal API, this should be an assert
+    function Morph(parent, start, end, domHelper, contextualElement) {
+      if (parent.nodeType === 11) {
+        ensureStartEnd(start, end);
+        this.element = null;
+      } else {
+        this.element = parent;
+      }
+      this._parent = parent;
+      this.start = start;
+      this.end = end;
+      this.domHelper = domHelper;
+      ensureContext(contextualElement);
+      this.contextualElement = contextualElement;
+      this.reset();
+    }
+
+    Morph.prototype.reset = function() {
+      this.text = null;
+      this.owner = null;
+      this.morphs = null;
+      this.before = null;
+      this.after = null;
+      this.escaped = true;
+    };
+
+    Morph.prototype.parent = function () {
+      if (!this.element) {
+        var parent = this.start.parentNode;
+        if (this._parent !== parent) {
+          this.element = this._parent = parent;
+        }
+      }
+      return this._parent;
+    };
+
+    Morph.prototype.destroy = function () {
+      if (this.owner) {
+        this.owner.removeMorph(this);
+      } else {
+        clear(this.element || this.parent(), this.start, this.end);
+      }
+    };
+
+    Morph.prototype.removeMorph = function (morph) {
+      var morphs = this.morphs;
+      for (var i=0, l=morphs.length; i<l; i++) {
+        if (morphs[i] === morph) {
+          this.replace(i, 1);
+          break;
+        }
+      }
+    };
+
+    Morph.prototype.update = function (nodeOrString) {
+      this._update(this.element || this.parent(), nodeOrString);
+    };
+
+    Morph.prototype.updateNode = function (node) {
+      var parent = this.element || this.parent();
+      if (!node) return this._updateText(parent, '');
+      this._updateNode(parent, node);
+    };
+
+    Morph.prototype.updateText = function (text) {
+      this._updateText(this.element || this.parent(), text);
+    };
+
+    Morph.prototype.updateHTML = function (html) {
+      var parent = this.element || this.parent();
+      if (!html) return this._updateText(parent, '');
+      this._updateHTML(parent, html);
+    };
+
+    Morph.prototype._update = function (parent, nodeOrString) {
+      if (nodeOrString === null || nodeOrString === undefined) {
+        this._updateText(parent, '');
+      } else if (typeof nodeOrString === 'string') {
+        if (this.escaped) {
+          this._updateText(parent, nodeOrString);
+        } else {
+          this._updateHTML(parent, nodeOrString);
+        }
+      } else if (nodeOrString.nodeType) {
+        this._updateNode(parent, nodeOrString);
+      } else if (nodeOrString.string) { // duck typed SafeString
+        this._updateHTML(parent, nodeOrString.string);
+      } else {
+        this._updateText(parent, nodeOrString.toString());
+      }
+    };
+
+    Morph.prototype._updateNode = function (parent, node) {
+      if (this.text) {
+        if (node.nodeType === 3) {
+          this.text.nodeValue = node.nodeValue;
+          return;
+        } else {
+          this.text = null;
+        }
+      }
+      var start = this.start, end = this.end;
+      clear(parent, start, end);
+      parent.insertBefore(node, end);
+      if (this.before !== null) {
+        this.before.end = start.nextSibling;
+      }
+      if (this.after !== null) {
+        this.after.start = end.previousSibling;
+      }
+    };
+
+    Morph.prototype._updateText = function (parent, text) {
+      if (this.text) {
+        this.text.nodeValue = text;
+        return;
+      }
+      var node = this.domHelper.createTextNode(text);
+      this.text = node;
+      clear(parent, this.start, this.end);
+      parent.insertBefore(node, this.end);
+      if (this.before !== null) {
+        this.before.end = node;
+      }
+      if (this.after !== null) {
+        this.after.start = node;
+      }
+    };
+
+    Morph.prototype._updateHTML = function (parent, html) {
+      var start = this.start, end = this.end;
+      clear(parent, start, end);
+      this.text = null;
+      var childNodes = this.domHelper.parseHTML(html, this.contextualElement);
+      appendChildren(parent, end, childNodes);
+      if (this.before !== null) {
+        this.before.end = start.nextSibling;
+      }
+      if (this.after !== null) {
+        this.after.start = end.previousSibling;
+      }
+    };
+
+    Morph.prototype.append = function (node) {
+      if (this.morphs === null) this.morphs = [];
+      var index = this.morphs.length;
+      return this.insert(index, node);
+    };
+
+    Morph.prototype.insert = function (index, node) {
+      if (this.morphs === null) this.morphs = [];
+      var parent = this.element || this.parent();
+      var morphs = this.morphs;
+      var before = index > 0 ? morphs[index-1] : null;
+      var after  = index < morphs.length ? morphs[index] : null;
+      var start  = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
+      var end    = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
+      var morph  = new Morph(parent, start, end, this.domHelper, this.contextualElement);
+
+      morph.owner = this;
+      morph._update(parent, node);
+
+      if (before !== null) {
+        morph.before = before;
+        before.end = start.nextSibling;
+        before.after = morph;
+      }
+
+      if (after !== null) {
+        morph.after = after;
+        after.before = morph;
+        after.start = end.previousSibling;
+      }
+
+      this.morphs.splice(index, 0, morph);
+      return morph;
+    };
+
+    Morph.prototype.replace = function (index, removedLength, addedNodes) {
+      if (this.morphs === null) this.morphs = [];
+      var parent = this.element || this.parent();
+      var morphs = this.morphs;
+      var before = index > 0 ? morphs[index-1] : null;
+      var after = index+removedLength < morphs.length ? morphs[index+removedLength] : null;
+      var start = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
+      var end   = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
+      var addedLength = addedNodes === undefined ? 0 : addedNodes.length;
+      var args, i, current;
+
+      if (removedLength > 0) {
+        clear(parent, start, end);
+      }
+
+      if (addedLength === 0) {
+        if (before !== null) {
+          before.after = after;
+          before.end = end;
+        }
+        if (after !== null) {
+          after.before = before;
+          after.start = start;
+        }
+        morphs.splice(index, removedLength);
+        return;
+      }
+
+      args = new Array(addedLength+2);
+      if (addedLength > 0) {
+        for (i=0; i<addedLength; i++) {
+          args[i+2] = current = new Morph(parent, start, end, this.domHelper, this.contextualElement);
+          current._update(parent, addedNodes[i]);
+          current.owner = this;
+          if (before !== null) {
+            current.before = before;
+            before.end = start.nextSibling;
+            before.after = current;
+          }
+          before = current;
+          start = end === null ? parent.lastChild : end.previousSibling;
+        }
+        if (after !== null) {
+          current.after = after;
+          after.before = current;
+          after.start = end.previousSibling;
+        }
+      }
+
+      args[0] = index;
+      args[1] = removedLength;
+
+      splice.apply(morphs, args);
+    };
+
+    function appendChildren(parent, end, nodeList) {
+      var ref = end;
+      var i = nodeList.length;
+      var node;
+
+      while (i--) {
+        node = nodeList[i];
+        parent.insertBefore(node, ref);
+        ref = node;
+      }
+    }
+
+    function clear(parent, start, end) {
+      var current, previous;
+      if (end === null) {
+        current = parent.lastChild;
+      } else {
+        current = end.previousSibling;
+      }
+
+      while (current !== null && current !== start) {
+        previous = current.previousSibling;
+        parent.removeChild(current);
+        current = previous;
+      }
+    }
+
+    __exports__["default"] = Morph;
+  });
+enifed("route-recognizer",
   ["route-recognizer/dsl","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -43342,7 +44801,7 @@ define("route-recognizer",
 
     __exports__["default"] = RouteRecognizer;
   });
-define("route-recognizer/dsl",
+enifed("route-recognizer/dsl",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -43446,8 +44905,15 @@ define("route-recognizer/dsl",
       }, this);
     }
   });
+enifed("router",
+  ["./router/router","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Router = __dependency1__["default"];
 
-define("router/handler-info",
+    __exports__["default"] = Router;
+  });
+enifed("router/handler-info",
   ["./utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -43624,7 +45090,7 @@ define("router/handler-info",
 
     __exports__["default"] = HandlerInfo;
   });
-define("router/handler-info/factory",
+enifed("router/handler-info/factory",
   ["router/handler-info/resolved-handler-info","router/handler-info/unresolved-handler-info-by-object","router/handler-info/unresolved-handler-info-by-param","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -43647,7 +45113,7 @@ define("router/handler-info/factory",
 
     __exports__["default"] = handlerInfoFactory;
   });
-define("router/handler-info/resolved-handler-info",
+enifed("router/handler-info/resolved-handler-info",
   ["../handler-info","router/utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -43678,7 +45144,7 @@ define("router/handler-info/resolved-handler-info",
 
     __exports__["default"] = ResolvedHandlerInfo;
   });
-define("router/handler-info/unresolved-handler-info-by-object",
+enifed("router/handler-info/unresolved-handler-info-by-object",
   ["../handler-info","router/utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -43740,7 +45206,7 @@ define("router/handler-info/unresolved-handler-info-by-object",
 
     __exports__["default"] = UnresolvedHandlerInfoByObject;
   });
-define("router/handler-info/unresolved-handler-info-by-param",
+enifed("router/handler-info/unresolved-handler-info-by-param",
   ["../handler-info","router/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -43774,7 +45240,7 @@ define("router/handler-info/unresolved-handler-info-by-param",
 
     __exports__["default"] = UnresolvedHandlerInfoByParam;
   });
-define("router/router",
+enifed("router/router",
   ["route-recognizer","rsvp/promise","./utils","./transition-state","./transition","./transition-intent/named-transition-intent","./transition-intent/url-transition-intent","./handler-info","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -43805,6 +45271,58 @@ define("router/router",
       this.reset();
     }
 
+    function getTransitionByIntent(intent, isIntermediate) {
+      var wasTransitioning = !!this.activeTransition;
+      var oldState = wasTransitioning ? this.activeTransition.state : this.state;
+      var newTransition;
+
+      var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
+      var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
+
+      if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
+
+        // This is a no-op transition. See if query params changed.
+        if (queryParamChangelist) {
+          newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
+          if (newTransition) {
+            return newTransition;
+          }
+        }
+
+        // No-op. No need to create a new transition.
+        return new Transition(this);
+      }
+
+      if (isIntermediate) {
+        setupContexts(this, newState);
+        return;
+      }
+
+      // Create a new transition to the destination route.
+      newTransition = new Transition(this, intent, newState);
+
+      // Abort and usurp any previously active transition.
+      if (this.activeTransition) {
+        this.activeTransition.abort();
+      }
+      this.activeTransition = newTransition;
+
+      // Transition promises by default resolve with resolved state.
+      // For our purposes, swap out the promise to resolve
+      // after the transition has been finalized.
+      newTransition.promise = newTransition.promise.then(function(result) {
+        return finalizeTransition(newTransition, result.state);
+      }, null, promiseLabel("Settle transition promise when transition is finalized"));
+
+      if (!wasTransitioning) {
+        notifyExistingHandlers(this, newState, newTransition);
+      }
+
+      fireQueryParamDidChange(this, newState, queryParamChangelist);
+
+      return newTransition;
+    }
+
     Router.prototype = {
 
       /**
@@ -43869,58 +45387,8 @@ define("router/router",
       // it shall remain until our ES6 transpiler can
       // handle cyclical deps.
       transitionByIntent: function(intent, isIntermediate) {
-
-        var wasTransitioning = !!this.activeTransition;
-        var oldState = wasTransitioning ? this.activeTransition.state : this.state;
-        var newTransition;
-        var router = this;
-
         try {
-          var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
-          var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
-
-          if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
-
-            // This is a no-op transition. See if query params changed.
-            if (queryParamChangelist) {
-              newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
-              if (newTransition) {
-                return newTransition;
-              }
-            }
-
-            // No-op. No need to create a new transition.
-            return new Transition(this);
-          }
-
-          if (isIntermediate) {
-            setupContexts(this, newState);
-            return;
-          }
-
-          // Create a new transition to the destination route.
-          newTransition = new Transition(this, intent, newState);
-
-          // Abort and usurp any previously active transition.
-          if (this.activeTransition) {
-            this.activeTransition.abort();
-          }
-          this.activeTransition = newTransition;
-
-          // Transition promises by default resolve with resolved state.
-          // For our purposes, swap out the promise to resolve
-          // after the transition has been finalized.
-          newTransition.promise = newTransition.promise.then(function(result) {
-            return finalizeTransition(newTransition, result.state);
-          }, null, promiseLabel("Settle transition promise when transition is finalized"));
-
-          if (!wasTransitioning) {
-            notifyExistingHandlers(this, newState, newTransition);
-          }
-
-          fireQueryParamDidChange(this, newState, queryParamChangelist);
-
-          return newTransition;
+          return getTransitionByIntent.apply(this, arguments);
         } catch(e) {
           return new Transition(this, intent, null, e);
         }
@@ -44262,7 +45730,9 @@ define("router/router",
       var handler = handlerInfo.handler,
           context = handlerInfo.context;
 
-      callHook(handler, 'enter', transition);
+      if (enter) {
+        callHook(handler, 'enter', transition);
+      }
       if (transition && transition.isAborted) {
         throw new TransitionAborted();
       }
@@ -44591,7 +46061,7 @@ define("router/router",
 
     __exports__["default"] = Router;
   });
-define("router/transition-intent",
+enifed("router/transition-intent",
   ["./utils","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -44611,7 +46081,7 @@ define("router/transition-intent",
 
     __exports__["default"] = TransitionIntent;
   });
-define("router/transition-intent/named-transition-intent",
+enifed("router/transition-intent/named-transition-intent",
   ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -44812,7 +46282,7 @@ define("router/transition-intent/named-transition-intent",
       }
     });
   });
-define("router/transition-intent/url-transition-intent",
+enifed("router/transition-intent/url-transition-intent",
   ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -44882,7 +46352,7 @@ define("router/transition-intent/url-transition-intent",
       this.name = "UnrecognizedURLError";
     }
   });
-define("router/transition-state",
+enifed("router/transition-state",
   ["./handler-info","./utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -44998,7 +46468,7 @@ define("router/transition-state",
 
     __exports__["default"] = TransitionState;
   });
-define("router/transition",
+enifed("router/transition",
   ["rsvp/promise","./handler-info","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45309,7 +46779,7 @@ define("router/transition",
     __exports__.logAbort = logAbort;
     __exports__.TransitionAborted = TransitionAborted;
   });
-define("router/utils",
+enifed("router/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -45528,16 +46998,7 @@ define("router/utils",
     __exports__.resolveHook = resolveHook;
     __exports__.applyHook = applyHook;
   });
-define("router",
-  ["./router/router","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var Router = __dependency1__["default"];
-
-    __exports__["default"] = Router;
-  });
-
-define("rsvp",
+enifed("rsvp",
   ["./rsvp/promise","./rsvp/events","./rsvp/node","./rsvp/all","./rsvp/all-settled","./rsvp/race","./rsvp/hash","./rsvp/hash-settled","./rsvp/rethrow","./rsvp/defer","./rsvp/config","./rsvp/map","./rsvp/resolve","./rsvp/reject","./rsvp/filter","./rsvp/asap","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
@@ -45604,7 +47065,7 @@ define("rsvp",
     __exports__.map = map;
     __exports__.filter = filter;
   });
-define("rsvp.umd",
+enifed("rsvp.umd",
   ["./rsvp"],
   function(__dependency1__) {
     "use strict";
@@ -45649,15 +47110,15 @@ define("rsvp.umd",
     };
 
     /* global define:true module:true window: true */
-    if (typeof define === 'function' && define.amd) {
-      define(function() { return RSVP; });
-    } else if (typeof module !== 'undefined' && module.exports) {
-      module.exports = RSVP;
+    if (typeof enifed === 'function' && enifed['amd']) {
+      enifed(function() { return RSVP; });
+    } else if (typeof module !== 'undefined' && module['exports']) {
+      module['exports'] = RSVP;
     } else if (typeof this !== 'undefined') {
       this['RSVP'] = RSVP;
     }
   });
-define("rsvp/-internal",
+enifed("rsvp/-internal",
   ["./utils","./instrument","./config","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45668,6 +47129,10 @@ define("rsvp/-internal",
 
     var config = __dependency3__.config;
 
+    function  withOwnPromise() {
+      return new TypeError('A promises callback cannot return that same promise.');
+    }
+
     function noop() {}
 
     var PENDING   = void 0;
@@ -45867,7 +47332,7 @@ define("rsvp/-internal",
         }
 
         if (promise === value) {
-          reject(promise, new TypeError('A promises callback cannot return that same promise.'));
+          reject(promise, withOwnPromise());
           return;
         }
 
@@ -45914,7 +47379,7 @@ define("rsvp/-internal",
     __exports__.REJECTED = REJECTED;
     __exports__.PENDING = PENDING;
   });
-define("rsvp/all-settled",
+enifed("rsvp/all-settled",
   ["./enumerator","./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45990,7 +47455,7 @@ define("rsvp/all-settled",
       return new AllSettled(Promise, entries, label).promise;
     }
   });
-define("rsvp/all",
+enifed("rsvp/all",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46010,7 +47475,7 @@ define("rsvp/all",
       return Promise.all(array, label);
     }
   });
-define("rsvp/asap",
+enifed("rsvp/asap",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -46028,7 +47493,8 @@ define("rsvp/asap",
       }
     }
 
-    var browserGlobal = (typeof window !== 'undefined') ? window : {};
+    var browserWindow = (typeof window !== 'undefined') ? window : undefined
+    var browserGlobal = browserWindow || {};
     var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
 
     // test for web worker but not in IE10
@@ -46043,6 +47509,13 @@ define("rsvp/asap",
       };
     }
 
+    // vertx
+    function useVertxTimer() {
+      return function() {
+        vertxNext(flush);
+      };
+    }
+
     function useMutationObserver() {
       var iterations = 0;
       var observer = new BrowserMutationObserver(flush);
@@ -46084,8 +47557,17 @@ define("rsvp/asap",
       len = 0;
     }
 
-    var scheduleFlush;
+    function attemptVertex() {
+      try {
+        var vertx = eriuqer('vertx');
+        var vertxNext = vertx.runOnLoop || vertx.runOnContext;
+        return useVertxTimer();
+      } catch(e) {
+        return useSetTimeout();
+      }
+    }
 
+    var scheduleFlush;
     // Decide what async method to use to triggering processing of queued callbacks:
     if (typeof process !== 'undefined' && {}.toString.call(process) === '[object process]') {
       scheduleFlush = useNextTick();
@@ -46093,11 +47575,13 @@ define("rsvp/asap",
       scheduleFlush = useMutationObserver();
     } else if (isWorker) {
       scheduleFlush = useMessageChannel();
+    } else if (browserWindow === undefined && typeof eriuqer === 'function') {
+      scheduleFlush = attemptVertex();
     } else {
       scheduleFlush = useSetTimeout();
     }
   });
-define("rsvp/config",
+enifed("rsvp/config",
   ["./events","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46128,7 +47612,7 @@ define("rsvp/config",
     __exports__.config = config;
     __exports__.configure = configure;
   });
-define("rsvp/defer",
+enifed("rsvp/defer",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46170,15 +47654,15 @@ define("rsvp/defer",
     __exports__["default"] = function defer(label) {
       var deferred = { };
 
-      deferred.promise = new Promise(function(resolve, reject) {
-        deferred.resolve = resolve;
-        deferred.reject = reject;
+      deferred['promise'] = new Promise(function(resolve, reject) {
+        deferred['resolve'] = resolve;
+        deferred['reject'] = reject;
       }, label);
 
       return deferred;
     }
   });
-define("rsvp/enumerator",
+enifed("rsvp/enumerator",
   ["./utils","./-internal","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46304,7 +47788,7 @@ define("rsvp/enumerator",
       });
     };
   });
-define("rsvp/events",
+enifed("rsvp/events",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -46510,7 +47994,7 @@ define("rsvp/events",
       }
     };
   });
-define("rsvp/filter",
+enifed("rsvp/filter",
   ["./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46633,7 +48117,7 @@ define("rsvp/filter",
       });
     }
   });
-define("rsvp/hash-settled",
+enifed("rsvp/hash-settled",
   ["./promise","./enumerator","./promise-hash","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -46760,7 +48244,7 @@ define("rsvp/hash-settled",
       return new HashSettled(Promise, object, label).promise;
     }
   });
-define("rsvp/hash",
+enifed("rsvp/hash",
   ["./promise","./promise-hash","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46859,7 +48343,7 @@ define("rsvp/hash",
       return new PromiseHash(Promise, object, label).promise;
     }
   });
-define("rsvp/instrument",
+enifed("rsvp/instrument",
   ["./config","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46868,31 +48352,44 @@ define("rsvp/instrument",
 
     var queue = [];
 
+    function scheduleFlush() {
+      setTimeout(function() {
+        var entry;
+        for (var i = 0; i < queue.length; i++) {
+          entry = queue[i];
+
+          var payload = entry.payload;
+
+          payload.guid = payload.key + payload.id;
+          payload.childGuid = payload.key + payload.childId;
+          if (payload.error) {
+            payload.stack = payload.error.stack;
+          }
+
+          config.trigger(entry.name, entry.payload);
+        }
+        queue.length = 0;
+      }, 50);
+    }
+
     __exports__["default"] = function instrument(eventName, promise, child) {
       if (1 === queue.push({
           name: eventName,
           payload: {
-            guid: promise._guidKey + promise._id,
+            key: promise._guidKey,
+            id:  promise._id,
             eventName: eventName,
             detail: promise._result,
-            childGuid: child && promise._guidKey + child._id,
+            childId: child && child._id,
             label: promise._label,
             timeStamp: now(),
-            stack: new Error(promise._label).stack
+            error: config["instrument-with-stack"] ? new Error(promise._label) : null
           }})) {
-
-            setTimeout(function() {
-              var entry;
-              for (var i = 0; i < queue.length; i++) {
-                entry = queue[i];
-                config.trigger(entry.name, entry.payload);
-              }
-              queue.length = 0;
-            }, 50);
+            scheduleFlush();
           }
       }
   });
-define("rsvp/map",
+enifed("rsvp/map",
   ["./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46994,7 +48491,7 @@ define("rsvp/map",
       });
     }
   });
-define("rsvp/node",
+enifed("rsvp/node",
   ["./promise","./-internal","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -47278,7 +48775,7 @@ define("rsvp/node",
       }
     }
   });
-define("rsvp/promise-hash",
+enifed("rsvp/promise-hash",
   ["./enumerator","./-internal","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -47330,7 +48827,7 @@ define("rsvp/promise-hash",
       }
     };
   });
-define("rsvp/promise",
+enifed("rsvp/promise",
   ["./config","./instrument","./utils","./-internal","./promise/all","./promise/race","./promise/resolve","./promise/reject","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -47819,7 +49316,7 @@ define("rsvp/promise",
       }
     };
   });
-define("rsvp/promise/all",
+enifed("rsvp/promise/all",
   ["../enumerator","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -47876,7 +49373,7 @@ define("rsvp/promise/all",
       return new Enumerator(this, entries, true /* abort on reject */, label).promise;
     }
   });
-define("rsvp/promise/race",
+enifed("rsvp/promise/race",
   ["../utils","../-internal","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -47982,7 +49479,7 @@ define("rsvp/promise/race",
       return promise;
     }
   });
-define("rsvp/promise/reject",
+enifed("rsvp/promise/reject",
   ["../-internal","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -48032,7 +49529,7 @@ define("rsvp/promise/reject",
       return promise;
     }
   });
-define("rsvp/promise/resolve",
+enifed("rsvp/promise/resolve",
   ["../-internal","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -48084,7 +49581,7 @@ define("rsvp/promise/resolve",
       return promise;
     }
   });
-define("rsvp/race",
+enifed("rsvp/race",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -48104,7 +49601,7 @@ define("rsvp/race",
       return Promise.race(array, label);
     }
   });
-define("rsvp/reject",
+enifed("rsvp/reject",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -48125,7 +49622,7 @@ define("rsvp/reject",
       return Promise.reject(reason, label);
     }
   });
-define("rsvp/resolve",
+enifed("rsvp/resolve",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -48147,7 +49644,7 @@ define("rsvp/resolve",
       return Promise.resolve(value, label);
     }
   });
-define("rsvp/rethrow",
+enifed("rsvp/rethrow",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -48198,7 +49695,7 @@ define("rsvp/rethrow",
       throw reason;
     }
   });
-define("rsvp/utils",
+enifed("rsvp/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -48245,4 +49742,4 @@ define("rsvp/utils",
   });
 requireModule("ember");
 
-})();
\ No newline at end of file
+})();
diff --git a/vendor/assets/javascripts/development/list-view.js b/vendor/assets/javascripts/development/list-view.js
deleted file mode 100644
index 45400aa4b9..0000000000
--- a/vendor/assets/javascripts/development/list-view.js
+++ /dev/null
@@ -1,1846 +0,0 @@
-// ==========================================================================
-// Project:   Ember ListView
-// Copyright: ©2012-2013 Erik Bryn, Yapp Inc., and contributors.
-// License:   Licensed under MIT license
-// Version:   0.0.5
-// ==========================================================================
-
-(function(global){
-var define, requireModule, require, requirejs;
-
-(function() {
-
-  var _isArray;
-  if (!Array.isArray) {
-    _isArray = function (x) {
-      return Object.prototype.toString.call(x) === "[object Array]";
-    };
-  } else {
-    _isArray = Array.isArray;
-  }
-  
-  var registry = {}, seen = {}, state = {};
-  var FAILED = false;
-
-  define = function(name, deps, callback) {
-  
-    if (!_isArray(deps)) {
-      callback = deps;
-      deps     =  [];
-    }
-  
-    registry[name] = {
-      deps: deps,
-      callback: callback
-    };
-  };
-
-  function reify(deps, name, seen) {
-    var length = deps.length;
-    var reified = new Array(length);
-    var dep;
-    var exports;
-
-    for (var i = 0, l = length; i < l; i++) {
-      dep = deps[i];
-      if (dep === 'exports') {
-        exports = reified[i] = seen;
-      } else {
-        reified[i] = require(resolve(dep, name));
-      }
-    }
-
-    return {
-      deps: reified,
-      exports: exports
-    };
-  }
-
-  requirejs = require = requireModule = function(name) {
-    if (state[name] !== FAILED &&
-        seen.hasOwnProperty(name)) {
-      return seen[name];
-    }
-
-    if (!registry[name]) {
-      throw new Error('Could not find module ' + name);
-    }
-
-    var mod = registry[name];
-    var reified;
-    var module;
-    var loaded = false;
-
-    seen[name] = { }; // placeholder for run-time cycles
-
-    try {
-      reified = reify(mod.deps, name, seen[name]);
-      module = mod.callback.apply(this, reified.deps);
-      loaded = true;
-    } finally {
-      if (!loaded) {
-        state[name] = FAILED;
-      }
-    }
-
-    return reified.exports ? seen[name] : (seen[name] = module);
-  };
-
-  function resolve(child, name) {
-    if (child.charAt(0) !== '.') { return child; }
-
-    var parts = child.split('/');
-    var nameParts = name.split('/');
-    var parentBase;
-
-    if (nameParts.length === 1) {
-      parentBase = nameParts;
-    } else {
-      parentBase = nameParts.slice(0, -1);
-    }
-
-    for (var i = 0, l = parts.length; i < l; i++) {
-      var part = parts[i];
-
-      if (part === '..') { parentBase.pop(); }
-      else if (part === '.') { continue; }
-      else { parentBase.push(part); }
-    }
-
-    return parentBase.join('/');
-  }
-
-  requirejs.entries = requirejs._eak_seen = registry;
-  requirejs.clear = function(){
-    requirejs.entries = requirejs._eak_seen = registry = {};
-    seen = state = {};
-  };
-})();
-
-define("list-view/helper",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    __exports__["default"] = function emberList(options) {
-      var hash = options.hash;
-      var types = options.hashTypes;
-
-      hash.content = hash.items;
-      delete hash.items;
-
-      types.content = types.items;
-      delete types.items;
-
-      if (!hash.content) {
-        hash.content = "this";
-        types.content = "ID";
-      }
-
-      for (var prop in hash) {
-        if (/-/.test(prop)) {
-          var camelized = Ember.String.camelize(prop);
-          hash[camelized] = hash[prop];
-          types[camelized] = types[prop];
-          delete hash[prop];
-          delete types[prop];
-        }
-      }
-
-      return Ember.Handlebars.helpers.collection.call(this, 'Ember.ListView', options);
-    };
-  });
-define("list-view/list_item_view",
-  ["list-view/list_item_view_mixin","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    // jshint validthis: true
-
-    var ListItemViewMixin = __dependency1__["default"];
-
-    var get = Ember.get, set = Ember.set;
-
-    function backportedInnerString(buffer) {
-      var content = [], childBuffers = buffer.childBuffers;
-
-      Ember.ArrayPolyfills.forEach.call(childBuffers, function(buffer) {
-        var stringy = typeof buffer === 'string';
-        if (stringy) {
-          content.push(buffer);
-        } else {
-          buffer.array(content);
-        }
-      });
-
-      return content.join('');
-    }
-
-    function willInsertElementIfNeeded(view) {
-      if (view.willInsertElement) {
-        view.willInsertElement();
-      }
-    }
-
-    function didInsertElementIfNeeded(view) {
-      if (view.didInsertElement) {
-        view.didInsertElement();
-      }
-    }
-
-    function rerender() {
-      var element, buffer, context, hasChildViews;
-      element = get(this, 'element');
-
-      if (!element) { return; }
-
-      context = get(this, 'context');
-
-
-      // releases action helpers in contents
-      // this means though that the ListItemView itself can't use classBindings or attributeBindings
-      // need support for rerender contents in ember
-      this.triggerRecursively('willClearRender');
-
-      if (this.lengthAfterRender > this.lengthBeforeRender) {
-        this.clearRenderedChildren();
-        this._childViews.length = this.lengthBeforeRender; // triage bug in ember
-      }
-
-      if (context) {
-        buffer = Ember.RenderBuffer();
-        buffer = this.renderToBuffer(buffer);
-
-        // check again for childViews, since rendering may have added some
-        hasChildViews = this._childViews.length > 0;
-
-        if (hasChildViews) {
-          this.invokeRecursively(willInsertElementIfNeeded, false);
-        }
-
-        element.innerHTML = buffer.innerString ? buffer.innerString() : backportedInnerString(buffer);
-
-        set(this, 'element', element);
-
-        var transitionTo = this._transitionTo ? this._transitionTo : this.transitionTo;
-
-        transitionTo.call(this, 'inDOM');
-
-        if (hasChildViews) {
-          this.invokeRecursively(didInsertElementIfNeeded, false);
-        }
-      } else {
-        element.innerHTML = ''; // when there is no context, this view should be completely empty
-      }
-    }
-
-    /**
-      The `Ember.ListItemView` view class renders a
-      [div](https://developer.mozilla.org/en/HTML/Element/div) HTML element
-      with `ember-list-item-view` class. It allows you to specify a custom item
-      handlebars template for `Ember.ListView`.
-
-      Example:
-
-      ```handlebars
-      <script type="text/x-handlebars" data-template-name="row_item">
-        {{name}}
-      </script>
-      ```
-
-      ```javascript
-      App.ListView = Ember.ListView.extend({
-        height: 500,
-        rowHeight: 20,
-        itemViewClass: Ember.ListItemView.extend({templateName: "row_item"})
-      });
-      ```
-
-      @extends Ember.View
-      @class ListItemView
-      @namespace Ember
-    */
-    __exports__["default"] = Ember.View.extend(ListItemViewMixin, {
-      updateContext: function(newContext){
-        var context = get(this, 'context');
-        Ember.instrument('view.updateContext.render', this, function() {
-          if (context !== newContext) {
-            set(this, 'context', newContext);
-            if (newContext && newContext.isController) {
-              set(this, 'controller', newContext);
-            }
-          }
-        }, this);
-      },
-      rerender: function () {
-        Ember.run.scheduleOnce('render', this, rerender);
-      },
-      _contextDidChange: Ember.observer(rerender, 'context', 'controller')
-    });
-  });
-define("list-view/list_item_view_mixin",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    // jshint validthis: true
-
-    var get = Ember.get, set = Ember.set;
-
-    function samePosition(a, b) {
-      return a && b && a.x === b.x && a.y === b.y;
-    }
-
-    function positionElement() {
-      var element, position, _position;
-
-      Ember.instrument('view.updateContext.positionElement', this, function() {
-        element = get(this, 'element');
-        position = this.position;
-        _position = this._position;
-
-        if (!position || !element) { return; }
-
-        // TODO: avoid needing this by avoiding unnecessary
-        // calls to this method in the first place
-        if (samePosition(position, _position)) { return; }
-        Ember.run.schedule('render', this, this._parentView.applyTransform, element, position.x, position.y);
-        this._position = position;
-      }, this);
-    }
-
-    __exports__["default"] = Ember.Mixin.create({
-      init: function(){
-        this._super();
-        this.one('didInsertElement', positionElement);
-      },
-      classNames: ['ember-list-item-view'],
-      _position: null,
-      updatePosition: function(position) {
-        this.position = position;
-        this._positionElement();
-      },
-      _positionElement: positionElement
-    });
-  });
-define("list-view/list_view",
-  ["list-view/list_view_helper","list-view/list_view_mixin","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
-    "use strict";
-    var ListViewHelper = __dependency1__["default"];
-    var ListViewMixin = __dependency2__["default"];
-
-    var get = Ember.get, set = Ember.set;
-
-    /**
-      The `Ember.ListView` view class renders a
-      [div](https://developer.mozilla.org/en/HTML/Element/div) HTML element,
-      with `ember-list-view` class.
-
-      The context of each item element within the `Ember.ListView` are populated
-      from the objects in the `Element.ListView`'s `content` property.
-
-      ### `content` as an Array of Objects
-
-      The simplest version of an `Ember.ListView` takes an array of object as its
-      `content` property. The object will be used as the `context` each item element
-      inside the rendered `div`.
-
-      Example:
-
-      ```javascript
-      App.ContributorsRoute = Ember.Route.extend({
-        model: function() {
-          return [{ name: 'Stefan Penner' }, { name: 'Alex Navasardyan' }, { name: 'Ray Cohen'}];
-        }
-      });
-      ```
-
-      ```handlebars
-      {{#ember-list items=contributors height=500 rowHeight=50}}
-        {{name}}
-      {{/ember-list}}
-      ```
-
-      Would result in the following HTML:
-
-      ```html
-       <div id="ember181" class="ember-view ember-list-view" style="height:500px;width:500px;position:relative;overflow:scroll;-webkit-overflow-scrolling:touch;overflow-scrolling:touch;">
-        <div class="ember-list-container">
-          <div id="ember186" class="ember-view ember-list-item-view" style="-webkit-transform: translate3d(0px, 0px, 0);">
-            <script id="metamorph-0-start" type="text/x-placeholder"></script>Stefan Penner<script id="metamorph-0-end" type="text/x-placeholder"></script>
-          </div>
-          <div id="ember187" class="ember-view ember-list-item-view" style="-webkit-transform: translate3d(0px, 50px, 0);">
-            <script id="metamorph-1-start" type="text/x-placeholder"></script>Alex Navasardyan<script id="metamorph-1-end" type="text/x-placeholder"></script>
-          </div>
-          <div id="ember188" class="ember-view ember-list-item-view" style="-webkit-transform: translate3d(0px, 100px, 0);">
-            <script id="metamorph-2-start" type="text/x-placeholder"></script>Rey Cohen<script id="metamorph-2-end" type="text/x-placeholder"></script>
-          </div>
-          <div id="ember189" class="ember-view ember-list-scrolling-view" style="height: 150px"></div>
-        </div>
-      </div>
-      ```
-
-      By default `Ember.ListView` provides support for `height`,
-      `rowHeight`, `width`, `elementWidth`, `scrollTop` parameters.
-
-      Note, that `height` and `rowHeight` are required parameters.
-
-      ```handlebars
-      {{#ember-list items=this height=500 rowHeight=50}}
-        {{name}}
-      {{/ember-list}}
-      ```
-
-      If you would like to have multiple columns in your view layout, you can
-      set `width` and `elementWidth` parameters respectively.
-
-      ```handlebars
-      {{#ember-list items=this height=500 rowHeight=50 width=500 elementWidth=80}}
-        {{name}}
-      {{/ember-list}}
-      ```
-
-      ### extending `Ember.ListView`
-
-      Example:
-
-      ```handlebars
-      {{view App.ListView contentBinding="content"}}
-
-      <script type="text/x-handlebars" data-template-name="row_item">
-        {{name}}
-      </script>
-      ```
-
-      ```javascript
-      App.ListView = Ember.ListView.extend({
-        height: 500,
-        width: 500,
-        elementWidth: 80,
-        rowHeight: 20,
-        itemViewClass: Ember.ListItemView.extend({templateName: "row_item"})
-      });
-      ```
-
-      @extends Ember.ContainerView
-      @class ListView
-      @namespace Ember
-    */
-    __exports__["default"] = Ember.ContainerView.extend(ListViewMixin, {
-      css: {
-        position: 'relative',
-        overflow: 'auto',
-        '-webkit-overflow-scrolling': 'touch',
-        'overflow-scrolling': 'touch'
-      },
-
-      applyTransform: ListViewHelper.applyTransform,
-
-      _scrollTo: function(scrollTop) {
-        var element = get(this, 'element');
-
-        if (element) { element.scrollTop = scrollTop; }
-      },
-
-      didInsertElement: function() {
-        var that = this;
-        var element = get(this, 'element');
-
-        this._updateScrollableHeight();
-
-        this._scroll = function(e) { that.scroll(e); };
-
-        Ember.$(element).on('scroll', this._scroll);
-      },
-
-      willDestroyElement: function() {
-        var element;
-
-        element = get(this, 'element');
-
-        Ember.$(element).off('scroll', this._scroll);
-      },
-
-      scroll: function(e) {
-        this.scrollTo(e.target.scrollTop);
-      },
-
-      scrollTo: function(y){
-        var element = get(this, 'element');
-        this._scrollTo(y);
-        this._scrollContentTo(y);
-      },
-
-      totalHeightDidChange: Ember.observer(function () {
-        Ember.run.scheduleOnce('afterRender', this, this._updateScrollableHeight);
-      }, 'totalHeight'),
-
-      _updateScrollableHeight: function () {
-        var height, state;
-
-        // Support old and new Ember versions
-        state = this._state || this.state;
-
-        if (state === 'inDOM') {
-          // if the list is currently displaying the emptyView, remove the height
-          if (this._isChildEmptyView()) {
-              height = '';
-          } else {
-              height = get(this, 'totalHeight');
-          }
-
-          this.$('.ember-list-container').css({
-            height: height
-          });
-        }
-      }
-    });
-  });
-define("list-view/list_view_helper",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    // TODO - remove this!
-    var el = document.createElement('div'), style = el.style;
-
-    var propPrefixes = ['Webkit', 'Moz', 'O', 'ms'];
-
-    function testProp(prop) {
-      if (prop in style) return prop;
-      var uppercaseProp = prop.charAt(0).toUpperCase() + prop.slice(1);
-      for (var i=0; i<propPrefixes.length; i++) {
-        var prefixedProp = propPrefixes[i] + uppercaseProp;
-        if (prefixedProp in style) {
-          return prefixedProp;
-        }
-      }
-      return null;
-    }
-
-    var transformProp = testProp('transform');
-    var perspectiveProp = testProp('perspective');
-
-    var supports2D = transformProp !== null;
-    var supports3D = perspectiveProp !== null;
-
-    __exports__["default"] = {
-      transformProp: transformProp,
-      applyTransform: (function(){
-        if (supports2D) {
-          return function(element, x, y){
-            element.style[transformProp] = 'translate(' + x + 'px, ' + y + 'px)';
-          };
-        } else {
-          return function(element, x, y){
-            element.style.top  = y + 'px';
-            element.style.left = x + 'px';
-          };
-        }
-      })(),
-      apply3DTransform: (function(){
-        if (supports3D) {
-          return function(element, x, y){
-            element.style[transformProp] = 'translate3d(' + x + 'px, ' + y + 'px, 0)';
-          };
-        } else if (supports2D) {
-          return function(element, x, y){
-            element.style[transformProp] = 'translate(' + x + 'px, ' + y + 'px)';
-          };
-        } else {
-          return function(element, x, y){
-            element.style.top  = y + 'px';
-            element.style.left = x + 'px';
-          };
-        }
-      })()
-    };
-  });
-define("list-view/list_view_mixin",
-  ["list-view/reusable_list_item_view","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    // jshint validthis: true
-
-    var ReusableListItemView = __dependency1__["default"];
-
-    var get = Ember.get, set = Ember.set,
-
-    min = Math.min, max = Math.max, floor = Math.floor,
-    ceil = Math.ceil,
-    forEach = Ember.ArrayPolyfills.forEach;
-
-    function addContentArrayObserver() {
-      var content = get(this, 'content');
-      if (content) {
-        content.addArrayObserver(this);
-      }
-    }
-
-    function removeAndDestroy(object) {
-      this.removeObject(object);
-      object.destroy();
-    }
-
-    function syncChildViews() {
-      Ember.run.once(this, '_syncChildViews');
-    }
-
-    function sortByContentIndex (viewOne, viewTwo) {
-      return get(viewOne, 'contentIndex') - get(viewTwo, 'contentIndex');
-    }
-
-    function notifyMutationListeners() {
-      if (Ember.View.notifyMutationListeners) {
-        Ember.run.once(Ember.View, 'notifyMutationListeners');
-      }
-    }
-
-    function removeEmptyView() {
-      var emptyView = get(this, 'emptyView');
-      if (emptyView && emptyView instanceof Ember.View) {
-        emptyView.removeFromParent();
-        if (this.totalHeightDidChange !== undefined) {
-            this.totalHeightDidChange();
-        }
-      }
-    }
-
-    function addEmptyView() {
-      var emptyView = get(this, 'emptyView');
-
-      if (!emptyView) {
-        return;
-      }
-
-      if ('string' === typeof emptyView) {
-        emptyView = get(emptyView) || emptyView;
-      }
-
-      emptyView = this.createChildView(emptyView);
-      set(this, 'emptyView', emptyView);
-
-      if (Ember.CoreView.detect(emptyView)) {
-        this._createdEmptyView = emptyView;
-      }
-
-      this.unshiftObject(emptyView);
-    }
-
-    var domManager = Ember.create(Ember.ContainerView.proto().domManager);
-
-    domManager.prepend = function(view, html) {
-      view.$('.ember-list-container').prepend(html);
-      notifyMutationListeners();
-    };
-
-    function enableProfilingOutput() {
-      function before(name, time, payload) {
-        console.time(name);
-      }
-
-      function after (name, time, payload) {
-        console.timeEnd(name);
-      }
-
-      if (Ember.ENABLE_PROFILING) {
-        Ember.subscribe('view._scrollContentTo', {
-          before: before,
-          after: after
-        });
-        Ember.subscribe('view.updateContext', {
-          before: before,
-          after: after
-        });
-      }
-    }
-
-    /**
-      @class Ember.ListViewMixin
-      @namespace Ember
-    */
-    __exports__["default"] = Ember.Mixin.create({
-      itemViewClass: ReusableListItemView,
-      emptyViewClass: Ember.View,
-      classNames: ['ember-list-view'],
-      attributeBindings: ['style'],
-      classNameBindings: ['_isGrid:ember-list-view-grid:ember-list-view-list'],
-      domManager: domManager,
-      scrollTop: 0,
-      bottomPadding: 0, // TODO: maybe this can go away
-      _lastEndingIndex: 0,
-      paddingCount: 1,
-      _cachedPos: 0,
-
-      _isGrid: Ember.computed('columnCount', function() {
-        return this.get('columnCount') > 1;
-      }).readOnly(),
-
-      /**
-        @private
-
-        Setup a mixin.
-        - adding observer to content array
-        - creating child views based on height and length of the content array
-
-        @method init
-      */
-      init: function() {
-        this._super();
-        this._cachedHeights = [0];
-        this.on('didInsertElement', this._syncListContainerWidth);
-        this.columnCountDidChange();
-        this._syncChildViews();
-        this._addContentArrayObserver();
-      },
-
-      _addContentArrayObserver: Ember.beforeObserver(function() {
-        addContentArrayObserver.call(this);
-      }, 'content'),
-
-      /**
-        Called on your view when it should push strings of HTML into a
-        `Ember.RenderBuffer`.
-
-        Adds a [div](https://developer.mozilla.org/en-US/docs/HTML/Element/div)
-        with a required `ember-list-container` class.
-
-        @method render
-        @param {Ember.RenderBuffer} buffer The render buffer
-      */
-      render: function(buffer) {
-        buffer.push('<div class="ember-list-container">');
-        this._super(buffer);
-        buffer.push('</div>');
-      },
-
-      willInsertElement: function() {
-        if (!this.get("height") || !this.get("rowHeight")) {
-          throw new Error("A ListView must be created with a height and a rowHeight.");
-        }
-        this._super();
-      },
-
-      /**
-        @private
-
-        Sets inline styles of the view:
-        - height
-        - width
-        - position
-        - overflow
-        - -webkit-overflow
-        - overflow-scrolling
-
-        Called while attributes binding.
-
-        @property {Ember.ComputedProperty} style
-      */
-      style: Ember.computed('height', 'width', function() {
-        var height, width, style, css;
-
-        height = get(this, 'height');
-        width = get(this, 'width');
-        css = get(this, 'css');
-
-        style = '';
-
-        if (height) {
-          style += 'height:' + height + 'px;';
-        }
-
-        if (width)  {
-          style += 'width:' + width  + 'px;';
-        }
-
-        for ( var rule in css ) {
-          if (css.hasOwnProperty(rule)) {
-            style += rule + ':' + css[rule] + ';';
-          }
-        }
-
-        return style;
-      }),
-
-      /**
-        @private
-
-        Performs visual scrolling. Is overridden in Ember.ListView.
-
-        @method scrollTo
-      */
-      scrollTo: function(y) {
-        throw new Error('must override to perform the visual scroll and effectively delegate to _scrollContentTo');
-      },
-
-      /**
-        @private
-
-        Internal method used to force scroll position
-
-        @method scrollTo
-      */
-      _scrollTo: Ember.K,
-
-      /**
-        @private
-        @method _scrollContentTo
-      */
-      _scrollContentTo: function(y) {
-        var startingIndex, endingIndex,
-            contentIndex, visibleEndingIndex, maxContentIndex,
-            contentIndexEnd, contentLength, scrollTop, content;
-
-        scrollTop = max(0, y);
-
-        if (this.scrollTop === scrollTop) {
-          return;
-        }
-
-        // allow a visual overscroll, but don't scroll the content. As we are doing needless
-        // recycyling, and adding unexpected nodes to the DOM.
-        var maxScrollTop = max(0, get(this, 'totalHeight') - get(this, 'height'));
-        scrollTop = min(scrollTop, maxScrollTop);
-
-        content = get(this, 'content');
-        contentLength = get(content, 'length');
-        startingIndex = this._startingIndex(contentLength);
-
-        Ember.instrument('view._scrollContentTo', {
-          scrollTop: scrollTop,
-          content: content,
-          startingIndex: startingIndex,
-          endingIndex: min(max(contentLength - 1, 0), startingIndex + this._numChildViewsForViewport())
-        }, function () {
-          this.scrollTop = scrollTop;
-
-          maxContentIndex = max(contentLength - 1, 0);
-
-          startingIndex = this._startingIndex();
-          visibleEndingIndex = startingIndex + this._numChildViewsForViewport();
-
-          endingIndex = min(maxContentIndex, visibleEndingIndex);
-
-          if (startingIndex === this._lastStartingIndex &&
-              endingIndex === this._lastEndingIndex) {
-
-            this.trigger('scrollYChanged', y);
-            return;
-          } else {
-
-            Ember.run(this, function() {
-              this._reuseChildren();
-
-              this._lastStartingIndex = startingIndex;
-              this._lastEndingIndex = endingIndex;
-              this.trigger('scrollYChanged', y);
-            });
-          }
-        }, this);
-
-      },
-
-      /**
-        @private
-
-        Computes the height for a `Ember.ListView` scrollable container div.
-        You must specify `rowHeight` parameter for the height to be computed properly.
-
-        @property {Ember.ComputedProperty} totalHeight
-      */
-      totalHeight: Ember.computed('content.length',
-                                  'rowHeight',
-                                  'columnCount',
-                                  'bottomPadding', function() {
-        if (typeof this.heightForIndex === 'function') {
-          return this._totalHeightWithHeightForIndex();
-        } else {
-          return this._totalHeightWithStaticRowHeight();
-       }
-      }),
-
-      _doRowHeightDidChange: function() {
-        this._cachedHeights = [0];
-        this._cachedPos = 0;
-        this._syncChildViews();
-      },
-
-      _rowHeightDidChange: Ember.observer('rowHeight', function() {
-        Ember.run.once(this, this._doRowHeightDidChange);
-      }),
-
-      _totalHeightWithHeightForIndex: function() {
-        var length = this.get('content.length');
-        return this._cachedHeightLookup(length);
-      },
-
-      _totalHeightWithStaticRowHeight: function() {
-        var contentLength, rowHeight, columnCount, bottomPadding;
-
-        contentLength = get(this, 'content.length');
-        rowHeight = get(this, 'rowHeight');
-        columnCount = get(this, 'columnCount');
-        bottomPadding = get(this, 'bottomPadding');
-
-        return ((ceil(contentLength / columnCount)) * rowHeight) + bottomPadding;
-      },
-
-      /**
-        @private
-        @method _prepareChildForReuse
-      */
-      _prepareChildForReuse: function(childView) {
-        childView.prepareForReuse();
-      },
-
-      /**
-        @private
-        @method _reuseChildForContentIndex
-      */
-      _reuseChildForContentIndex: function(childView, contentIndex) {
-        var content, context, newContext, childsCurrentContentIndex, position, enableProfiling, oldChildView;
-
-        var contentViewClass = this.itemViewForIndex(contentIndex);
-
-        if (childView.constructor !== contentViewClass) {
-          // rather then associative arrays, lets move childView + contentEntry maping to a Map
-          var i = this._childViews.indexOf(childView);
-
-          childView.destroy();
-          childView = this.createChildView(contentViewClass);
-
-          this.insertAt(i, childView);
-        }
-
-        content = get(this, 'content');
-        enableProfiling = get(this, 'enableProfiling');
-        position = this.positionForIndex(contentIndex);
-        childView.updatePosition(position);
-
-        set(childView, 'contentIndex', contentIndex);
-
-        if (enableProfiling) {
-          Ember.instrument('view._reuseChildForContentIndex', position, function() {
-
-          }, this);
-        }
-
-        newContext = content.objectAt(contentIndex);
-        childView.updateContext(newContext);
-      },
-
-      /**
-        @private
-        @method positionForIndex
-      */
-      positionForIndex: function(index) {
-        if (typeof this.heightForIndex !== 'function') {
-          return this._singleHeightPosForIndex(index);
-        }
-        else {
-          return this._multiHeightPosForIndex(index);
-        }
-      },
-
-      _singleHeightPosForIndex: function(index) {
-        var elementWidth, width, columnCount, rowHeight, y, x;
-
-        elementWidth = get(this, 'elementWidth') || 1;
-        width = get(this, 'width') || 1;
-        columnCount = get(this, 'columnCount');
-        rowHeight = get(this, 'rowHeight');
-
-        y = (rowHeight * floor(index/columnCount));
-        x = (index % columnCount) * elementWidth;
-
-        return {
-          y: y,
-          x: x
-        };
-      },
-
-      // 0 maps to 0, 1 maps to heightForIndex(i)
-      _multiHeightPosForIndex: function(index) {
-        var elementWidth, width, columnCount, rowHeight, y, x;
-
-        elementWidth = get(this, 'elementWidth') || 1;
-        width = get(this, 'width') || 1;
-        columnCount = get(this, 'columnCount');
-
-        x = (index % columnCount) * elementWidth;
-        y = this._cachedHeightLookup(index);
-
-        return {
-          x: x,
-          y: y
-        };
-      },
-
-      _cachedHeightLookup: function(index) {
-        for (var i = this._cachedPos; i < index; i++) {
-          this._cachedHeights[i + 1] = this._cachedHeights[i] + this.heightForIndex(i);
-        }
-        this._cachedPos = i;
-        return this._cachedHeights[index];
-      },
-
-      /**
-        @private
-        @method _childViewCount
-      */
-      _childViewCount: function() {
-        var contentLength, childViewCountForHeight;
-
-        contentLength = get(this, 'content.length');
-        childViewCountForHeight = this._numChildViewsForViewport();
-
-        return min(contentLength, childViewCountForHeight);
-      },
-
-      /**
-        @private
-
-        Returns a number of columns in the Ember.ListView (for grid layout).
-
-        If you want to have a multi column layout, you need to specify both
-        `width` and `elementWidth`.
-
-        If no `elementWidth` is specified, it returns `1`. Otherwise, it will
-        try to fit as many columns as possible for a given `width`.
-
-        @property {Ember.ComputedProperty} columnCount
-      */
-      columnCount: Ember.computed('width', 'elementWidth', function() {
-        var elementWidth, width, count;
-
-        elementWidth = get(this, 'elementWidth');
-        width = get(this, 'width');
-
-        if (elementWidth && width > elementWidth) {
-          count = floor(width / elementWidth);
-        } else {
-          count = 1;
-        }
-
-        return count;
-      }),
-
-      /**
-        @private
-
-        Fires every time column count is changed.
-
-        @event columnCountDidChange
-      */
-      columnCountDidChange: Ember.observer(function() {
-        var ratio, currentScrollTop, proposedScrollTop, maxScrollTop,
-            scrollTop, lastColumnCount, newColumnCount, element;
-
-        lastColumnCount = this._lastColumnCount;
-
-        currentScrollTop = this.scrollTop;
-        newColumnCount = get(this, 'columnCount');
-        maxScrollTop = get(this, 'maxScrollTop');
-        element = get(this, 'element');
-
-        this._lastColumnCount = newColumnCount;
-
-        if (lastColumnCount) {
-          ratio = (lastColumnCount / newColumnCount);
-          proposedScrollTop = currentScrollTop * ratio;
-          scrollTop = min(maxScrollTop, proposedScrollTop);
-
-          this._scrollTo(scrollTop);
-          this.scrollTop = scrollTop;
-        }
-
-        if (arguments.length > 0) {
-          // invoked by observer
-          Ember.run.schedule('afterRender', this, this._syncListContainerWidth);
-        }
-      }, 'columnCount'),
-
-      /**
-        @private
-
-        Computes max possible scrollTop value given the visible viewport
-        and scrollable container div height.
-
-        @property {Ember.ComputedProperty} maxScrollTop
-      */
-      maxScrollTop: Ember.computed('height', 'totalHeight', function(){
-        var totalHeight, viewportHeight;
-
-        totalHeight = get(this, 'totalHeight');
-        viewportHeight = get(this, 'height');
-
-        return max(0, totalHeight - viewportHeight);
-      }),
-
-      /**
-        @private
-
-        Determines whether the emptyView is the current childView.
-
-        @method _isChildEmptyView
-      */
-      _isChildEmptyView: function() {
-        var emptyView = get(this, 'emptyView');
-
-        return emptyView && emptyView instanceof Ember.View &&
-               this._childViews.length === 1 && this._childViews.indexOf(emptyView) === 0;
-      },
-
-      /**
-        @private
-
-        Computes the number of views that would fit in the viewport area.
-        You must specify `height` and `rowHeight` parameters for the number of
-        views to be computed properly.
-
-        @method _numChildViewsForViewport
-      */
-      _numChildViewsForViewport: function() {
-
-        if (this.heightForIndex) {
-          return this._numChildViewsForViewportWithMultiHeight();
-        } else {
-          return this._numChildViewsForViewportWithoutMultiHeight();
-        }
-      },
-
-      _numChildViewsForViewportWithoutMultiHeight:  function() {
-        var height, rowHeight, paddingCount, columnCount;
-
-        height = get(this, 'height');
-        rowHeight = get(this, 'rowHeight');
-        paddingCount = get(this, 'paddingCount');
-        columnCount = get(this, 'columnCount');
-
-        return (ceil(height / rowHeight) * columnCount) + (paddingCount * columnCount);
-      },
-
-      _numChildViewsForViewportWithMultiHeight:  function() {
-        var rowHeight, paddingCount, columnCount;
-        var scrollTop = this.scrollTop;
-        var viewportHeight = this.get('height');
-        var length = this.get('content.length');
-        var heightfromTop = 0;
-        var padding = get(this, 'paddingCount');
-
-        var startingIndex = this._calculatedStartingIndex();
-        var currentHeight = 0;
-
-        var offsetHeight = this._cachedHeightLookup(startingIndex);
-        for (var i = 0; i < length; i++) {
-          if (this._cachedHeightLookup(startingIndex + i + 1) - offsetHeight > viewportHeight) {
-            break;
-          }
-        }
-
-        return i + padding + 1;
-      },
-
-
-      /**
-        @private
-
-        Computes the starting index of the item views array.
-        Takes `scrollTop` property of the element into account.
-
-        Is used in `_syncChildViews`.
-
-        @method _startingIndex
-      */
-      _startingIndex: function(_contentLength) {
-        var scrollTop, rowHeight, columnCount, calculatedStartingIndex,
-            contentLength;
-
-        if (_contentLength === undefined) {
-          contentLength = get(this, 'content.length');
-        } else {
-          contentLength = _contentLength;
-        }
-
-        scrollTop = this.scrollTop;
-        rowHeight = get(this, 'rowHeight');
-        columnCount = get(this, 'columnCount');
-
-        if (this.heightForIndex) {
-          calculatedStartingIndex = this._calculatedStartingIndex();
-        } else {
-          calculatedStartingIndex = floor(scrollTop / rowHeight) * columnCount;
-        }
-
-        var viewsNeededForViewport = this._numChildViewsForViewport();
-        var paddingCount = (1 * columnCount);
-        var largestStartingIndex = max(contentLength - viewsNeededForViewport, 0);
-
-        return min(calculatedStartingIndex, largestStartingIndex);
-      },
-
-      _calculatedStartingIndex: function() {
-        var rowHeight, paddingCount, columnCount;
-        var scrollTop = this.scrollTop;
-        var viewportHeight = this.get('height');
-        var length = this.get('content.length');
-        var heightfromTop = 0;
-        var padding = get(this, 'paddingCount');
-
-        for (var i = 0; i < length; i++) {
-          if (this._cachedHeightLookup(i + 1) >= scrollTop) {
-            break;
-          }
-        }
-
-        return i;
-      },
-
-      /**
-        @private
-        @event contentWillChange
-      */
-      contentWillChange: Ember.beforeObserver(function() {
-        var content;
-
-        content = get(this, 'content');
-
-        if (content) {
-          content.removeArrayObserver(this);
-        }
-      }, 'content'),
-
-      /**),
-        @private
-        @event contentDidChange
-      */
-      contentDidChange: Ember.observer(function() {
-        addContentArrayObserver.call(this);
-        syncChildViews.call(this);
-      }, 'content'),
-
-      /**
-        @private
-        @property {Function} needsSyncChildViews
-      */
-      needsSyncChildViews: Ember.observer(syncChildViews, 'height', 'width', 'columnCount'),
-
-      /**
-        @private
-
-        Returns a new item view. Takes `contentIndex` to set the context
-        of the returned view properly.
-
-        @param {Number} contentIndex item index in the content array
-        @method _addItemView
-      */
-      _addItemView: function(contentIndex){
-        var itemViewClass, childView;
-
-        itemViewClass = this.itemViewForIndex(contentIndex);
-        childView = this.createChildView(itemViewClass);
-
-        this.pushObject(childView);
-      },
-
-      /**
-        @public
-
-        Returns a view class for the provided contentIndex. If the view is
-        different then the one currently present it will remove the existing view
-        and replace it with an instance of the class provided
-
-        @param {Number} contentIndex item index in the content array
-        @method _addItemView
-        @returns {Ember.View} ember view class for this index
-      */
-      itemViewForIndex: function(contentIndex) {
-        return get(this, 'itemViewClass');
-      },
-
-      /**
-        @public
-
-        Returns a view class for the provided contentIndex. If the view is
-        different then the one currently present it will remove the existing view
-        and replace it with an instance of the class provided
-
-        @param {Number} contentIndex item index in the content array
-        @method _addItemView
-        @returns {Ember.View} ember view class for this index
-      */
-      heightForIndex: null,
-
-      /**
-        @private
-
-        Intelligently manages the number of childviews.
-
-        @method _syncChildViews
-       **/
-      _syncChildViews: function(){
-        var childViews, childViewCount,
-            numberOfChildViews, numberOfChildViewsNeeded,
-            contentIndex, startingIndex, endingIndex,
-            contentLength, emptyView, count, delta;
-
-        if (get(this, 'isDestroyed') || get(this, 'isDestroying')) {
-          return;
-        }
-
-        contentLength = get(this, 'content.length');
-        emptyView = get(this, 'emptyView');
-
-        childViewCount = this._childViewCount();
-        childViews = this.positionOrderedChildViews();
-
-        if (this._isChildEmptyView()) {
-          removeEmptyView.call(this);
-        }
-
-        startingIndex = this._startingIndex();
-        endingIndex = startingIndex + childViewCount;
-
-        numberOfChildViewsNeeded = childViewCount;
-        numberOfChildViews = childViews.length;
-
-        delta = numberOfChildViewsNeeded - numberOfChildViews;
-
-        if (delta === 0) {
-          // no change
-        } else if (delta > 0) {
-          // more views are needed
-          contentIndex = this._lastEndingIndex;
-
-          for (count = 0; count < delta; count++, contentIndex++) {
-            this._addItemView(contentIndex);
-          }
-        } else {
-          // less views are needed
-          forEach.call(
-            childViews.splice(numberOfChildViewsNeeded, numberOfChildViews),
-            removeAndDestroy,
-            this
-          );
-        }
-
-        this._reuseChildren();
-
-        this._lastStartingIndex = startingIndex;
-        this._lastEndingIndex   = this._lastEndingIndex + delta;
-
-        if (contentLength === 0 || contentLength === undefined) {
-          addEmptyView.call(this);
-        }
-      },
-
-      /**
-        @private
-
-        Applies an inline width style to the list container.
-
-        @method _syncListContainerWidth
-       **/
-      _syncListContainerWidth: function() {
-        var elementWidth, columnCount, containerWidth, element;
-
-        elementWidth = get(this, 'elementWidth');
-        columnCount = get(this, 'columnCount');
-        containerWidth = elementWidth * columnCount;
-        element = this.$('.ember-list-container');
-
-        if (containerWidth && element) {
-          element.css('width', containerWidth);
-        }
-      },
-
-      /**
-        @private
-        @method _reuseChildren
-      */
-      _reuseChildren: function(){
-        var contentLength, childViews, childViewsLength,
-            startingIndex, endingIndex, childView, attrs,
-            contentIndex, visibleEndingIndex, maxContentIndex,
-            contentIndexEnd, scrollTop;
-
-        scrollTop = this.scrollTop;
-        contentLength = get(this, 'content.length');
-        maxContentIndex = max(contentLength - 1, 0);
-        childViews = this.getReusableChildViews();
-        childViewsLength =  childViews.length;
-
-        startingIndex = this._startingIndex();
-        visibleEndingIndex = startingIndex + this._numChildViewsForViewport();
-
-        endingIndex = min(maxContentIndex, visibleEndingIndex);
-
-        contentIndexEnd = min(visibleEndingIndex, startingIndex + childViewsLength);
-
-        for (contentIndex = startingIndex; contentIndex < contentIndexEnd; contentIndex++) {
-          childView = childViews[contentIndex % childViewsLength];
-          this._reuseChildForContentIndex(childView, contentIndex);
-        }
-      },
-
-      /**
-        @private
-        @method getReusableChildViews
-      */
-      getReusableChildViews: function() {
-        return this._childViews;
-      },
-
-      /**
-        @private
-        @method positionOrderedChildViews
-      */
-      positionOrderedChildViews: function() {
-        return this.getReusableChildViews().sort(sortByContentIndex);
-      },
-
-      arrayWillChange: Ember.K,
-
-      /**
-        @private
-        @event arrayDidChange
-      */
-      // TODO: refactor
-      arrayDidChange: function(content, start, removedCount, addedCount) {
-        var index, contentIndex, state;
-
-        if (this._isChildEmptyView()) {
-            removeEmptyView.call(this);
-        }
-
-        // Support old and new Ember versions
-        state = this._state || this.state;
-
-        if (state === 'inDOM') {
-          // ignore if all changes are out of the visible change
-          if (start >= this._lastStartingIndex || start < this._lastEndingIndex) {
-            index = 0;
-            // ignore all changes not in the visible range
-            // this can re-position many, rather then causing a cascade of re-renders
-            forEach.call(
-              this.positionOrderedChildViews(),
-              function(childView) {
-                contentIndex = this._lastStartingIndex + index;
-                this._reuseChildForContentIndex(childView, contentIndex);
-                index++;
-              },
-              this
-            );
-          }
-
-          syncChildViews.call(this);
-        }
-      },
-
-      destroy: function () {
-        if (!this._super()) { return; }
-
-        if (this._createdEmptyView) {
-          this._createdEmptyView.destroy();
-        }
-
-        return this;
-      }
-    });
-  });
-define("list-view/main",
-  ["list-view/reusable_list_item_view","list-view/virtual_list_view","list-view/list_item_view","list-view/helper","list-view/list_view","list-view/list_view_helper"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
-    "use strict";
-    var ReusableListItemView = __dependency1__["default"];
-    var VirtualListView = __dependency2__["default"];
-    var ListItemView = __dependency3__["default"];
-    var EmberList = __dependency4__["default"];
-    var ListView = __dependency5__["default"];
-    var ListViewHelper = __dependency6__["default"];
-
-    Ember.ReusableListItemView = ReusableListItemView;
-    Ember.VirtualListView      = VirtualListView;
-    Ember.ListItemView         = ListItemView;
-    Ember.ListView             = ListView;
-    Ember.ListViewHelper       = ListViewHelper;
-
-    Ember.Handlebars.registerHelper('ember-list', EmberList);
-  });
-define("list-view/reusable_list_item_view",
-  ["list-view/list_item_view_mixin","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var ListItemViewMixin = __dependency1__["default"];
-
-    var get = Ember.get, set = Ember.set;
-
-    __exports__["default"] = Ember.View.extend(ListItemViewMixin, {
-      init: function(){
-        this._super();
-        var context = Ember.ObjectProxy.create();
-        this.set('context', context);
-        this._proxyContext = context;
-      },
-      isVisible: Ember.computed('context.content', function(){
-        return !!this.get('context.content');
-      }),
-      updateContext: function(newContext){
-        var context = get(this._proxyContext, 'content'), state;
-
-        // Support old and new Ember versions
-        state = this._state || this.state;
-
-        if (context !== newContext) {
-          if (state === 'inDOM') {
-            this.prepareForReuse(newContext);
-          }
-
-          set(this._proxyContext, 'content', newContext);
-
-          if (newContext && newContext.isController) {
-            set(this, 'controller', newContext);
-          }
-        }
-      },
-      prepareForReuse: Ember.K
-    });
-  });
-define("list-view/virtual_list_scroller_events",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    // jshint validthis: true
-    var fieldRegex = /input|textarea|select/i,
-      hasTouch = ('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch,
-      handleStart, handleMove, handleEnd, handleCancel,
-      startEvent, moveEvent, endEvent, cancelEvent;
-    if (hasTouch) {
-      startEvent = 'touchstart';
-      handleStart = function (e) {
-        var touch = e.touches[0],
-          target = touch && touch.target;
-        // avoid e.preventDefault() on fields
-        if (target && fieldRegex.test(target.tagName)) {
-          return;
-        }
-        bindWindow(this.scrollerEventHandlers);
-        this.willBeginScroll(e.touches, e.timeStamp);
-        e.preventDefault();
-      };
-      moveEvent = 'touchmove';
-      handleMove = function (e) {
-        this.continueScroll(e.touches, e.timeStamp);
-      };
-      endEvent = 'touchend';
-      handleEnd = function (e) {
-        // if we didn't end up scrolling we need to
-        // synthesize click since we did e.preventDefault()
-        // on touchstart
-        if (!this._isScrolling) {
-          synthesizeClick(e);
-        }
-        unbindWindow(this.scrollerEventHandlers);
-        this.endScroll(e.timeStamp);
-      };
-      cancelEvent = 'touchcancel';
-      handleCancel = function (e) {
-        unbindWindow(this.scrollerEventHandlers);
-        this.endScroll(e.timeStamp);
-      };
-    } else {
-      startEvent = 'mousedown';
-      handleStart = function (e) {
-        if (e.which !== 1) return;
-        var target = e.target;
-        // avoid e.preventDefault() on fields
-        if (target && fieldRegex.test(target.tagName)) {
-          return;
-        }
-        bindWindow(this.scrollerEventHandlers);
-        this.willBeginScroll([e], e.timeStamp);
-        e.preventDefault();
-      };
-      moveEvent = 'mousemove';
-      handleMove = function (e) {
-        this.continueScroll([e], e.timeStamp);
-      };
-      endEvent = 'mouseup';
-      handleEnd = function (e) {
-        unbindWindow(this.scrollerEventHandlers);
-        this.endScroll(e.timeStamp);
-      };
-      cancelEvent = 'mouseout';
-      handleCancel = function (e) {
-        if (e.relatedTarget) return;
-        unbindWindow(this.scrollerEventHandlers);
-        this.endScroll(e.timeStamp);
-      };
-    }
-
-    function handleWheel(e) {
-      this.mouseWheel(e);
-      e.preventDefault();
-    }
-
-    function bindElement(el, handlers) {
-      el.addEventListener(startEvent, handlers.start, false);
-      el.addEventListener('mousewheel', handlers.wheel, false);
-    }
-
-    function unbindElement(el, handlers) {
-      el.removeEventListener(startEvent, handlers.start, false);
-      el.removeEventListener('mousewheel', handlers.wheel, false);
-    }
-
-    function bindWindow(handlers) {
-      window.addEventListener(moveEvent, handlers.move, true);
-      window.addEventListener(endEvent, handlers.end, true);
-      window.addEventListener(cancelEvent, handlers.cancel, true);
-    }
-
-    function unbindWindow(handlers) {
-      window.removeEventListener(moveEvent, handlers.move, true);
-      window.removeEventListener(endEvent, handlers.end, true);
-      window.removeEventListener(cancelEvent, handlers.cancel, true);
-    }
-
-    __exports__["default"] = Ember.Mixin.create({
-      init: function() {
-        this.on('didInsertElement', this, 'bindScrollerEvents');
-        this.on('willDestroyElement', this, 'unbindScrollerEvents');
-        this.scrollerEventHandlers = {
-          start: bind(this, handleStart),
-          move: bind(this, handleMove),
-          end: bind(this, handleEnd),
-          cancel: bind(this, handleCancel),
-          wheel: bind(this, handleWheel)
-        };
-        return this._super();
-      },
-      scrollElement: Ember.computed.oneWay('element').readOnly(),
-      bindScrollerEvents: function() {
-        var el = this.get('scrollElement'),
-          handlers = this.scrollerEventHandlers;
-        bindElement(el, handlers);
-      },
-      unbindScrollerEvents: function() {
-        var el = this.get('scrollElement'),
-          handlers = this.scrollerEventHandlers;
-        unbindElement(el, handlers);
-        unbindWindow(handlers);
-      }
-    });
-
-    function bind(view, handler) {
-      return function (evt) {
-        handler.call(view, evt);
-      };
-    }
-
-    function synthesizeClick(e) {
-      var point = e.changedTouches[0],
-        target = point.target,
-        ev;
-      if (target && fieldRegex.test(target.tagName)) {
-        ev = document.createEvent('MouseEvents');
-        ev.initMouseEvent('click', true, true, e.view, 1, point.screenX, point.screenY, point.clientX, point.clientY, e.ctrlKey, e.altKey, e.shiftKey, e.metaKey, 0, null);
-        return target.dispatchEvent(ev);
-      }
-    }
-  });
-define("list-view/virtual_list_view",
-  ["list-view/list_view_mixin","list-view/list_view_helper","list-view/virtual_list_scroller_events","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
-    "use strict";
-    /*
-      global Scroller
-    */
-
-    var ListViewMixin = __dependency1__["default"];
-    var ListViewHelper = __dependency2__["default"];
-    var VirtualListScrollerEvents = __dependency3__["default"];
-
-    var max = Math.max, get = Ember.get, set = Ember.set;
-
-    function updateScrollerDimensions(target) {
-      var width, height, totalHeight;
-
-      target = target || this; // jshint ignore:line
-
-      width = get(target, 'width');
-      height = get(target, 'height');
-      totalHeight = get(target, 'totalHeight'); // jshint ignore:line
-
-      target.scroller.setDimensions(width, height, width, totalHeight);
-      target.trigger('scrollerDimensionsDidChange');
-    }
-
-    /**
-      VirtualListView
-
-      @class VirtualListView
-      @namespace Ember
-    */
-    __exports__["default"] = Ember.ContainerView.extend(ListViewMixin, VirtualListScrollerEvents, {
-      _isScrolling: false,
-      _mouseWheel: null,
-      css: {
-        position: 'relative',
-        overflow: 'hidden'
-      },
-
-      init: function(){
-        this._super();
-        this.setupScroller();
-        this.setupPullToRefresh();
-      },
-      _scrollerTop: 0,
-      applyTransform: ListViewHelper.apply3DTransform,
-
-      setupScroller: function(){
-        var view, y;
-
-        view = this;
-
-        view.scroller = new Scroller(function(left, top, zoom) {
-          // Support old and new Ember versions
-          var state = view._state || view.state;
-
-          if (state !== 'inDOM') { return; }
-
-          if (view.listContainerElement) {
-            view._scrollerTop = top;
-            view._scrollContentTo(top);
-            view.applyTransform(view.listContainerElement, 0, -top);
-          }
-        }, {
-          scrollingX: false,
-          scrollingComplete: function(){
-            view.trigger('scrollingDidComplete');
-          }
-        });
-
-        view.trigger('didInitializeScroller');
-        updateScrollerDimensions(view);
-      },
-      setupPullToRefresh: function() {
-        if (!this.pullToRefreshViewClass) { return; }
-        this._insertPullToRefreshView();
-        this._activateScrollerPullToRefresh();
-      },
-      _insertPullToRefreshView: function(){
-        this.pullToRefreshView = this.createChildView(this.pullToRefreshViewClass);
-        this.insertAt(0, this.pullToRefreshView);
-        var view = this;
-        this.pullToRefreshView.on('didInsertElement', function(){
-          Ember.run.schedule('afterRender', this, function(){
-            view.applyTransform(this.get('element'), 0, -1 * view.pullToRefreshViewHeight);
-          });
-        });
-      },
-      _activateScrollerPullToRefresh: function(){
-        var view = this;
-        function activatePullToRefresh(){
-          view.pullToRefreshView.set('active', true);
-          view.trigger('activatePullToRefresh');
-        }
-        function deactivatePullToRefresh() {
-          view.pullToRefreshView.set('active', false);
-          view.trigger('deactivatePullToRefresh');
-        }
-        function startPullToRefresh() {
-          Ember.run(function(){
-            view.pullToRefreshView.set('refreshing', true);
-
-            function finishRefresh(){
-              if (view && !view.get('isDestroyed') && !view.get('isDestroying')) {
-                view.scroller.finishPullToRefresh();
-                view.pullToRefreshView.set('refreshing', false);
-              }
-            }
-            view.startRefresh(finishRefresh);
-          });
-        }
-        this.scroller.activatePullToRefresh(
-          this.pullToRefreshViewHeight,
-          activatePullToRefresh,
-          deactivatePullToRefresh,
-          startPullToRefresh
-        );
-      },
-
-      getReusableChildViews: function(){
-        var firstView = this._childViews[0];
-        if (firstView && firstView === this.pullToRefreshView) {
-          return this._childViews.slice(1);
-        } else {
-          return this._childViews;
-        }
-      },
-
-      scrollerDimensionsNeedToChange: Ember.observer(function() {
-        Ember.run.once(this, updateScrollerDimensions);
-      }, 'width', 'height', 'totalHeight'),
-
-      didInsertElement: function() {
-        this.listContainerElement = this.$('> .ember-list-container')[0];
-      },
-
-      willBeginScroll: function(touches, timeStamp) {
-        this._isScrolling = false;
-        this.trigger('scrollingDidStart');
-
-        this.scroller.doTouchStart(touches, timeStamp);
-      },
-
-      continueScroll: function(touches, timeStamp) {
-        var startingScrollTop, endingScrollTop, event;
-
-        if (this._isScrolling) {
-          this.scroller.doTouchMove(touches, timeStamp);
-        } else {
-          startingScrollTop = this._scrollerTop;
-
-          this.scroller.doTouchMove(touches, timeStamp);
-
-          endingScrollTop = this._scrollerTop;
-
-          if (startingScrollTop !== endingScrollTop) {
-            event = Ember.$.Event("scrollerstart");
-            Ember.$(touches[0].target).trigger(event);
-
-            this._isScrolling = true;
-          }
-        }
-      },
-
-      endScroll: function(timeStamp) {
-        this.scroller.doTouchEnd(timeStamp);
-      },
-
-      // api
-      scrollTo: function(y, animate) {
-        if (animate === undefined) {
-          animate = true;
-        }
-
-        this.scroller.scrollTo(0, y, animate, 1);
-      },
-
-      // events
-      mouseWheel: function(e){
-        var inverted, delta, candidatePosition;
-
-        inverted = e.webkitDirectionInvertedFromDevice;
-        delta = e.wheelDeltaY * (inverted ? 0.8 : -0.8);
-        candidatePosition = this.scroller.__scrollTop + delta;
-
-        if ((candidatePosition >= 0) && (candidatePosition <= this.scroller.__maxScrollTop)) {
-          this.scroller.scrollBy(0, delta, true);
-          e.stopPropagation();
-        }
-
-        return false;
-      }
-    });
-  });
- requireModule('list-view/main');
-})(this);
\ No newline at end of file
diff --git a/vendor/assets/javascripts/ember-cloaking.js b/vendor/assets/javascripts/ember-cloaking.js
index 07b3506def..8c5cad2e36 100644
--- a/vendor/assets/javascripts/ember-cloaking.js
+++ b/vendor/assets/javascripts/ember-cloaking.js
@@ -8,10 +8,13 @@
     @namespace Ember
   **/
   Ember.CloakedCollectionView = Ember.CollectionView.extend({
+    cloakView: Ember.computed.alias('itemViewClass'),
     topVisible: null,
     bottomVisible: null,
     offsetFixedTopElement: null,
     offsetFixedBottomElement: null,
+    loadingHTML: 'Loading...',
+    scrollDebounce: 10,
 
     init: function() {
       var cloakView = this.get('cloakView'),
@@ -25,7 +28,7 @@
       this.set('itemViewClass', Ember.CloakedView.extend({
         classNames: [cloakView + '-cloak'],
         cloaks: cloakView,
-        preservesContext: this.get('preservesContext') === "true",
+        preservesContext: this.get('preservesContext') === 'true',
         cloaksController: this.get('itemController'),
         defaultHeight: this.get('defaultHeight'),
 
@@ -198,13 +201,13 @@
       for (var j=bottomView; j<childViews.length; j++) {
         var checkView = childViews[j];
         if (!checkView._containedView) {
-          if (!checkView.get('loading')) {
-            checkView.$().html(this.get('loadingHTML') || "Loading...");
+          var loadingHTML = this.get('loadingHTML');
+          if (!Em.isEmpty(loadingHTML) && !checkView.get('loading')) {
+            checkView.$().html(loadingHTML);
           }
           return;
         }
       }
-
     },
 
     uncloakQueue: function(){
@@ -248,8 +251,9 @@
       var self = this,
           offsetFixedTop = this.get('offsetFixedTop') || this.get('offsetFixed'),
           offsetFixedBottom = this.get('offsetFixedBottom'),
+          scrollDebounce = this.get('scrollDebounce'),
           onScrollMethod = function() {
-            Ember.run.debounce(self, 'scrollTriggered', 10);
+            Ember.run.debounce(self, 'scrollTriggered', scrollDebounce);
           };
 
       if (offsetFixedTop) {
@@ -291,6 +295,49 @@
   **/
   Ember.CloakedView = Ember.View.extend({
     attributeBindings: ['style'],
+    _containedView: null,
+    _scheduled: null,
+
+    init: function() {
+      this._super();
+      this._scheduled = false;
+      this._childViews = [];
+    },
+
+    setContainedView: function(cv) {
+      if (this._childViews[0]) {
+        this._childViews[0].destroy();
+        this._childViews[0] = cv;
+      }
+
+      if (cv) {
+        cv.set('_parentView', this);
+        cv.set('templateData', this.get('templateData'));
+        this._childViews[0] = cv;
+      } else {
+        this._childViews.clear();
+      }
+
+      if (!this._elementCreated || this._scheduled) return;
+      this._scheduled = true;
+      this.set('_containedView', cv);
+      Ember.run.schedule('render', this, this.updateChildView);
+    },
+
+    render: function (buffer) {
+      var el = buffer.element();
+      this._childViewsMorph = buffer.dom.createMorph(el, null, null, el);
+    },
+
+    updateChildView: function () {
+      this._scheduled = false;
+      if (!this._elementCreated || this.isDestroying || this.isDestroyed) { return; }
+
+      var childView = this._containedView;
+      if (childView && !childView._elementCreated) {
+        this._renderer.renderTree(childView, this, 0);
+      }
+    },
 
     /**
       Triggers the set up for rendering a view that is cloaked.
@@ -343,8 +390,7 @@
           loading: false
         });
 
-        this._containedView = this.createChildView(this.get('cloaks'), createArgs);
-        this.rerender();
+        this.setContainedView(this.createChildView(this.get('cloaks'), createArgs));
       }
     },
 
@@ -361,25 +407,15 @@
         this.set('style', style);
         this.$().prop('style', style);
 
+
         // We need to remove the container after the height of the element has taken
         // effect.
         Ember.run.schedule('afterRender', function() {
-          if(self._containedView){
-            self._containedView.remove();
-            self._containedView = null;
-          }
+          self.setContainedView(null);
         });
       }
     },
 
-    _removeContainedView: function(){
-      if(this._containedView){
-        this._containedView.remove();
-        this._containedView = null;
-      }
-      this._super();
-    }.on('willDestroyElement'),
-
     _setHeights: function(){
       if (!this._containedView) {
         // setting default height
@@ -393,37 +429,9 @@
           this.$().css('height', defaultHeight);
         }
       }
-     }.on('didInsertElement'),
-
-    /**
-      Render the cloaked view if applicable.
-
-      @method render
-    */
-    render: function(buffer) {
-      var containedView = this._containedView, self = this;
-
-      if (containedView && (containedView._state || containedView.state) !== 'inDOM') {
-        containedView.triggerRecursively('willInsertElement');
-        containedView.renderToBuffer(buffer);
-        if (Ember.View.prototype._transitionTo) {
-          containedView._transitionTo('inDOM');
-        } else {
-          containedView.transitionTo('inDOM');
-        }
-
-        Em.run.schedule('afterRender', function() {
-          if(self._containedView) {
-            self._containedView.triggerRecursively('didInsertElement');
-          }
-        });
-      }
-    }
-
+     }.on('didInsertElement')
   });
 
-
-
   Ember.Handlebars.registerHelper('cloaked-collection', function(options) {
     var hash = options.hash,
         types = options.hashTypes;
diff --git a/vendor/assets/javascripts/list-view.js b/vendor/assets/javascripts/list-view.js
new file mode 100644
index 0000000000..9c1f475791
--- /dev/null
+++ b/vendor/assets/javascripts/list-view.js
@@ -0,0 +1,1828 @@
+// ==========================================================================
+// Project:   Ember ListView
+// Copyright: ©2012-2013 Erik Bryn, Yapp Inc., and contributors.
+// License:   Licensed under MIT license
+// Version:   0.0.5
+// ==========================================================================
+
+(function(global){
+var define, requireModule, require, requirejs;
+
+(function() {
+
+  var _isArray;
+  if (!Array.isArray) {
+    _isArray = function (x) {
+      return Object.prototype.toString.call(x) === "[object Array]";
+    };
+  } else {
+    _isArray = Array.isArray;
+  }
+  
+  var registry = {}, seen = {}, state = {};
+  var FAILED = false;
+
+  define = function(name, deps, callback) {
+  
+    if (!_isArray(deps)) {
+      callback = deps;
+      deps     =  [];
+    }
+  
+    registry[name] = {
+      deps: deps,
+      callback: callback
+    };
+  };
+
+  function reify(deps, name, seen) {
+    var length = deps.length;
+    var reified = new Array(length);
+    var dep;
+    var exports;
+
+    for (var i = 0, l = length; i < l; i++) {
+      dep = deps[i];
+      if (dep === 'exports') {
+        exports = reified[i] = seen;
+      } else {
+        reified[i] = require(resolve(dep, name));
+      }
+    }
+
+    return {
+      deps: reified,
+      exports: exports
+    };
+  }
+
+  requirejs = require = requireModule = function(name) {
+    if (state[name] !== FAILED &&
+        seen.hasOwnProperty(name)) {
+      return seen[name];
+    }
+
+    if (!registry[name]) {
+      throw new Error('Could not find module ' + name);
+    }
+
+    var mod = registry[name];
+    var reified;
+    var module;
+    var loaded = false;
+
+    seen[name] = { }; // placeholder for run-time cycles
+
+    try {
+      reified = reify(mod.deps, name, seen[name]);
+      module = mod.callback.apply(this, reified.deps);
+      loaded = true;
+    } finally {
+      if (!loaded) {
+        state[name] = FAILED;
+      }
+    }
+
+    return reified.exports ? seen[name] : (seen[name] = module);
+  };
+
+  function resolve(child, name) {
+    if (child.charAt(0) !== '.') { return child; }
+
+    var parts = child.split('/');
+    var nameParts = name.split('/');
+    var parentBase;
+
+    if (nameParts.length === 1) {
+      parentBase = nameParts;
+    } else {
+      parentBase = nameParts.slice(0, -1);
+    }
+
+    for (var i = 0, l = parts.length; i < l; i++) {
+      var part = parts[i];
+
+      if (part === '..') { parentBase.pop(); }
+      else if (part === '.') { continue; }
+      else { parentBase.push(part); }
+    }
+
+    return parentBase.join('/');
+  }
+
+  requirejs.entries = requirejs._eak_seen = registry;
+  requirejs.clear = function(){
+    requirejs.entries = requirejs._eak_seen = registry = {};
+    seen = state = {};
+  };
+})();
+
+define("list-view/helper",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    __exports__["default"] = function emberList(options) {
+      var hash = options.hash;
+      var types = options.hashTypes;
+
+      hash.content = hash.items;
+      delete hash.items;
+
+      types.content = types.items;
+      delete types.items;
+
+      if (!hash.content) {
+        hash.content = "this";
+        types.content = "ID";
+      }
+
+      for (var prop in hash) {
+        if (/-/.test(prop)) {
+          var camelized = Ember.String.camelize(prop);
+          hash[camelized] = hash[prop];
+          types[camelized] = types[prop];
+          delete hash[prop];
+          delete types[prop];
+        }
+      }
+
+      return Ember.Handlebars.helpers.collection.call(this, 'Ember.ListView', options);
+    };
+  });
+define("list-view/list_item_view",
+  ["list-view/list_item_view_mixin","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    // jshint validthis: true
+
+    var ListItemViewMixin = __dependency1__["default"];
+
+    var get = Ember.get, set = Ember.set;
+
+    /**
+      The `Ember.ListItemView` view class renders a
+      [div](https://developer.mozilla.org/en/HTML/Element/div) HTML element
+      with `ember-list-item-view` class. It allows you to specify a custom item
+      handlebars template for `Ember.ListView`.
+
+      Example:
+
+      ```handlebars
+      <script type="text/x-handlebars" data-template-name="row_item">
+        {{name}}
+      </script>
+      ```
+
+      ```javascript
+      App.ListView = Ember.ListView.extend({
+        height: 500,
+        rowHeight: 20,
+        itemViewClass: Ember.ListItemView.extend({templateName: "row_item"})
+      });
+      ```
+
+      @extends Ember.View
+      @class ListItemView
+      @namespace Ember
+    */
+    __exports__["default"] = Ember.View.extend(ListItemViewMixin, {
+      updateContext: function(newContext){
+        var context = get(this, 'context');
+
+        Ember.instrument('view.updateContext.render', this, function() {
+          if (context !== newContext) {
+            set(this, 'context', newContext);
+            if (newContext && newContext.isController) {
+              set(this, 'controller', newContext);
+            }
+          }
+        }, this);
+      },
+
+      rerender: function () {
+        // todo: work around for tests.  investigate a real fix.
+        if(get(this, 'isDestroying') || get(this, 'isDestroyed')) {
+          return;
+        }
+
+        return this._super.apply(this, arguments);
+      },
+
+      _contextDidChange: Ember.observer(function () {
+        Ember.run.once(this, this.rerender);
+      }, 'context', 'controller')
+    });
+  });
+define("list-view/list_item_view_mixin",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    // jshint validthis: true
+
+    var get = Ember.get;
+
+    function samePosition(a, b) {
+      return a && b && a.x === b.x && a.y === b.y;
+    }
+
+    function positionElement() {
+      var element, position, _position;
+
+      Ember.instrument('view.updateContext.positionElement', this, function() {
+        element = get(this, 'element');
+        position = this.position;
+        _position = this._position;
+
+        if (!position || !element) {
+          return;
+        }
+
+        // // TODO: avoid needing this by avoiding unnecessary
+        // // calls to this method in the first place
+        if (samePosition(position, _position)) {
+          return;
+        }
+
+        Ember.run.schedule('render', this, this._parentView.applyTransform, this, position.x, position.y);
+        this._position = position;
+      }, this);
+    }
+
+    var TransformMixin = Ember.Mixin.create({
+      style: '',
+      attributeBindings: ['style'],
+    });
+    __exports__.TransformMixin = TransformMixin;
+    __exports__["default"] = Ember.Mixin.create(TransformMixin, {
+      _position: null,
+      classNames: ['ember-list-item-view'],
+      _positionElement: positionElement,
+
+      init: function(){
+        this._super();
+
+        this.one('didInsertElement', positionElement);
+      },
+
+      updatePosition: function(position) {
+        this.position = position;
+        this._positionElement();
+      }
+    });
+  });
+define("list-view/list_view",
+  ["list-view/list_view_helper","list-view/list_view_mixin","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var ListViewHelper = __dependency1__["default"];
+    var ListViewMixin = __dependency2__["default"];
+
+    var get = Ember.get, set = Ember.set;
+
+    /**
+      The `Ember.ListView` view class renders a
+      [div](https://developer.mozilla.org/en/HTML/Element/div) HTML element,
+      with `ember-list-view` class.
+
+      The context of each item element within the `Ember.ListView` are populated
+      from the objects in the `Element.ListView`'s `content` property.
+
+      ### `content` as an Array of Objects
+
+      The simplest version of an `Ember.ListView` takes an array of object as its
+      `content` property. The object will be used as the `context` each item element
+      inside the rendered `div`.
+
+      Example:
+
+      ```javascript
+      App.ContributorsRoute = Ember.Route.extend({
+        model: function() {
+          return [{ name: 'Stefan Penner' }, { name: 'Alex Navasardyan' }, { name: 'Ray Cohen'}];
+        }
+      });
+      ```
+
+      ```handlebars
+      {{#ember-list items=contributors height=500 rowHeight=50}}
+        {{name}}
+      {{/ember-list}}
+      ```
+
+      Would result in the following HTML:
+
+      ```html
+       <div id="ember181" class="ember-view ember-list-view" style="height:500px;width:500px;position:relative;overflow:scroll;-webkit-overflow-scrolling:touch;overflow-scrolling:touch;">
+        <div class="ember-list-container">
+          <div id="ember186" class="ember-view ember-list-item-view" style="-webkit-transform: translate3d(0px, 0px, 0);">
+            <script id="metamorph-0-start" type="text/x-placeholder"></script>Stefan Penner<script id="metamorph-0-end" type="text/x-placeholder"></script>
+          </div>
+          <div id="ember187" class="ember-view ember-list-item-view" style="-webkit-transform: translate3d(0px, 50px, 0);">
+            <script id="metamorph-1-start" type="text/x-placeholder"></script>Alex Navasardyan<script id="metamorph-1-end" type="text/x-placeholder"></script>
+          </div>
+          <div id="ember188" class="ember-view ember-list-item-view" style="-webkit-transform: translate3d(0px, 100px, 0);">
+            <script id="metamorph-2-start" type="text/x-placeholder"></script>Rey Cohen<script id="metamorph-2-end" type="text/x-placeholder"></script>
+          </div>
+          <div id="ember189" class="ember-view ember-list-scrolling-view" style="height: 150px"></div>
+        </div>
+      </div>
+      ```
+
+      By default `Ember.ListView` provides support for `height`,
+      `rowHeight`, `width`, `elementWidth`, `scrollTop` parameters.
+
+      Note, that `height` and `rowHeight` are required parameters.
+
+      ```handlebars
+      {{#ember-list items=this height=500 rowHeight=50}}
+        {{name}}
+      {{/ember-list}}
+      ```
+
+      If you would like to have multiple columns in your view layout, you can
+      set `width` and `elementWidth` parameters respectively.
+
+      ```handlebars
+      {{#ember-list items=this height=500 rowHeight=50 width=500 elementWidth=80}}
+        {{name}}
+      {{/ember-list}}
+      ```
+
+      ### extending `Ember.ListView`
+
+      Example:
+
+      ```handlebars
+      {{view App.ListView contentBinding="content"}}
+
+      <script type="text/x-handlebars" data-template-name="row_item">
+        {{name}}
+      </script>
+      ```
+
+      ```javascript
+      App.ListView = Ember.ListView.extend({
+        height: 500,
+        width: 500,
+        elementWidth: 80,
+        rowHeight: 20,
+        itemViewClass: Ember.ListItemView.extend({templateName: "row_item"})
+      });
+      ```
+
+      @extends Ember.ContainerView
+      @class ListView
+      @namespace Ember
+    */
+    __exports__["default"] = Ember.ContainerView.extend(ListViewMixin, {
+      css: {
+        position: 'relative',
+        overflow: 'auto',
+        '-webkit-overflow-scrolling': 'touch',
+        'overflow-scrolling': 'touch'
+      },
+
+      applyTransform: ListViewHelper.applyTransform,
+
+      _scrollTo: function(scrollTop) {
+        var element = get(this, 'element');
+
+        if (element) { element.scrollTop = scrollTop; }
+      },
+
+      didInsertElement: function() {
+        var that = this;
+        var element = get(this, 'element');
+
+        this._updateScrollableHeight();
+
+        this._scroll = function(e) { that.scroll(e); };
+
+        Ember.$(element).on('scroll', this._scroll);
+      },
+
+      willDestroyElement: function() {
+        var element;
+
+        element = get(this, 'element');
+
+        Ember.$(element).off('scroll', this._scroll);
+      },
+
+      scroll: function(e) {
+        this.scrollTo(e.target.scrollTop);
+      },
+
+      scrollTo: function(y){
+        var element = get(this, 'element');
+        this._scrollTo(y);
+        this._scrollContentTo(y);
+      },
+
+      totalHeightDidChange: Ember.observer(function () {
+        Ember.run.scheduleOnce('afterRender', this, this._updateScrollableHeight);
+      }, 'totalHeight'),
+
+      _updateScrollableHeight: function () {
+        var height, state;
+
+        // Support old and new Ember versions
+        state = this._state || this.state;
+
+        if (state === 'inDOM') {
+          // if the list is currently displaying the emptyView, remove the height
+          if (this._isChildEmptyView()) {
+              height = '';
+          } else {
+              height = get(this, 'totalHeight');
+          }
+
+          this.$('.ember-list-container').css({
+            height: height
+          });
+        }
+      }
+    });
+  });
+define("list-view/list_view_helper",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    // TODO - remove this!
+    var el = document.createElement('div'), style = el.style;
+    var set = Ember.set;
+
+    function testProp (prop) {
+      var uppercaseProp = prop.charAt(0).toUpperCase() + prop.slice(1);
+
+      var dic = {
+        webkit: '-webkit-' + prop,
+        moz: '-moz-' + prop,
+        ms: 'ms' + uppercaseProp
+      };
+
+      var props = [
+        prop,
+        'webkit' + prop,
+        'webkit' + uppercaseProp,
+        'Moz' + uppercaseProp,
+        'moz' + uppercaseProp,
+        'ms' + uppercaseProp,
+        'ms' + prop
+      ];
+
+      for (var i=0; i < props.length; i++) {
+        var property = props[i];
+        var prefix;
+
+        if (property in style) {
+          prefix = property.toLowerCase().replace(prop, '');
+          if (prefix && dic[prefix]) {
+            return dic[prefix];
+          }
+          return property;
+        }
+      }
+
+      return null;
+    }
+
+    var transformProp = testProp('transform');
+    var perspectiveProp = testProp('perspective');
+    var supports2D = transformProp !== null;
+    var supports3D = perspectiveProp !== null;
+
+    __exports__["default"] = {
+      transformProp: transformProp,
+      applyTransform: (function(){
+        if (supports2D) {
+          return function(childView, x, y){
+            set(childView, 'style', transformProp + ': translate(' + x + 'px, ' + y + 'px);');
+          };
+        } else {
+          return function(childView, x, y){
+            set(childView, 'style', 'top: ' + y + 'px; left: ' + x + 'px;');
+          };
+        }
+      })(),
+      apply3DTransform: (function(){
+        if (supports3D) {
+          return function(childView, x, y){
+            set(childView, 'style', transformProp + ': translate3d(' + x + 'px, ' + y + 'px, 0);');
+          };
+        } else if (supports2D) {
+          return function(childView, x, y){
+            set(childView, 'style', transformProp + ': translate(' + x + 'px, ' + y + 'px);');
+          };
+        } else {
+          return function(childView, x, y){
+            set(childView, 'style', 'top: ' + y + 'px; left: ' + x + 'px;');
+          };
+        }
+      })()
+    };
+  });
+define("list-view/list_view_mixin",
+  ["list-view/reusable_list_item_view","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    // jshint validthis: true
+
+    var ReusableListItemView = __dependency1__["default"];
+
+    var get = Ember.get, set = Ember.set,
+
+    min = Math.min, max = Math.max, floor = Math.floor,
+    ceil = Math.ceil,
+    forEach = Ember.ArrayPolyfills.forEach;
+
+    function addContentArrayObserver() {
+      var content = get(this, 'content');
+      if (content) {
+        content.addArrayObserver(this);
+      }
+    }
+
+    function removeAndDestroy(object) {
+      this.removeObject(object);
+      object.destroy();
+    }
+
+    function syncChildViews() {
+      Ember.run.once(this, '_syncChildViews');
+    }
+
+    function sortByContentIndex (viewOne, viewTwo) {
+      return get(viewOne, 'contentIndex') - get(viewTwo, 'contentIndex');
+    }
+
+    function notifyMutationListeners() {
+      if (Ember.View.notifyMutationListeners) {
+        Ember.run.once(Ember.View, 'notifyMutationListeners');
+      }
+    }
+
+    function removeEmptyView() {
+      var emptyView = get(this, 'emptyView');
+      if (emptyView && emptyView instanceof Ember.View) {
+        emptyView.removeFromParent();
+        if (this.totalHeightDidChange !== undefined) {
+            this.totalHeightDidChange();
+        }
+      }
+    }
+
+    function addEmptyView() {
+      var emptyView = get(this, 'emptyView');
+
+      if (!emptyView) {
+        return;
+      }
+
+      if ('string' === typeof emptyView) {
+        emptyView = get(emptyView) || emptyView;
+      }
+
+      emptyView = this.createChildView(emptyView);
+      set(this, 'emptyView', emptyView);
+
+      if (Ember.CoreView.detect(emptyView)) {
+        this._createdEmptyView = emptyView;
+      }
+
+      this.unshiftObject(emptyView);
+    }
+
+    function enableProfilingOutput() {
+      function before(name, time, payload) {
+        console.time(name);
+      }
+
+      function after (name, time, payload) {
+        console.timeEnd(name);
+      }
+
+      if (Ember.ENABLE_PROFILING) {
+        Ember.subscribe('view._scrollContentTo', {
+          before: before,
+          after: after
+        });
+        Ember.subscribe('view.updateContext', {
+          before: before,
+          after: after
+        });
+      }
+    }
+
+    /**
+      @class Ember.ListViewMixin
+      @namespace Ember
+    */
+    __exports__["default"] = Ember.Mixin.create({
+      itemViewClass: ReusableListItemView,
+      emptyViewClass: Ember.View,
+      classNames: ['ember-list-view'],
+      attributeBindings: ['style'],
+      classNameBindings: ['_isGrid:ember-list-view-grid:ember-list-view-list'],
+      scrollTop: 0,
+      bottomPadding: 0, // TODO: maybe this can go away
+      _lastEndingIndex: 0,
+      paddingCount: 1,
+      _cachedPos: 0,
+
+      _isGrid: Ember.computed('columnCount', function() {
+        return this.get('columnCount') > 1;
+      }).readOnly(),
+
+      /**
+        @private
+
+        Setup a mixin.
+        - adding observer to content array
+        - creating child views based on height and length of the content array
+
+        @method init
+      */
+      init: function() {
+        this._super();
+        this._cachedHeights = [0];
+        this.on('didInsertElement', this._syncListContainerWidth);
+        this.columnCountDidChange();
+        this._syncChildViews();
+        this._addContentArrayObserver();
+      },
+
+      _addContentArrayObserver: Ember.beforeObserver(function() {
+        addContentArrayObserver.call(this);
+      }, 'content'),
+
+      /**
+        Called on your view when it should push strings of HTML into a
+        `Ember.RenderBuffer`.
+
+        Adds a [div](https://developer.mozilla.org/en-US/docs/HTML/Element/div)
+        with a required `ember-list-container` class.
+
+        @method render
+        @param {Ember.RenderBuffer} buffer The render buffer
+      */
+      render: function(buffer) {
+        buffer.push('<div class="ember-list-container"></div>');
+        this._super(buffer);
+      },
+
+      createChildViewsMorph: function (element) {
+        var children = element.children;
+        element = children[0];
+        this._childViewsMorph = this._renderer._dom.createMorph(element, children[children.length - 1], null);
+        return element;
+      },
+
+      willInsertElement: function() {
+        if (!this.get("height") || !this.get("rowHeight")) {
+          throw new Error("A ListView must be created with a height and a rowHeight.");
+        }
+        this._super();
+      },
+
+      /**
+        @private
+
+        Sets inline styles of the view:
+        - height
+        - width
+        - position
+        - overflow
+        - -webkit-overflow
+        - overflow-scrolling
+
+        Called while attributes binding.
+
+        @property {Ember.ComputedProperty} style
+      */
+      style: Ember.computed('height', 'width', function() {
+        var height, width, style, css;
+
+        height = get(this, 'height');
+        width = get(this, 'width');
+        css = get(this, 'css');
+
+        style = '';
+
+        if (height) {
+          style += 'height:' + height + 'px;';
+        }
+
+        if (width)  {
+          style += 'width:' + width  + 'px;';
+        }
+
+        for ( var rule in css ) {
+          if (css.hasOwnProperty(rule)) {
+            style += rule + ':' + css[rule] + ';';
+          }
+        }
+
+        return style;
+      }),
+
+      /**
+        @private
+
+        Performs visual scrolling. Is overridden in Ember.ListView.
+
+        @method scrollTo
+      */
+      scrollTo: function(y) {
+        throw new Error('must override to perform the visual scroll and effectively delegate to _scrollContentTo');
+      },
+
+      /**
+        @private
+
+        Internal method used to force scroll position
+
+        @method scrollTo
+      */
+      _scrollTo: Ember.K,
+
+      /**
+        @private
+        @method _scrollContentTo
+      */
+      _scrollContentTo: function(y) {
+        var startingIndex, endingIndex,
+            contentIndex, visibleEndingIndex, maxContentIndex,
+            contentIndexEnd, contentLength, scrollTop, content;
+
+        scrollTop = max(0, y);
+
+        if (this.scrollTop === scrollTop) {
+          return;
+        }
+
+        // allow a visual overscroll, but don't scroll the content. As we are doing needless
+        // recycyling, and adding unexpected nodes to the DOM.
+        var maxScrollTop = max(0, get(this, 'totalHeight') - get(this, 'height'));
+        scrollTop = min(scrollTop, maxScrollTop);
+
+        content = get(this, 'content');
+        contentLength = get(content, 'length');
+        startingIndex = this._startingIndex(contentLength);
+
+        Ember.instrument('view._scrollContentTo', {
+          scrollTop: scrollTop,
+          content: content,
+          startingIndex: startingIndex,
+          endingIndex: min(max(contentLength - 1, 0), startingIndex + this._numChildViewsForViewport())
+        }, function () {
+          this.scrollTop = scrollTop;
+
+          maxContentIndex = max(contentLength - 1, 0);
+
+          startingIndex = this._startingIndex();
+          visibleEndingIndex = startingIndex + this._numChildViewsForViewport();
+
+          endingIndex = min(maxContentIndex, visibleEndingIndex);
+
+          if (startingIndex === this._lastStartingIndex &&
+              endingIndex === this._lastEndingIndex) {
+
+            this.trigger('scrollYChanged', y);
+            return;
+          } else {
+
+            Ember.run(this, function() {
+              this._reuseChildren();
+
+              this._lastStartingIndex = startingIndex;
+              this._lastEndingIndex = endingIndex;
+              this.trigger('scrollYChanged', y);
+            });
+          }
+        }, this);
+
+      },
+
+      /**
+        @private
+
+        Computes the height for a `Ember.ListView` scrollable container div.
+        You must specify `rowHeight` parameter for the height to be computed properly.
+
+        @property {Ember.ComputedProperty} totalHeight
+      */
+      totalHeight: Ember.computed('content.length',
+                                  'rowHeight',
+                                  'columnCount',
+                                  'bottomPadding', function() {
+        if (typeof this.heightForIndex === 'function') {
+          return this._totalHeightWithHeightForIndex();
+        } else {
+          return this._totalHeightWithStaticRowHeight();
+       }
+      }),
+
+      _doRowHeightDidChange: function() {
+        this._cachedHeights = [0];
+        this._cachedPos = 0;
+        this._syncChildViews();
+      },
+
+      _rowHeightDidChange: Ember.observer('rowHeight', function() {
+        Ember.run.once(this, this._doRowHeightDidChange);
+      }),
+
+      _totalHeightWithHeightForIndex: function() {
+        var length = this.get('content.length');
+        return this._cachedHeightLookup(length);
+      },
+
+      _totalHeightWithStaticRowHeight: function() {
+        var contentLength, rowHeight, columnCount, bottomPadding;
+
+        contentLength = get(this, 'content.length');
+        rowHeight = get(this, 'rowHeight');
+        columnCount = get(this, 'columnCount');
+        bottomPadding = get(this, 'bottomPadding');
+
+        return ((ceil(contentLength / columnCount)) * rowHeight) + bottomPadding;
+      },
+
+      /**
+        @private
+        @method _prepareChildForReuse
+      */
+      _prepareChildForReuse: function(childView) {
+        childView.prepareForReuse();
+      },
+
+      /**
+        @private
+        @method _reuseChildForContentIndex
+      */
+      _reuseChildForContentIndex: function(childView, contentIndex) {
+        var content, context, newContext, childsCurrentContentIndex, position, enableProfiling, oldChildView;
+
+        var contentViewClass = this.itemViewForIndex(contentIndex);
+
+        if (childView.constructor !== contentViewClass) {
+          // rather then associative arrays, lets move childView + contentEntry maping to a Map
+          var i = this._childViews.indexOf(childView);
+
+          childView.destroy();
+          childView = this.createChildView(contentViewClass);
+
+          this.insertAt(i, childView);
+        }
+
+        content = get(this, 'content');
+        enableProfiling = get(this, 'enableProfiling');
+        position = this.positionForIndex(contentIndex);
+        childView.updatePosition(position);
+
+        set(childView, 'contentIndex', contentIndex);
+
+        if (enableProfiling) {
+          Ember.instrument('view._reuseChildForContentIndex', position, function() {
+
+          }, this);
+        }
+
+        newContext = content.objectAt(contentIndex);
+        childView.updateContext(newContext);
+      },
+
+      /**
+        @private
+        @method positionForIndex
+      */
+      positionForIndex: function(index) {
+        if (typeof this.heightForIndex !== 'function') {
+          return this._singleHeightPosForIndex(index);
+        }
+        else {
+          return this._multiHeightPosForIndex(index);
+        }
+      },
+
+      _singleHeightPosForIndex: function(index) {
+        var elementWidth, width, columnCount, rowHeight, y, x;
+
+        elementWidth = get(this, 'elementWidth') || 1;
+        width = get(this, 'width') || 1;
+        columnCount = get(this, 'columnCount');
+        rowHeight = get(this, 'rowHeight');
+
+        y = (rowHeight * floor(index/columnCount));
+        x = (index % columnCount) * elementWidth;
+
+        return {
+          y: y,
+          x: x
+        };
+      },
+
+      // 0 maps to 0, 1 maps to heightForIndex(i)
+      _multiHeightPosForIndex: function(index) {
+        var elementWidth, width, columnCount, rowHeight, y, x;
+
+        elementWidth = get(this, 'elementWidth') || 1;
+        width = get(this, 'width') || 1;
+        columnCount = get(this, 'columnCount');
+
+        x = (index % columnCount) * elementWidth;
+        y = this._cachedHeightLookup(index);
+
+        return {
+          x: x,
+          y: y
+        };
+      },
+
+      _cachedHeightLookup: function(index) {
+        for (var i = this._cachedPos; i < index; i++) {
+          this._cachedHeights[i + 1] = this._cachedHeights[i] + this.heightForIndex(i);
+        }
+        this._cachedPos = i;
+        return this._cachedHeights[index];
+      },
+
+      /**
+        @private
+        @method _childViewCount
+      */
+      _childViewCount: function() {
+        var contentLength, childViewCountForHeight;
+
+        contentLength = get(this, 'content.length');
+        childViewCountForHeight = this._numChildViewsForViewport();
+
+        return min(contentLength, childViewCountForHeight);
+      },
+
+      /**
+        @private
+
+        Returns a number of columns in the Ember.ListView (for grid layout).
+
+        If you want to have a multi column layout, you need to specify both
+        `width` and `elementWidth`.
+
+        If no `elementWidth` is specified, it returns `1`. Otherwise, it will
+        try to fit as many columns as possible for a given `width`.
+
+        @property {Ember.ComputedProperty} columnCount
+      */
+      columnCount: Ember.computed('width', 'elementWidth', function() {
+        var elementWidth, width, count;
+
+        elementWidth = get(this, 'elementWidth');
+        width = get(this, 'width');
+
+        if (elementWidth && width > elementWidth) {
+          count = floor(width / elementWidth);
+        } else {
+          count = 1;
+        }
+
+        return count;
+      }),
+
+      /**
+        @private
+
+        Fires every time column count is changed.
+
+        @event columnCountDidChange
+      */
+      columnCountDidChange: Ember.observer(function() {
+        var ratio, currentScrollTop, proposedScrollTop, maxScrollTop,
+            scrollTop, lastColumnCount, newColumnCount, element;
+
+        lastColumnCount = this._lastColumnCount;
+
+        currentScrollTop = this.scrollTop;
+        newColumnCount = get(this, 'columnCount');
+        maxScrollTop = get(this, 'maxScrollTop');
+        element = get(this, 'element');
+
+        this._lastColumnCount = newColumnCount;
+
+        if (lastColumnCount) {
+          ratio = (lastColumnCount / newColumnCount);
+          proposedScrollTop = currentScrollTop * ratio;
+          scrollTop = min(maxScrollTop, proposedScrollTop);
+
+          this._scrollTo(scrollTop);
+          this.scrollTop = scrollTop;
+        }
+
+        if (arguments.length > 0) {
+          // invoked by observer
+          Ember.run.schedule('afterRender', this, this._syncListContainerWidth);
+        }
+      }, 'columnCount'),
+
+      /**
+        @private
+
+        Computes max possible scrollTop value given the visible viewport
+        and scrollable container div height.
+
+        @property {Ember.ComputedProperty} maxScrollTop
+      */
+      maxScrollTop: Ember.computed('height', 'totalHeight', function(){
+        var totalHeight, viewportHeight;
+
+        totalHeight = get(this, 'totalHeight');
+        viewportHeight = get(this, 'height');
+
+        return max(0, totalHeight - viewportHeight);
+      }),
+
+      /**
+        @private
+
+        Determines whether the emptyView is the current childView.
+
+        @method _isChildEmptyView
+      */
+      _isChildEmptyView: function() {
+        var emptyView = get(this, 'emptyView');
+
+        return emptyView && emptyView instanceof Ember.View &&
+               this._childViews.length === 1 && this._childViews.indexOf(emptyView) === 0;
+      },
+
+      /**
+        @private
+
+        Computes the number of views that would fit in the viewport area.
+        You must specify `height` and `rowHeight` parameters for the number of
+        views to be computed properly.
+
+        @method _numChildViewsForViewport
+      */
+      _numChildViewsForViewport: function() {
+
+        if (this.heightForIndex) {
+          return this._numChildViewsForViewportWithMultiHeight();
+        } else {
+          return this._numChildViewsForViewportWithoutMultiHeight();
+        }
+      },
+
+      _numChildViewsForViewportWithoutMultiHeight:  function() {
+        var height, rowHeight, paddingCount, columnCount;
+
+        height = get(this, 'height');
+        rowHeight = get(this, 'rowHeight');
+        paddingCount = get(this, 'paddingCount');
+        columnCount = get(this, 'columnCount');
+
+        return (ceil(height / rowHeight) * columnCount) + (paddingCount * columnCount);
+      },
+
+      _numChildViewsForViewportWithMultiHeight:  function() {
+        var rowHeight, paddingCount, columnCount;
+        var scrollTop = this.scrollTop;
+        var viewportHeight = this.get('height');
+        var length = this.get('content.length');
+        var heightfromTop = 0;
+        var padding = get(this, 'paddingCount');
+
+        var startingIndex = this._calculatedStartingIndex();
+        var currentHeight = 0;
+
+        var offsetHeight = this._cachedHeightLookup(startingIndex);
+        for (var i = 0; i < length; i++) {
+          if (this._cachedHeightLookup(startingIndex + i + 1) - offsetHeight > viewportHeight) {
+            break;
+          }
+        }
+
+        return i + padding + 1;
+      },
+
+
+      /**
+        @private
+
+        Computes the starting index of the item views array.
+        Takes `scrollTop` property of the element into account.
+
+        Is used in `_syncChildViews`.
+
+        @method _startingIndex
+      */
+      _startingIndex: function(_contentLength) {
+        var scrollTop, rowHeight, columnCount, calculatedStartingIndex,
+            contentLength;
+
+        if (_contentLength === undefined) {
+          contentLength = get(this, 'content.length');
+        } else {
+          contentLength = _contentLength;
+        }
+
+        scrollTop = this.scrollTop;
+        rowHeight = get(this, 'rowHeight');
+        columnCount = get(this, 'columnCount');
+
+        if (this.heightForIndex) {
+          calculatedStartingIndex = this._calculatedStartingIndex();
+        } else {
+          calculatedStartingIndex = floor(scrollTop / rowHeight) * columnCount;
+        }
+
+        var viewsNeededForViewport = this._numChildViewsForViewport();
+        var paddingCount = (1 * columnCount);
+        var largestStartingIndex = max(contentLength - viewsNeededForViewport, 0);
+
+        return min(calculatedStartingIndex, largestStartingIndex);
+      },
+
+      _calculatedStartingIndex: function() {
+        var rowHeight, paddingCount, columnCount;
+        var scrollTop = this.scrollTop;
+        var viewportHeight = this.get('height');
+        var length = this.get('content.length');
+        var heightfromTop = 0;
+        var padding = get(this, 'paddingCount');
+
+        for (var i = 0; i < length; i++) {
+          if (this._cachedHeightLookup(i + 1) >= scrollTop) {
+            break;
+          }
+        }
+
+        return i;
+      },
+
+      /**
+        @private
+        @event contentWillChange
+      */
+      contentWillChange: Ember.beforeObserver(function() {
+        var content;
+
+        content = get(this, 'content');
+
+        if (content) {
+          content.removeArrayObserver(this);
+        }
+      }, 'content'),
+
+      /**),
+        @private
+        @event contentDidChange
+      */
+      contentDidChange: Ember.observer(function() {
+        addContentArrayObserver.call(this);
+        syncChildViews.call(this);
+      }, 'content'),
+
+      /**
+        @private
+        @property {Function} needsSyncChildViews
+      */
+      needsSyncChildViews: Ember.observer(syncChildViews, 'height', 'width', 'columnCount'),
+
+      /**
+        @private
+
+        Returns a new item view. Takes `contentIndex` to set the context
+        of the returned view properly.
+
+        @param {Number} contentIndex item index in the content array
+        @method _addItemView
+      */
+      _addItemView: function(contentIndex){
+        var itemViewClass, childView;
+
+        itemViewClass = this.itemViewForIndex(contentIndex);
+        childView = this.createChildView(itemViewClass);
+
+        this.pushObject(childView);
+      },
+
+      /**
+        @public
+
+        Returns a view class for the provided contentIndex. If the view is
+        different then the one currently present it will remove the existing view
+        and replace it with an instance of the class provided
+
+        @param {Number} contentIndex item index in the content array
+        @method _addItemView
+        @returns {Ember.View} ember view class for this index
+      */
+      itemViewForIndex: function(contentIndex) {
+        return get(this, 'itemViewClass');
+      },
+
+      /**
+        @public
+
+        Returns a view class for the provided contentIndex. If the view is
+        different then the one currently present it will remove the existing view
+        and replace it with an instance of the class provided
+
+        @param {Number} contentIndex item index in the content array
+        @method _addItemView
+        @returns {Ember.View} ember view class for this index
+      */
+      heightForIndex: null,
+
+      /**
+        @private
+
+        Intelligently manages the number of childviews.
+
+        @method _syncChildViews
+       **/
+      _syncChildViews: function(){
+        var childViews, childViewCount,
+            numberOfChildViews, numberOfChildViewsNeeded,
+            contentIndex, startingIndex, endingIndex,
+            contentLength, emptyView, count, delta;
+
+        if (get(this, 'isDestroyed') || get(this, 'isDestroying')) {
+          return;
+        }
+
+        contentLength = get(this, 'content.length');
+        emptyView = get(this, 'emptyView');
+
+        childViewCount = this._childViewCount();
+        childViews = this.positionOrderedChildViews();
+
+        if (this._isChildEmptyView()) {
+          removeEmptyView.call(this);
+        }
+
+        startingIndex = this._startingIndex();
+        endingIndex = startingIndex + childViewCount;
+
+        numberOfChildViewsNeeded = childViewCount;
+        numberOfChildViews = childViews.length;
+
+        delta = numberOfChildViewsNeeded - numberOfChildViews;
+
+        if (delta === 0) {
+          // no change
+        } else if (delta > 0) {
+          // more views are needed
+          contentIndex = this._lastEndingIndex;
+
+          for (count = 0; count < delta; count++, contentIndex++) {
+            this._addItemView(contentIndex);
+          }
+        } else {
+          // less views are needed
+          forEach.call(
+            childViews.splice(numberOfChildViewsNeeded, numberOfChildViews),
+            removeAndDestroy,
+            this
+          );
+        }
+
+        this._reuseChildren();
+
+        this._lastStartingIndex = startingIndex;
+        this._lastEndingIndex   = this._lastEndingIndex + delta;
+
+        if (contentLength === 0 || contentLength === undefined) {
+          addEmptyView.call(this);
+        }
+      },
+
+      /**
+        @private
+
+        Applies an inline width style to the list container.
+
+        @method _syncListContainerWidth
+       **/
+      _syncListContainerWidth: function() {
+        var elementWidth, columnCount, containerWidth, element;
+
+        elementWidth = get(this, 'elementWidth');
+        columnCount = get(this, 'columnCount');
+        containerWidth = elementWidth * columnCount;
+        element = this.$('.ember-list-container');
+
+        if (containerWidth && element) {
+          element.css('width', containerWidth);
+        }
+      },
+
+      /**
+        @private
+        @method _reuseChildren
+      */
+      _reuseChildren: function(){
+        var contentLength, childViews, childViewsLength,
+            startingIndex, endingIndex, childView, attrs,
+            contentIndex, visibleEndingIndex, maxContentIndex,
+            contentIndexEnd, scrollTop;
+
+        scrollTop = this.scrollTop;
+        contentLength = get(this, 'content.length');
+        maxContentIndex = max(contentLength - 1, 0);
+        childViews = this.getReusableChildViews();
+        childViewsLength =  childViews.length;
+
+        startingIndex = this._startingIndex();
+        visibleEndingIndex = startingIndex + this._numChildViewsForViewport();
+
+        endingIndex = min(maxContentIndex, visibleEndingIndex);
+
+        contentIndexEnd = min(visibleEndingIndex, startingIndex + childViewsLength);
+
+        for (contentIndex = startingIndex; contentIndex < contentIndexEnd; contentIndex++) {
+          childView = childViews[contentIndex % childViewsLength];
+          this._reuseChildForContentIndex(childView, contentIndex);
+        }
+      },
+
+      /**
+        @private
+        @method getReusableChildViews
+      */
+      getReusableChildViews: function() {
+        return this._childViews;
+      },
+
+      /**
+        @private
+        @method positionOrderedChildViews
+      */
+      positionOrderedChildViews: function() {
+        return this.getReusableChildViews().sort(sortByContentIndex);
+      },
+
+      arrayWillChange: Ember.K,
+
+      /**
+        @private
+        @event arrayDidChange
+      */
+      // TODO: refactor
+      arrayDidChange: function(content, start, removedCount, addedCount) {
+        var index, contentIndex, state;
+
+        if (this._isChildEmptyView()) {
+            removeEmptyView.call(this);
+        }
+
+        // Support old and new Ember versions
+        state = this._state || this.state;
+
+        if (state === 'inDOM') {
+          // ignore if all changes are out of the visible change
+          if (start >= this._lastStartingIndex || start < this._lastEndingIndex) {
+            index = 0;
+            // ignore all changes not in the visible range
+            // this can re-position many, rather then causing a cascade of re-renders
+            forEach.call(
+              this.positionOrderedChildViews(),
+              function(childView) {
+                contentIndex = this._lastStartingIndex + index;
+                this._reuseChildForContentIndex(childView, contentIndex);
+                index++;
+              },
+              this
+            );
+          }
+
+          syncChildViews.call(this);
+        }
+      },
+
+      destroy: function () {
+        if (!this._super()) {
+          return;
+        }
+
+        if (this._createdEmptyView) {
+          this._createdEmptyView.destroy();
+        }
+
+        return this;
+      }
+    });
+  });
+define("list-view/main",
+  ["list-view/reusable_list_item_view","list-view/virtual_list_view","list-view/list_item_view","list-view/helper","list-view/list_view","list-view/list_view_helper"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
+    "use strict";
+    var ReusableListItemView = __dependency1__["default"];
+    var VirtualListView = __dependency2__["default"];
+    var ListItemView = __dependency3__["default"];
+    var EmberList = __dependency4__["default"];
+    var ListView = __dependency5__["default"];
+    var ListViewHelper = __dependency6__["default"];
+
+    Ember.ReusableListItemView = ReusableListItemView;
+    Ember.VirtualListView      = VirtualListView;
+    Ember.ListItemView         = ListItemView;
+    Ember.ListView             = ListView;
+    Ember.ListViewHelper       = ListViewHelper;
+
+    Ember.Handlebars.registerHelper('ember-list', EmberList);
+  });
+define("list-view/reusable_list_item_view",
+  ["list-view/list_item_view_mixin","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var ListItemViewMixin = __dependency1__["default"];
+
+    var get = Ember.get, set = Ember.set;
+
+    __exports__["default"] = Ember.View.extend(ListItemViewMixin, {
+      init: function(){
+        this._super();
+        var context = Ember.ObjectProxy.create();
+        this.set('context', context);
+        this._proxyContext = context;
+      },
+      isVisible: Ember.computed('context.content', function(){
+        return !!this.get('context.content');
+      }),
+      updateContext: function(newContext){
+        var context = get(this._proxyContext, 'content'), state;
+
+        // Support old and new Ember versions
+        state = this._state || this.state;
+
+        if (context !== newContext) {
+          if (state === 'inDOM') {
+            this.prepareForReuse(newContext);
+          }
+
+          set(this._proxyContext, 'content', newContext);
+
+          if (newContext && newContext.isController) {
+            set(this, 'controller', newContext);
+          }
+        }
+      },
+      prepareForReuse: Ember.K
+    });
+  });
+define("list-view/virtual_list_scroller_events",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    // jshint validthis: true
+    var fieldRegex = /input|textarea|select/i,
+      hasTouch = ('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch,
+      handleStart, handleMove, handleEnd, handleCancel,
+      startEvent, moveEvent, endEvent, cancelEvent;
+    if (hasTouch) {
+      startEvent = 'touchstart';
+      handleStart = function (e) {
+        var touch = e.touches[0],
+          target = touch && touch.target;
+        // avoid e.preventDefault() on fields
+        if (target && fieldRegex.test(target.tagName)) {
+          return;
+        }
+        bindWindow(this.scrollerEventHandlers);
+        this.willBeginScroll(e.touches, e.timeStamp);
+        e.preventDefault();
+      };
+      moveEvent = 'touchmove';
+      handleMove = function (e) {
+        this.continueScroll(e.touches, e.timeStamp);
+      };
+      endEvent = 'touchend';
+      handleEnd = function (e) {
+        // if we didn't end up scrolling we need to
+        // synthesize click since we did e.preventDefault()
+        // on touchstart
+        if (!this._isScrolling) {
+          synthesizeClick(e);
+        }
+        unbindWindow(this.scrollerEventHandlers);
+        this.endScroll(e.timeStamp);
+      };
+      cancelEvent = 'touchcancel';
+      handleCancel = function (e) {
+        unbindWindow(this.scrollerEventHandlers);
+        this.endScroll(e.timeStamp);
+      };
+    } else {
+      startEvent = 'mousedown';
+      handleStart = function (e) {
+        if (e.which !== 1) {
+          return;
+        }
+        var target = e.target;
+        // avoid e.preventDefault() on fields
+        if (target && fieldRegex.test(target.tagName)) {
+          return;
+        }
+        bindWindow(this.scrollerEventHandlers);
+        this.willBeginScroll([e], e.timeStamp);
+        e.preventDefault();
+      };
+      moveEvent = 'mousemove';
+      handleMove = function (e) {
+        this.continueScroll([e], e.timeStamp);
+      };
+      endEvent = 'mouseup';
+      handleEnd = function (e) {
+        unbindWindow(this.scrollerEventHandlers);
+        this.endScroll(e.timeStamp);
+      };
+      cancelEvent = 'mouseout';
+      handleCancel = function (e) {
+        if (e.relatedTarget) {
+          return;
+        }
+        unbindWindow(this.scrollerEventHandlers);
+        this.endScroll(e.timeStamp);
+      };
+    }
+
+    function handleWheel(e) {
+      this.mouseWheel(e);
+      e.preventDefault();
+    }
+
+    function bindElement(el, handlers) {
+      el.addEventListener(startEvent, handlers.start, false);
+      el.addEventListener('mousewheel', handlers.wheel, false);
+    }
+
+    function unbindElement(el, handlers) {
+      el.removeEventListener(startEvent, handlers.start, false);
+      el.removeEventListener('mousewheel', handlers.wheel, false);
+    }
+
+    function bindWindow(handlers) {
+      window.addEventListener(moveEvent, handlers.move, true);
+      window.addEventListener(endEvent, handlers.end, true);
+      window.addEventListener(cancelEvent, handlers.cancel, true);
+    }
+
+    function unbindWindow(handlers) {
+      window.removeEventListener(moveEvent, handlers.move, true);
+      window.removeEventListener(endEvent, handlers.end, true);
+      window.removeEventListener(cancelEvent, handlers.cancel, true);
+    }
+
+    __exports__["default"] = Ember.Mixin.create({
+      init: function() {
+        this.on('didInsertElement', this, 'bindScrollerEvents');
+        this.on('willDestroyElement', this, 'unbindScrollerEvents');
+        this.scrollerEventHandlers = {
+          start: bind(this, handleStart),
+          move: bind(this, handleMove),
+          end: bind(this, handleEnd),
+          cancel: bind(this, handleCancel),
+          wheel: bind(this, handleWheel)
+        };
+        return this._super();
+      },
+      scrollElement: Ember.computed.oneWay('element').readOnly(),
+      bindScrollerEvents: function() {
+        var el = this.get('scrollElement'),
+          handlers = this.scrollerEventHandlers;
+        bindElement(el, handlers);
+      },
+      unbindScrollerEvents: function() {
+        var el = this.get('scrollElement'),
+          handlers = this.scrollerEventHandlers;
+        unbindElement(el, handlers);
+        unbindWindow(handlers);
+      }
+    });
+
+    function bind(view, handler) {
+      return function (evt) {
+        handler.call(view, evt);
+      };
+    }
+
+    function synthesizeClick(e) {
+      var point = e.changedTouches[0],
+        target = point.target,
+        ev;
+      if (target && fieldRegex.test(target.tagName)) {
+        ev = document.createEvent('MouseEvents');
+        ev.initMouseEvent('click', true, true, e.view, 1, point.screenX, point.screenY, point.clientX, point.clientY, e.ctrlKey, e.altKey, e.shiftKey, e.metaKey, 0, null);
+        return target.dispatchEvent(ev);
+      }
+    }
+  });
+define("list-view/virtual_list_view",
+  ["list-view/list_view_mixin","list-view/list_item_view_mixin","list-view/list_view_helper","list-view/virtual_list_scroller_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+    "use strict";
+    /*
+      global Scroller
+    */
+
+    var ListViewMixin = __dependency1__["default"];
+    var TransformMixin = __dependency2__.TransformMixin;
+    var ListViewHelper = __dependency3__["default"];
+    var VirtualListScrollerEvents = __dependency4__["default"];
+
+    var max = Math.max, get = Ember.get, set = Ember.set;
+
+    function updateScrollerDimensions(target) {
+      var width, height, totalHeight;
+
+      target = target || this; // jshint ignore:line
+
+      width = get(target, 'width');
+      height = get(target, 'height');
+      totalHeight = get(target, 'totalHeight'); // jshint ignore:line
+
+      target.scroller.setDimensions(width, height, width, totalHeight);
+      target.trigger('scrollerDimensionsDidChange');
+    }
+
+    /**
+      VirtualListView
+
+      @class VirtualListView
+      @namespace Ember
+    */
+    __exports__["default"] = Ember.ContainerView.extend(ListViewMixin, VirtualListScrollerEvents, {
+      _isScrolling: false,
+      _mouseWheel: null,
+      css: {
+        position: 'relative',
+        overflow: 'hidden'
+      },
+
+      init: function(){
+        this._super();
+        this.setupScroller();
+        this.setupPullToRefresh();
+      },
+      _scrollerTop: 0,
+      applyTransform: ListViewHelper.apply3DTransform,
+
+      setupScroller: function(){
+        var view, y;
+
+        view = this;
+
+        view.scroller = new Scroller(function(left, top, zoom) {
+          // Support old and new Ember versions
+          var state = view._state || view.state;
+
+          if (state !== 'inDOM') {
+            return;
+          }
+
+          if (view.listContainerElement) {
+            view._scrollerTop = top;
+            view._scrollContentTo(top);
+            view.applyTransform(view.listContainerElement, 0, -top);
+          }
+        }, {
+          scrollingX: false,
+          scrollingComplete: function(){
+            view.trigger('scrollingDidComplete');
+          }
+        });
+
+        view.trigger('didInitializeScroller');
+        updateScrollerDimensions(view);
+      },
+      setupPullToRefresh: function() {
+        if (!this.pullToRefreshViewClass) {
+          return;
+        }
+
+        this._insertPullToRefreshView();
+        this._activateScrollerPullToRefresh();
+      },
+      _insertPullToRefreshView: function(){
+        var pulldownClass = this.pullToRefreshViewClass.extend(TransformMixin);
+        this.pullToRefreshView = this.createChildView(pulldownClass);
+        this.insertAt(0, this.pullToRefreshView);
+
+        var view = this;
+
+        this.pullToRefreshView.on('didInsertElement', function(){
+          Ember.run.schedule('afterRender', this, function(){
+            view.applyTransform(this, 0, -1 * view.pullToRefreshViewHeight);
+          });
+        });
+      },
+      _activateScrollerPullToRefresh: function(){
+        var view = this;
+        function activatePullToRefresh(){
+          view.pullToRefreshView.set('active', true);
+          view.trigger('activatePullToRefresh');
+        }
+        function deactivatePullToRefresh() {
+          view.pullToRefreshView.set('active', false);
+          view.trigger('deactivatePullToRefresh');
+        }
+        function startPullToRefresh() {
+          Ember.run(function(){
+            view.pullToRefreshView.set('refreshing', true);
+
+            function finishRefresh(){
+              if (view && !view.get('isDestroyed') && !view.get('isDestroying')) {
+                view.scroller.finishPullToRefresh();
+                view.pullToRefreshView.set('refreshing', false);
+              }
+            }
+            view.startRefresh(finishRefresh);
+          });
+        }
+        this.scroller.activatePullToRefresh(
+          this.pullToRefreshViewHeight,
+          activatePullToRefresh,
+          deactivatePullToRefresh,
+          startPullToRefresh
+        );
+      },
+
+      getReusableChildViews: function(){
+        var firstView = this._childViews[0];
+        if (firstView && firstView === this.pullToRefreshView) {
+          return this._childViews.slice(1);
+        } else {
+          return this._childViews;
+        }
+      },
+
+      scrollerDimensionsNeedToChange: Ember.observer(function() {
+        Ember.run.once(this, updateScrollerDimensions);
+      }, 'width', 'height', 'totalHeight'),
+
+      didInsertElement: function() {
+        this.listContainerElement = this.$('> .ember-list-container')[0];
+      },
+
+      willBeginScroll: function(touches, timeStamp) {
+        this._isScrolling = false;
+        this.trigger('scrollingDidStart');
+
+        this.scroller.doTouchStart(touches, timeStamp);
+      },
+
+      continueScroll: function(touches, timeStamp) {
+        var startingScrollTop, endingScrollTop, event;
+
+        if (this._isScrolling) {
+          this.scroller.doTouchMove(touches, timeStamp);
+        } else {
+          startingScrollTop = this._scrollerTop;
+
+          this.scroller.doTouchMove(touches, timeStamp);
+
+          endingScrollTop = this._scrollerTop;
+
+          if (startingScrollTop !== endingScrollTop) {
+            event = Ember.$.Event("scrollerstart");
+            Ember.$(touches[0].target).trigger(event);
+
+            this._isScrolling = true;
+          }
+        }
+      },
+
+      endScroll: function(timeStamp) {
+        this.scroller.doTouchEnd(timeStamp);
+      },
+
+      // api
+      scrollTo: function(y, animate) {
+        if (animate === undefined) {
+          animate = true;
+        }
+
+        this.scroller.scrollTo(0, y, animate, 1);
+      },
+
+      // events
+      mouseWheel: function(e){
+        var inverted, delta, candidatePosition;
+
+        inverted = e.webkitDirectionInvertedFromDevice;
+        delta = e.wheelDeltaY * (inverted ? 0.8 : -0.8);
+        candidatePosition = this.scroller.__scrollTop + delta;
+
+        if ((candidatePosition >= 0) && (candidatePosition <= this.scroller.__maxScrollTop)) {
+          this.scroller.scrollBy(0, delta, true);
+          e.stopPropagation();
+        }
+
+        return false;
+      }
+    });
+  });
+ requireModule('list-view/main');
+})(this);
\ No newline at end of file
diff --git a/vendor/assets/javascripts/production/ember.js b/vendor/assets/javascripts/production/ember.js
index 8a0ea9c7cc..91d071be02 100644
--- a/vendor/assets/javascripts/production/ember.js
+++ b/vendor/assets/javascripts/production/ember.js
@@ -5,24 +5,24 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.7.1
+ * @version   1.8.1
  */
 
 (function() {
-var define, requireModule, require, requirejs, Ember;
+var enifed, requireModule, eriuqer, requirejs, Ember;
 
 (function() {
   Ember = this.Ember = this.Ember || {};
-  if (typeof Ember === 'undefined') { Ember = {} };
+  if (typeof Ember === 'undefined') { Ember = {}; };
 
   if (typeof Ember.__loader === 'undefined') {
     var registry = {}, seen = {};
 
-    define = function(name, deps, callback) {
+    enifed = function(name, deps, callback) {
       registry[name] = { deps: deps, callback: callback };
     };
 
-    requirejs = require = requireModule = function(name) {
+    requirejs = eriuqer = requireModule = function(name) {
       if (seen.hasOwnProperty(name)) { return seen[name]; }
       seen[name] = {};
 
@@ -30,11 +30,11 @@ var define, requireModule, require, requirejs, Ember;
         throw new Error("Could not find module " + name);
       }
 
-      var mod = registry[name],
-      deps = mod.deps,
-      callback = mod.callback,
-      reified = [],
-      exports;
+      var mod = registry[name];
+      var deps = mod.deps;
+      var callback = mod.callback;
+      var reified = [];
+      var exports;
 
       for (var i=0, l=deps.length; i<l; i++) {
         if (deps[i] === 'exports') {
@@ -65,42 +65,34 @@ var define, requireModule, require, requirejs, Ember;
     };
     requirejs._eak_seen = registry;
 
-    Ember.__loader = {define: define, require: require, registry: registry};
+    Ember.__loader = {define: enifed, require: eriuqer, registry: registry};
   } else {
-    define = Ember.__loader.define;
-    requirejs = require = requireModule = Ember.__loader.require;
+    enifed = Ember.__loader.define;
+    requirejs = eriuqer = requireModule = Ember.__loader.require;
   }
 })();
 
-define("backburner",
-  ["backburner/utils","backburner/deferred_action_queues","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("backburner",
+  ["backburner/utils","backburner/platform","backburner/binary-search","backburner/deferred-action-queues","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    var Utils = __dependency1__["default"];
-    var DeferredActionQueues = __dependency2__.DeferredActionQueues;
+    var each = __dependency1__.each;
+    var isString = __dependency1__.isString;
+    var isFunction = __dependency1__.isFunction;
+    var isNumber = __dependency1__.isNumber;
+    var isCoercableNumber = __dependency1__.isCoercableNumber;
+    var wrapInTryCatch = __dependency1__.wrapInTryCatch;
+    var now = __dependency1__.now;
 
-    var slice = [].slice,
-        pop = [].pop,
-        each = Utils.each,
-        isString = Utils.isString,
-        isFunction = Utils.isFunction,
-        isNumber = Utils.isNumber,
-        timers = [],
-        global = this,
-        NUMBER = /\d+/;
+    var needsIETryCatchFix = __dependency2__.needsIETryCatchFix;
 
-    // In IE 6-8, try/finally doesn't work without a catch.
-    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
-    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
-    var needsIETryCatchFix = (function(e,x){
-      try{ x(); }
-      catch(e) { } // jshint ignore:line
-      return !!e;
-    })();
+    var searchTimer = __dependency3__["default"];
 
-    function isCoercableNumber(number) {
-      return isNumber(number) || NUMBER.test(number);
-    }
+    var DeferredActionQueues = __dependency4__["default"];
+
+    var slice = [].slice;
+    var pop = [].pop;
+    var global = this;
 
     function Backburner(queueNames, options) {
       this.queueNames = queueNames;
@@ -111,18 +103,14 @@ define("backburner",
       this.instanceStack = [];
       this._debouncees = [];
       this._throttlers = [];
+      this._timers = [];
     }
 
     Backburner.prototype = {
-      queueNames: null,
-      options: null,
-      currentInstance: null,
-      instanceStack: null,
-
       begin: function() {
-        var options = this.options,
-            onBegin = options && options.onBegin,
-            previousInstance = this.currentInstance;
+        var options = this.options;
+        var onBegin = options && options.onBegin;
+        var previousInstance = this.currentInstance;
 
         if (previousInstance) {
           this.instanceStack.push(previousInstance);
@@ -135,10 +123,10 @@ define("backburner",
       },
 
       end: function() {
-        var options = this.options,
-            onEnd = options && options.onEnd,
-            currentInstance = this.currentInstance,
-            nextInstance = null;
+        var options = this.options;
+        var onEnd = options && options.onEnd;
+        var currentInstance = this.currentInstance;
+        var nextInstance = null;
 
         // Prevent double-finally bug in Safari 6.0.2 and iOS 6
         // This bug appears to be resolved in Safari 6.0.5 and iOS 7
@@ -215,8 +203,19 @@ define("backburner",
           method = target[method];
         }
 
-        var stack = this.DEBUG ? new Error() : undefined,
-            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
+        var stack = this.DEBUG ? new Error() : undefined;
+        var length = arguments.length;
+        var args;
+
+        if (length > 3) {
+          args = new Array(length - 3);
+          for (var i = 3; i < length; i++) {
+            args[i-3] = arguments[i];
+          }
+        } else {
+          args = undefined;
+        }
+
         if (!this.currentInstance) { createAutorun(this); }
         return this.currentInstance.schedule(queueName, target, method, args, false, stack);
       },
@@ -231,15 +230,34 @@ define("backburner",
           method = target[method];
         }
 
-        var stack = this.DEBUG ? new Error() : undefined,
-            args = arguments.length > 3 ? slice.call(arguments, 3) : undefined;
-        if (!this.currentInstance) { createAutorun(this); }
+        var stack = this.DEBUG ? new Error() : undefined;
+        var length = arguments.length;
+        var args;
+
+        if (length > 3) {
+          args = new Array(length - 3);
+          for (var i = 3; i < length; i++) {
+            args[i-3] = arguments[i];
+          }
+        } else {
+          args = undefined;
+        }
+
+        if (!this.currentInstance) {
+          createAutorun(this);
+        }
         return this.currentInstance.schedule(queueName, target, method, args, true, stack);
       },
 
       setTimeout: function() {
-        var args = slice.call(arguments),
-            length = args.length,
+        var l = arguments.length;
+        var args = new Array(l);
+
+        for (var x = 0; x < l; x++) {
+          args[x] = arguments[x];
+        }
+
+        var length = args.length,
             method, wait, target,
             methodOrTarget, methodOrWait, methodOrArgs;
 
@@ -285,7 +303,7 @@ define("backburner",
           }
         }
 
-        var executeAt = (+new Date()) + parseInt(wait, 10);
+        var executeAt = now() + parseInt(wait, 10);
 
         if (isString(method)) {
           method = target[method];
@@ -306,9 +324,9 @@ define("backburner",
         }
 
         // find position to insert
-        var i = searchTimer(executeAt, timers);
+        var i = searchTimer(executeAt, this._timers);
 
-        timers.splice(i, 0, executeAt, fn);
+        this._timers.splice(i, 0, executeAt, fn);
 
         updateLaterTimer(this, executeAt, wait);
 
@@ -316,13 +334,10 @@ define("backburner",
       },
 
       throttle: function(target, method /* , args, wait, [immediate] */) {
-        var self = this,
-            args = arguments,
-            immediate = pop.call(args),
-            wait,
-            throttler,
-            index,
-            timer;
+        var backburner = this;
+        var args = arguments;
+        var immediate = pop.call(args);
+        var wait, throttler, index, timer;
 
         if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
@@ -338,16 +353,16 @@ define("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            self.run.apply(self, args);
+            backburner.run.apply(backburner, args);
           }
-          var index = findThrottler(target, method, self._throttlers);
+          var index = findThrottler(target, method, backburner._throttlers);
           if (index > -1) {
-            self._throttlers.splice(index, 1);
+            backburner._throttlers.splice(index, 1);
           }
         }, wait);
 
         if (immediate) {
-          self.run.apply(self, args);
+          this.run.apply(this, args);
         }
 
         throttler = [target, method, timer];
@@ -358,13 +373,10 @@ define("backburner",
       },
 
       debounce: function(target, method /* , args, wait, [immediate] */) {
-        var self = this,
-            args = arguments,
-            immediate = pop.call(args),
-            wait,
-            index,
-            debouncee,
-            timer;
+        var backburner = this;
+        var args = arguments;
+        var immediate = pop.call(args);
+        var wait, index, debouncee, timer;
 
         if (isNumber(immediate) || isString(immediate)) {
           wait = immediate;
@@ -385,21 +397,25 @@ define("backburner",
 
         timer = global.setTimeout(function() {
           if (!immediate) {
-            self.run.apply(self, args);
+            backburner.run.apply(backburner, args);
           }
-          var index = findDebouncee(target, method, self._debouncees);
+          var index = findDebouncee(target, method, backburner._debouncees);
           if (index > -1) {
-            self._debouncees.splice(index, 1);
+            backburner._debouncees.splice(index, 1);
           }
         }, wait);
 
         if (immediate && index === -1) {
-          self.run.apply(self, args);
+          backburner.run.apply(backburner, args);
         }
 
-        debouncee = [target, method, timer];
+        debouncee = [
+          target,
+          method,
+          timer
+        ];
 
-        self._debouncees.push(debouncee);
+        backburner._debouncees.push(debouncee);
 
         return debouncee;
       },
@@ -419,7 +435,7 @@ define("backburner",
           clearTimeout(this._laterTimer);
           this._laterTimer = null;
         }
-        timers = [];
+        this._timers = [];
 
         if (this._autorun) {
           clearTimeout(this._autorun);
@@ -428,7 +444,7 @@ define("backburner",
       },
 
       hasTimers: function() {
-        return !!timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
+        return !!this._timers.length || !!this._debouncees.length || !!this._throttlers.length || this._autorun;
       },
 
       cancel: function(timer) {
@@ -437,9 +453,18 @@ define("backburner",
         if (timer && timerType === 'object' && timer.queue && timer.method) { // we're cancelling a deferOnce
           return timer.queue.cancel(timer);
         } else if (timerType === 'function') { // we're cancelling a setTimeout
-          for (var i = 0, l = timers.length; i < l; i += 2) {
-            if (timers[i + 1] === timer) {
-              timers.splice(i, 2); // remove the two elements
+          for (var i = 0, l = this._timers.length; i < l; i += 2) {
+            if (this._timers[i + 1] === timer) {
+              this._timers.splice(i, 2); // remove the two elements
+              if (i === 0) {
+                if (this._laterTimer) { // Active timer? Then clear timer and reset for future timer
+                  clearTimeout(this._laterTimer);
+                  this._laterTimer = null;
+                }
+                if (this._timers.length > 0) { // Update to next available timer when available
+                  updateLaterTimer(this, this._timers[0], this._timers[0] - now());
+                }
+              }
               return true;
             }
           }
@@ -452,18 +477,17 @@ define("backburner",
       },
 
       _cancelItem: function(findMethod, array, timer){
-        var item,
-            index;
+        var item, index;
 
         if (timer.length < 3) { return false; }
 
         index = findMethod(timer[0], timer[1], array);
 
-        if(index > -1) {
+        if (index > -1) {
 
           item = array[index];
 
-          if(item[2] === timer[2]){
+          if (item[2] === timer[2]) {
             array.splice(index, 1);
             clearTimeout(timer[2]);
             return true;
@@ -486,21 +510,10 @@ define("backburner",
       Backburner.prototype.end = wrapInTryCatch(originalEnd);
     }
 
-    function wrapInTryCatch(func) {
-      return function () {
-        try {
-          return func.apply(this, arguments);
-        } catch (e) {
-          throw e;
-        }
-      };
-    }
-
     function getOnError(options) {
       return options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
     }
 
-
     function createAutorun(backburner) {
       backburner.begin();
       backburner._autorun = global.setTimeout(function() {
@@ -509,33 +522,48 @@ define("backburner",
       });
     }
 
-    function updateLaterTimer(self, executeAt, wait) {
-      if (!self._laterTimer || executeAt < self._laterTimerExpiresAt) {
-        self._laterTimer = global.setTimeout(function() {
-          self._laterTimer = null;
-          self._laterTimerExpiresAt = null;
-          executeTimers(self);
+    function updateLaterTimer(backburner, executeAt, wait) {
+      var n = now();
+      if (!backburner._laterTimer || executeAt < backburner._laterTimerExpiresAt || backburner._laterTimerExpiresAt < n) {
+
+        if (backburner._laterTimer) {
+          // Clear when:
+          // - Already expired
+          // - New timer is earlier
+          clearTimeout(backburner._laterTimer);
+
+          if (backburner._laterTimerExpiresAt < n) { // If timer was never triggered
+            // Calculate the left-over wait-time
+            wait = Math.max(0, executeAt - n);
+          }
+        }
+
+        backburner._laterTimer = global.setTimeout(function() {
+          backburner._laterTimer = null;
+          backburner._laterTimerExpiresAt = null;
+          executeTimers(backburner);
         }, wait);
-        self._laterTimerExpiresAt = executeAt;
+
+        backburner._laterTimerExpiresAt = n + wait;
       }
     }
 
-    function executeTimers(self) {
-      var now = +new Date(),
-          time, fns, i, l;
+    function executeTimers(backburner) {
+      var n = now();
+      var fns, i, l;
 
-      self.run(function() {
-        i = searchTimer(now, timers);
+      backburner.run(function() {
+        i = searchTimer(n, backburner._timers);
 
-        fns = timers.splice(0, i);
+        fns = backburner._timers.splice(0, i);
 
         for (i = 1, l = fns.length; i < l; i += 2) {
-          self.schedule(self.options.defaultQueue, null, fns[i]);
+          backburner.schedule(backburner.options.defaultQueue, null, fns[i]);
         }
       });
 
-      if (timers.length) {
-        updateLaterTimer(self, timers[0], timers[0] - now);
+      if (backburner._timers.length) {
+        updateLaterTimer(backburner, backburner._timers[0], backburner._timers[0] - n);
       }
     }
 
@@ -548,8 +576,8 @@ define("backburner",
     }
 
     function findItem(target, method, collection) {
-      var item,
-          index = -1;
+      var item;
+      var index = -1;
 
       for (var i = 0, l = collection.length; i < l; i++) {
         item = collection[i];
@@ -562,10 +590,31 @@ define("backburner",
       return index;
     }
 
-    function searchTimer(time, timers) {
-      var start = 0,
-          end = timers.length - 2,
-          middle, l;
+    __exports__["default"] = Backburner;
+  });
+enifed("backburner.umd",
+  ["./backburner"],
+  function(__dependency1__) {
+    "use strict";
+    var Backburner = __dependency1__["default"];
+
+    /* global define:true module:true window: true */
+    if (typeof enifed === 'function' && enifed.amd) {
+      enifed(function() { return Backburner; });
+    } else if (typeof module !== 'undefined' && module.exports) {
+      module.exports = Backburner;
+    } else if (typeof this !== 'undefined') {
+      this['Backburner'] = Backburner;
+    }
+  });
+enifed("backburner/binary-search",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    __exports__["default"] = function binarySearch(time, timers) {
+      var start = 0;
+      var end = timers.length - 2;
+      var middle, l;
 
       while (start < end) {
         // since timers is an array of pairs 'l' will always
@@ -585,18 +634,14 @@ define("backburner",
 
       return (time >= timers[start]) ? start + 2 : start;
     }
-
-    __exports__.Backburner = Backburner;
   });
-define("backburner/deferred_action_queues",
-  ["backburner/utils","backburner/queue","exports"],
+enifed("backburner/deferred-action-queues",
+  ["./utils","./queue","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Utils = __dependency1__["default"];
-    var Queue = __dependency2__.Queue;
-
-    var each = Utils.each,
-        isString = Utils.isString;
+    var each = __dependency1__.each;
+    var isString = __dependency1__.isString;
+    var Queue = __dependency2__["default"];
 
     function DeferredActionQueues(queueNames, options) {
       var queues = this.queues = {};
@@ -605,20 +650,20 @@ define("backburner/deferred_action_queues",
       this.options = options;
 
       each(queueNames, function(queueName) {
-        queues[queueName] = new Queue(this, queueName, options);
+        queues[queueName] = new Queue(queueName, options[queueName], options);
       });
     }
 
+    function noSuchQueue(name) {
+      throw new Error("You attempted to schedule an action in a queue (" + name + ") that doesn't exist");
+    }
+
     DeferredActionQueues.prototype = {
-      queueNames: null,
-      queues: null,
-      options: null,
+      schedule: function(name, target, method, args, onceFlag, stack) {
+        var queues = this.queues;
+        var queue = queues[name];
 
-      schedule: function(queueName, target, method, args, onceFlag, stack) {
-        var queues = this.queues,
-            queue = queues[queueName];
-
-        if (!queue) { throw new Error("You attempted to schedule an action in a queue (" + queueName + ") that doesn't exist"); }
+        if (!queue) { noSuchQueue(name); }
 
         if (onceFlag) {
           return queue.pushUnique(target, method, args, stack);
@@ -627,7 +672,7 @@ define("backburner/deferred_action_queues",
         }
       },
 
-      invoke: function(target, method, args, _) {
+      invoke: function(target, method, args, _, _errorRecordedForStack) {
         if (args && args.length > 0) {
           method.apply(target, args);
         } else {
@@ -635,7 +680,7 @@ define("backburner/deferred_action_queues",
         }
       },
 
-      invokeWithOnError: function(target, method, args, onError) {
+      invokeWithOnError: function(target, method, args, onError, errorRecordedForStack) {
         try {
           if (args && args.length > 0) {
             method.apply(target, args);
@@ -643,59 +688,80 @@ define("backburner/deferred_action_queues",
             method.call(target);
           }
         } catch(error) {
-          onError(error);
+          onError(error, errorRecordedForStack);
         }
       },
 
       flush: function() {
-        var queues = this.queues,
-            queueNames = this.queueNames,
-            queueName, queue, queueItems, priorQueueNameIndex,
-            queueNameIndex = 0, numberOfQueues = queueNames.length,
-            options = this.options,
-            onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]),
-            invoke = onError ? this.invokeWithOnError : this.invoke;
+        var queues = this.queues;
+        var queueNames = this.queueNames;
+        var queueName, queue, queueItems, priorQueueNameIndex;
+        var queueNameIndex = 0;
+        var numberOfQueues = queueNames.length;
+        var options = this.options;
+        var onError = options.onError || (options.onErrorTarget && options.onErrorTarget[options.onErrorMethod]);
+        var invoke = onError ? this.invokeWithOnError : this.invoke;
 
-        outerloop:
         while (queueNameIndex < numberOfQueues) {
           queueName = queueNames[queueNameIndex];
           queue = queues[queueName];
           queueItems = queue._queueBeingFlushed = queue._queue.slice();
           queue._queue = [];
+          queue.targetQueues = Object.create(null);
 
-          var queueOptions = queue.options, // TODO: write a test for this
-              before = queueOptions && queueOptions.before,
-              after = queueOptions && queueOptions.after,
-              target, method, args, stack,
-              queueIndex = 0, numberOfQueueItems = queueItems.length;
+          var queueOptions = queue.options; // TODO: write a test for this
+          var before = queueOptions && queueOptions.before;
+          var after = queueOptions && queueOptions.after;
+          var target, method, args, errorRecordedForStack;
+          var queueIndex = 0;
+          var numberOfQueueItems = queueItems.length;
 
-          if (numberOfQueueItems && before) { before(); }
+          if (numberOfQueueItems && before) {
+            before();
+          }
 
           while (queueIndex < numberOfQueueItems) {
-            target = queueItems[queueIndex];
-            method = queueItems[queueIndex+1];
-            args   = queueItems[queueIndex+2];
-            stack  = queueItems[queueIndex+3]; // Debugging assistance
+            target                = queueItems[queueIndex];
+            method                = queueItems[queueIndex+1];
+            args                  = queueItems[queueIndex+2];
+            errorRecordedForStack = queueItems[queueIndex+3]; // Debugging assistance
 
-            if (isString(method)) { method = target[method]; }
+            //
+
+            if (isString(method)) {
+              method = target[method];
+            }
 
             // method could have been nullified / canceled during flush
             if (method) {
-              invoke(target, method, args, onError);
+              //
+              //    ** Attention intrepid developer **
+              //
+              //    To find out the stack of this task when it was scheduled onto
+              //    the run loop, add the following to your app.js:
+              //
+              //    Ember.run.backburner.DEBUG = true; // NOTE: This slows your app, don't leave it on in production.
+              //
+              //    Once that is in place, when you are at a breakpoint and navigate
+              //    here in the stack explorer, you can look at `errorRecordedForStack.stack`,
+              //    which will be the captured stack when this job was scheduled.
+              //
+              invoke(target, method, args, onError, errorRecordedForStack);
             }
 
             queueIndex += 4;
           }
 
           queue._queueBeingFlushed = null;
-          if (numberOfQueueItems && after) { after(); }
+          if (numberOfQueueItems && after) {
+            after();
+          }
 
           if ((priorQueueNameIndex = indexOfPriorQueueWithActions(this, queueNameIndex)) !== -1) {
             queueNameIndex = priorQueueNameIndex;
-            continue outerloop;
+          } else {
+            queueNameIndex++;
           }
-
-          queueNameIndex++;
         }
       }
     };
@@ -712,60 +778,134 @@ define("backburner/deferred_action_queues",
       return -1;
     }
 
-    __exports__.DeferredActionQueues = DeferredActionQueues;
+    __exports__["default"] = DeferredActionQueues;
   });
-define("backburner/queue",
+enifed("backburner/platform",
   ["exports"],
   function(__exports__) {
     "use strict";
-    function Queue(daq, name, options) {
-      this.daq = daq;
+    // In IE 6-8, try/finally doesn't work without a catch.
+    // Unfortunately, this is impossible to test for since wrapping it in a parent try/catch doesn't trigger the bug.
+    // This tests for another broken try/catch behavior that only exhibits in the same versions of IE.
+    var needsIETryCatchFix = (function(e,x){
+      try{ x(); }
+      catch(e) { } // jshint ignore:line
+      return !!e;
+    })();
+    __exports__.needsIETryCatchFix = needsIETryCatchFix;
+  });
+enifed("backburner/queue",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    function Queue(name, options, globalOptions) {
       this.name = name;
-      this.globalOptions = options;
-      this.options = options[name];
+      this.globalOptions = globalOptions || {};
+      this.options = options;
       this._queue = [];
+      this.targetQueues = Object.create(null);
+      this._queueBeingFlushed = undefined;
     }
 
     Queue.prototype = {
-      daq: null,
-      name: null,
-      options: null,
-      onError: null,
-      _queue: null,
-
       push: function(target, method, args, stack) {
         var queue = this._queue;
         queue.push(target, method, args, stack);
-        return {queue: this, target: target, method: method};
+
+        return {
+          queue: this,
+          target: target,
+          method: method
+        };
       },
 
-      pushUnique: function(target, method, args, stack) {
-        var queue = this._queue, currentTarget, currentMethod, i, l;
+      pushUniqueWithoutGuid: function(target, method, args, stack) {
+        var queue = this._queue;
 
-        for (i = 0, l = queue.length; i < l; i += 4) {
-          currentTarget = queue[i];
-          currentMethod = queue[i+1];
+        for (var i = 0, l = queue.length; i < l; i += 4) {
+          var currentTarget = queue[i];
+          var currentMethod = queue[i+1];
 
           if (currentTarget === target && currentMethod === method) {
-            queue[i+2] = args; // replace args
+            queue[i+2] = args;  // replace args
             queue[i+3] = stack; // replace stack
-            return {queue: this, target: target, method: method};
+            return;
           }
         }
 
         queue.push(target, method, args, stack);
-        return {queue: this, target: target, method: method};
+      },
+
+      targetQueue: function(targetQueue, target, method, args, stack) {
+        var queue = this._queue;
+
+        for (var i = 0, l = targetQueue.length; i < l; i += 4) {
+          var currentMethod = targetQueue[i];
+          var currentIndex  = targetQueue[i + 1];
+
+          if (currentMethod === method) {
+            queue[currentIndex + 2] = args;  // replace args
+            queue[currentIndex + 3] = stack; // replace stack
+            return;
+          }
+        }
+
+        targetQueue.push(
+          method,
+          queue.push(target, method, args, stack) - 4
+        );
+      },
+
+      pushUniqueWithGuid: function(guid, target, method, args, stack) {
+        var hasLocalQueue = this.targetQueues[guid];
+
+        if (hasLocalQueue) {
+          this.targetQueue(hasLocalQueue, target, method, args, stack);
+        } else {
+          this.targetQueues[guid] = [
+            method,
+            this._queue.push(target, method, args, stack) - 4
+          ];
+        }
+
+        return {
+          queue: this,
+          target: target,
+          method: method
+        };
+      },
+
+      pushUnique: function(target, method, args, stack) {
+        var queue = this._queue, currentTarget, currentMethod, i, l;
+        var KEY = this.globalOptions.GUID_KEY;
+
+        if (target && KEY) {
+          var guid = target[KEY];
+          if (guid) {
+            return this.pushUniqueWithGuid(guid, target, method, args, stack);
+          }
+        }
+
+        this.pushUniqueWithoutGuid(target, method, args, stack);
+
+        return {
+          queue: this,
+          target: target,
+          method: method
+        };
       },
 
       // TODO: remove me, only being used for Ember.run.sync
       flush: function() {
-        var queue = this._queue,
-            globalOptions = this.globalOptions,
-            options = this.options,
-            before = options && options.before,
-            after = options && options.after,
-            onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]),
-            target, method, args, stack, i, l = queue.length;
+        var queue = this._queue;
+        var globalOptions = this.globalOptions;
+        var options = this.options;
+        var before = options && options.before;
+        var after = options && options.after;
+        var onError = globalOptions.onError || (globalOptions.onErrorTarget && globalOptions.onErrorTarget[globalOptions.onErrorMethod]);
+        var target, method, args, stack, i, l = queue.length;
+
+        this.targetQueues = Object.create(null);
 
         if (l && before) { before(); }
         for (i = 0; i < l; i += 4) {
@@ -810,12 +950,28 @@ define("backburner/queue",
 
       cancel: function(actionToCancel) {
         var queue = this._queue, currentTarget, currentMethod, i, l;
+        var target = actionToCancel.target;
+        var method = actionToCancel.method;
+        var GUID_KEY = this.globalOptions.GUID_KEY;
+
+        if (GUID_KEY && this.targetQueues && target) {
+          var targetQueue = this.targetQueues[target[GUID_KEY]];
+
+          if (targetQueue) {
+            for (i = 0, l = targetQueue.length; i < l; i++) {
+              if (targetQueue[i] === method) {
+                targetQueue.splice(i, 1);
+              }
+            }
+          }
+        }
 
         for (i = 0, l = queue.length; i < l; i += 4) {
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+          if (currentTarget === target &&
+              currentMethod === method) {
             queue.splice(i, 4);
             return true;
           }
@@ -831,7 +987,8 @@ define("backburner/queue",
           currentTarget = queue[i];
           currentMethod = queue[i+1];
 
-          if (currentTarget === actionToCancel.target && currentMethod === actionToCancel.method) {
+          if (currentTarget === target &&
+              currentMethod === method) {
             // don't mess with array during flush
             // just nullify the method
             queue[i+1] = null;
@@ -841,44 +998,63 @@ define("backburner/queue",
       }
     };
 
-    __exports__.Queue = Queue;
+    __exports__["default"] = Queue;
   });
-define("backburner/utils",
+enifed("backburner/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
-    __exports__["default"] = {
-      each: function(collection, callback) {
-        for (var i = 0; i < collection.length; i++) {
-          callback(collection[i]);
-        }
-      },
+    var NUMBER = /\d+/;
 
-      isString: function(suspect) {
-        return typeof suspect === 'string';
-      },
-
-      isFunction: function(suspect) {
-        return typeof suspect === 'function';
-      },
-
-      isNumber: function(suspect) {
-        return typeof suspect === 'number';
+    function each(collection, callback) {
+      for (var i = 0; i < collection.length; i++) {
+        callback(collection[i]);
       }
-    };
-  });
+    }
 
-define("calculateVersion",
+    __exports__.each = each;// Date.now is not available in browsers < IE9
+    // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/now#Compatibility
+    var now = Date.now || function() { return new Date().getTime(); };
+    __exports__.now = now;
+    function isString(suspect) {
+      return typeof suspect === 'string';
+    }
+
+    __exports__.isString = isString;function isFunction(suspect) {
+      return typeof suspect === 'function';
+    }
+
+    __exports__.isFunction = isFunction;function isNumber(suspect) {
+      return typeof suspect === 'number';
+    }
+
+    __exports__.isNumber = isNumber;function isCoercableNumber(number) {
+      return isNumber(number) || NUMBER.test(number);
+    }
+
+    __exports__.isCoercableNumber = isCoercableNumber;function wrapInTryCatch(func) {
+      return function () {
+        try {
+          return func.apply(this, arguments);
+        } catch (e) {
+          throw e;
+        }
+      };
+    }
+
+    __exports__.wrapInTryCatch = wrapInTryCatch;
+  });
+enifed("calculateVersion",
   [],
   function() {
     "use strict";
     'use strict';
 
-    var fs   = require('fs');
-    var path = require('path');
+    var fs   = eriuqer('fs');
+    var path = eriuqer('path');
 
     module.exports = function () {
-      var packageVersion = require('../package.json').version;
+      var packageVersion = eriuqer('../package.json').version;
       var output         = [packageVersion];
       var gitPath        = path.join(__dirname,'..','.git');
       var headFilePath   = path.join(gitPath, 'HEAD');
@@ -909,7 +1085,7 @@ define("calculateVersion",
       }
     };
   });
-define("container",
+enifed("container",
   ["container/container","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -936,13 +1112,14 @@ define("container",
 
     __exports__["default"] = Container;
   });
-define("container/container",
-  ["container/inheriting_dict","ember-metal/core","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("container/container",
+  ["ember-metal/core","ember-metal/keys","ember-metal/dictionary","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var InheritingDict = __dependency1__["default"];
-    var Ember = __dependency2__["default"];
+    var Ember = __dependency1__["default"];
     // Ember.assert
+    var emberKeys = __dependency2__["default"];
+    var dictionary = __dependency3__["default"];
 
     // A lightweight container that helps to assemble and decouple components.
     // Public api for the container is still in flux.
@@ -953,18 +1130,19 @@ define("container/container",
 
       this.resolver = parent && parent.resolver || function() {};
 
-      this.registry = new InheritingDict(parent && parent.registry);
-      this.cache = new InheritingDict(parent && parent.cache);
-      this.factoryCache = new InheritingDict(parent && parent.factoryCache);
-      this.resolveCache = new InheritingDict(parent && parent.resolveCache);
-      this.typeInjections = new InheritingDict(parent && parent.typeInjections);
-      this.injections = {};
+      this.registry       = dictionary(parent ? parent.registry : null);
+      this.cache          = dictionary(parent ? parent.cache : null);
+      this.factoryCache   = dictionary(parent ? parent.factoryCache : null);
+      this.resolveCache   = dictionary(parent ? parent.resolveCache : null);
+      this.typeInjections = dictionary(parent ? parent.typeInjections : null);
+      this.injections     = dictionary(null);
+      this.normalizeCache = dictionary(null);
 
-      this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
-      this.factoryInjections = {};
+      this.factoryTypeInjections = dictionary(parent ? parent.factoryTypeInjections : null);
+      this.factoryInjections     = dictionary(null);
 
-      this._options = new InheritingDict(parent && parent._options);
-      this._typeOptions = new InheritingDict(parent && parent._typeOptions);
+      this._options     = dictionary(parent ? parent._options : null);
+      this._typeOptions = dictionary(parent ? parent._typeOptions : null);
     }
 
     Container.prototype = {
@@ -1084,12 +1262,12 @@ define("container/container",
 
         var normalizedName = this.normalize(fullName);
 
-        if (this.cache.has(normalizedName)) {
+        if (normalizedName in this.cache) {
           throw new Error('Cannot re-register: `' + fullName +'`, as it has already been looked up.');
         }
 
-        this.registry.set(normalizedName, factory);
-        this._options.set(normalizedName, options || {});
+        this.registry[normalizedName] = factory;
+        this._options[normalizedName] = (options || {});
       },
 
       /**
@@ -1112,11 +1290,11 @@ define("container/container",
         
         var normalizedName = this.normalize(fullName);
 
-        this.registry.remove(normalizedName);
-        this.cache.remove(normalizedName);
-        this.factoryCache.remove(normalizedName);
-        this.resolveCache.remove(normalizedName);
-        this._options.remove(normalizedName);
+        delete this.registry[normalizedName];
+        delete this.cache[normalizedName];
+        delete this.factoryCache[normalizedName];
+        delete this.resolveCache[normalizedName];
+        delete this._options[normalizedName];
       },
 
       /**
@@ -1174,12 +1352,25 @@ define("container/container",
       /**
         A hook to enable custom fullName normalization behaviour
 
+        @method normalizeFullName
+        @param {String} fullName
+        @return {string} normalized fullName
+      */
+      normalizeFullName: function(fullName) {
+        return fullName;
+      },
+
+      /**
+        normalize a fullName based on the applications conventions
+
         @method normalize
         @param {String} fullName
         @return {string} normalized fullName
       */
       normalize: function(fullName) {
-        return fullName;
+        return this.normalizeCache[fullName] || (
+          this.normalizeCache[fullName] = this.normalizeFullName(fullName)
+        );
       },
 
       /**
@@ -1289,7 +1480,7 @@ define("container/container",
       optionsForType: function(type, options) {
         if (this.parent) { illegalChildOperation('optionsForType'); }
 
-        this._typeOptions.set(type, options);
+        this._typeOptions[type] = options;
       },
 
       /**
@@ -1337,12 +1528,14 @@ define("container/container",
         @param {String} fullName
       */
       typeInjection: function(type, property, fullName) {
-                if (this.parent) { illegalChildOperation('typeInjection'); }
+        
+        if (this.parent) { illegalChildOperation('typeInjection'); }
 
         var fullNameType = fullName.split(':')[0];
-        if(fullNameType === type) {
+        if (fullNameType === type) {
           throw new Error('Cannot inject a `' + fullName + '` on other ' + type + '(s). Register the `' + fullName + '` as a different type and perform the typeInjection.');
         }
+
         addTypeInjection(this.typeInjections, type, property, fullName);
       },
 
@@ -1402,7 +1595,7 @@ define("container/container",
 
                 var normalizedName = this.normalize(fullName);
 
-        if (this.cache.has(normalizedName)) {
+        if (this.cache[normalizedName]) {
           throw new Error("Attempted to register an injection for a type that has already been looked up. ('" + normalizedName + "', '" + property + "', '" + injectionName + "')");
         }
         addInjection(this.injections, normalizedName, property, normalizedInjectionName);
@@ -1506,7 +1699,7 @@ define("container/container",
         }
 
         
-        if (this.factoryCache.has(normalizedName)) {
+        if (this.factoryCache[normalizedName]) {
           throw new Error('Attempted to register a factoryInjection for a type that has already ' +
             'been looked up. (\'' + normalizedName + '\', \'' + property + '\', \'' + injectionName + '\')');
         }
@@ -1548,17 +1741,17 @@ define("container/container",
     };
 
     function resolve(container, normalizedName) {
-      var cached = container.resolveCache.get(normalizedName);
+      var cached = container.resolveCache[normalizedName];
       if (cached) { return cached; }
 
-      var resolved = container.resolver(normalizedName) || container.registry.get(normalizedName);
-      container.resolveCache.set(normalizedName, resolved);
+      var resolved = container.resolver(normalizedName) || container.registry[normalizedName];
+      container.resolveCache[normalizedName] = resolved;
 
       return resolved;
     }
 
     function has(container, fullName){
-      if (container.cache.has(fullName)) {
+      if (container.cache[fullName]) {
         return true;
       }
 
@@ -1568,8 +1761,8 @@ define("container/container",
     function lookup(container, fullName, options) {
       options = options || {};
 
-      if (container.cache.has(fullName) && options.singleton !== false) {
-        return container.cache.get(fullName);
+      if (container.cache[fullName] && options.singleton !== false) {
+        return container.cache[fullName];
       }
 
       var value = instantiate(container, fullName);
@@ -1577,7 +1770,7 @@ define("container/container",
       if (value === undefined) { return; }
 
       if (isSingleton(container, fullName) && options.singleton !== false) {
-        container.cache.set(fullName, value);
+        container.cache[fullName] = value;
       }
 
       return value;
@@ -1615,14 +1808,14 @@ define("container/container",
     }
 
     function option(container, fullName, optionName) {
-      var options = container._options.get(fullName);
+      var options = container._options[fullName];
 
       if (options && options[optionName] !== undefined) {
         return options[optionName];
       }
 
       var type = fullName.split(':')[0];
-      options = container._typeOptions.get(type);
+      options = container._typeOptions[type];
 
       if (options) {
         return options[optionName];
@@ -1631,8 +1824,8 @@ define("container/container",
 
     function factoryFor(container, fullName) {
       var cache = container.factoryCache;
-      if (cache.has(fullName)) {
-        return cache.get(fullName);
+      if (cache[fullName]) {
+        return cache[fullName];
       }
       var factory = container.resolve(fullName);
       if (factory === undefined) { return; }
@@ -1641,6 +1834,7 @@ define("container/container",
       if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
         // TODO: think about a 'safe' merge style extension
         // for now just fallback to create time injection
+        cache[fullName] = factory;
         return factory;
       } else {
         var injections = injectionsFor(container, fullName);
@@ -1651,18 +1845,18 @@ define("container/container",
         var injectedFactory = factory.extend(injections);
         injectedFactory.reopenClass(factoryInjections);
 
-        cache.set(fullName, injectedFactory);
+        cache[fullName] = injectedFactory;
 
         return injectedFactory;
       }
     }
 
     function injectionsFor(container, fullName) {
-      var splitName = fullName.split(':'),
-        type = splitName[0],
-        injections = [];
+      var splitName = fullName.split(':');
+      var type = splitName[0];
+      var injections = [];
 
-      injections = injections.concat(container.typeInjections.get(type) || []);
+      injections = injections.concat(container.typeInjections[type] || []);
       injections = injections.concat(container.injections[fullName] || []);
 
       injections = buildInjections(container, injections);
@@ -1673,11 +1867,11 @@ define("container/container",
     }
 
     function factoryInjectionsFor(container, fullName) {
-      var splitName = fullName.split(':'),
-        type = splitName[0],
-        factoryInjections = [];
+      var splitName = fullName.split(':');
+      var type = splitName[0];
+      var factoryInjections = [];
 
-      factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
+      factoryInjections = factoryInjections.concat(container.factoryTypeInjections[type] || []);
       factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
 
       factoryInjections = buildInjections(container, factoryInjections);
@@ -1712,26 +1906,34 @@ define("container/container",
     }
 
     function eachDestroyable(container, callback) {
-      container.cache.eachLocal(function(key, value) {
-        if (option(container, key, 'instantiate') === false) { return; }
-        callback(value);
-      });
+      var cache = container.cache;
+      var keys = emberKeys(cache);
+      var key, value;
+
+      for (var i = 0, l = keys.length; i < l; i++) {
+        key = keys[i];
+        value = cache[key];
+
+        if (option(container, key, 'instantiate') !== false) {
+          callback(value);
+        }
+      }
     }
 
     function resetCache(container) {
-      container.cache.eachLocal(function(key, value) {
-        if (option(container, key, 'instantiate') === false) { return; }
+      eachDestroyable(container, function(value) {
         value.destroy();
       });
-      container.cache.dict = {};
+
+      container.cache.dict = dictionary(null);
     }
 
     function addTypeInjection(rules, type, property, fullName) {
-      var injections = rules.get(type);
+      var injections = rules[type];
 
       if (!injections) {
         injections = [];
-        rules.set(type, injections);
+        rules[type] = injections;
       }
 
       injections.push({
@@ -1750,126 +1952,15 @@ define("container/container",
 
     function addInjection(rules, factoryName, property, injectionName) {
       var injections = rules[factoryName] = rules[factoryName] || [];
-      injections.push({ property: property, fullName: injectionName });
+      injections.push({
+        property: property,
+        fullName: injectionName
+      });
     }
 
     __exports__["default"] = Container;
   });
-define("container/inheriting_dict",
-  ["exports"],
-  function(__exports__) {
-    "use strict";
-    // A safe and simple inheriting object.
-    function InheritingDict(parent) {
-      this.parent = parent;
-      this.dict = {};
-    }
-
-    InheritingDict.prototype = {
-
-      /**
-        @property parent
-        @type InheritingDict
-        @default null
-      */
-
-      parent: null,
-
-      /**
-        Object used to store the current nodes data.
-
-        @property dict
-        @type Object
-        @default Object
-      */
-      dict: null,
-
-      /**
-        Retrieve the value given a key, if the value is present at the current
-        level use it, otherwise walk up the parent hierarchy and try again. If
-        no matching key is found, return undefined.
-
-        @method get
-        @param {String} key
-        @return {any}
-      */
-      get: function(key) {
-        var dict = this.dict;
-
-        if (dict.hasOwnProperty(key)) {
-          return dict[key];
-        }
-
-        if (this.parent) {
-          return this.parent.get(key);
-        }
-      },
-
-      /**
-        Set the given value for the given key, at the current level.
-
-        @method set
-        @param {String} key
-        @param {Any} value
-      */
-      set: function(key, value) {
-        this.dict[key] = value;
-      },
-
-      /**
-        Delete the given key
-
-        @method remove
-        @param {String} key
-      */
-      remove: function(key) {
-        delete this.dict[key];
-      },
-
-      /**
-        Check for the existence of given a key, if the key is present at the current
-        level return true, otherwise walk up the parent hierarchy and try again. If
-        no matching key is found, return false.
-
-        @method has
-        @param {String} key
-        @return {Boolean}
-      */
-      has: function(key) {
-        var dict = this.dict;
-
-        if (dict.hasOwnProperty(key)) {
-          return true;
-        }
-
-        if (this.parent) {
-          return this.parent.has(key);
-        }
-
-        return false;
-      },
-
-      /**
-        Iterate and invoke a callback for each local key-value pair.
-
-        @method eachLocal
-        @param {Function} callback
-        @param {Object} binding
-      */
-      eachLocal: function(callback, binding) {
-        var dict = this.dict;
-
-        for (var prop in dict) {
-          if (dict.hasOwnProperty(prop)) {
-            callback.call(binding, prop, dict[prop]);
-          }
-        }
-      }
-    };
-
-    __exports__["default"] = InheritingDict;
-  });
-define("ember-application",
+enifed("ember-application",
   ["ember-metal/core","ember-runtime/system/lazy_load","ember-application/system/dag","ember-application/system/resolver","ember-application/system/application","ember-application/ext/controller"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__) {
     "use strict";
@@ -1897,7 +1988,7 @@ define("ember-application",
 
     runLoadHooks('Ember.Application', Application);
   });
-define("ember-application/ext/controller",
+enifed("ember-application/ext/controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/utils","ember-metal/computed","ember-runtime/mixins/controller","ember-routing/system/controller_for","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -1918,7 +2009,8 @@ define("ember-application/ext/controller",
     var controllerFor = __dependency8__["default"];
 
     function verifyNeedsDependencies(controller, container, needs) {
-      var dependency, i, l, missing = [];
+      var dependency, i, l;
+      var missing = [];
 
       for (i=0, l=needs.length; i<l; i++) {
         dependency = needs[i];
@@ -1945,8 +2037,9 @@ define("ember-application/ext/controller",
         needs: get(controller, 'needs'),
         container: get(controller, 'container'),
         unknownProperty: function(controllerName) {
-          var needs = this.needs,
-            dependency, i, l;
+          var needs = this.needs;
+          var dependency, i, l;
+
           for (i=0, l=needs.length; i<l; i++) {
             dependency = needs[i];
             if (dependency === controllerName) {
@@ -2069,9 +2162,9 @@ define("ember-application/ext/controller",
 
     __exports__["default"] = ControllerMixin;
   });
-define("ember-application/system/application",
-  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-views/system/event_dispatcher","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-routing/system/cache","ember-metal/core","ember-handlebars-compiler","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __exports__) {
+enifed("ember-application/system/application",
+  ["ember-metal","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-application/system/dag","ember-runtime/system/namespace","ember-runtime/mixins/deferred","ember-application/system/resolver","ember-metal/platform","ember-metal/run_loop","ember-metal/utils","container/container","ember-runtime/controllers/controller","ember-metal/enumerable_utils","ember-runtime/controllers/object_controller","ember-runtime/controllers/array_controller","ember-handlebars/controls/select","ember-views/system/event_dispatcher","ember-views/system/jquery","ember-routing/system/route","ember-routing/system/router","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/location/none_location","ember-routing/system/cache","ember-metal/core","ember-handlebars-compiler","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -2095,21 +2188,31 @@ define("ember-application/system/application",
     var EnumerableUtils = __dependency14__["default"];
     var ObjectController = __dependency15__["default"];
     var ArrayController = __dependency16__["default"];
-    var EventDispatcher = __dependency17__["default"];
+    var SelectView = __dependency17__["default"];
+    var EventDispatcher = __dependency18__["default"];
     //import ContainerDebugAdapter from "ember-extension-support/container_debug_adapter";
-    var jQuery = __dependency18__["default"];
-    var Route = __dependency19__["default"];
-    var Router = __dependency20__["default"];
-    var HashLocation = __dependency21__["default"];
-    var HistoryLocation = __dependency22__["default"];
-    var AutoLocation = __dependency23__["default"];
-    var NoneLocation = __dependency24__["default"];
-    var BucketCache = __dependency25__["default"];
+    var jQuery = __dependency19__["default"];
+    var Route = __dependency20__["default"];
+    var Router = __dependency21__["default"];
+    var HashLocation = __dependency22__["default"];
+    var HistoryLocation = __dependency23__["default"];
+    var AutoLocation = __dependency24__["default"];
+    var NoneLocation = __dependency25__["default"];
+    var BucketCache = __dependency26__["default"];
 
-    var K = __dependency26__.K;
-    var EmberHandlebars = __dependency27__["default"];
+    var K = __dependency27__.K;
+    var EmberHandlebars = __dependency28__["default"];
 
     var ContainerDebugAdapter;
+    function props(obj) {
+      var properties = [];
+
+      for (var key in obj) {
+        properties.push(key);
+      }
+
+      return properties;
+    }
 
     /**
       An instance of `Ember.Application` is the starting point for every Ember
@@ -2329,7 +2432,7 @@ define("ember-application/system/application",
 
         this.scheduleInitialize();
 
-        Ember.libraries.registerCoreLibrary('Handlebars', EmberHandlebars.VERSION);
+        Ember.libraries.registerCoreLibrary('Handlebars' + (EmberHandlebars.compile ? '' : '-runtime'), EmberHandlebars.VERSION);
         Ember.libraries.registerCoreLibrary('jQuery', jQuery().jquery);
 
         if ( Ember.LOG_VERSION ) {
@@ -2719,14 +2822,15 @@ define("ember-application/system/application",
         @method runInitializers
       */
       runInitializers: function() {
-        var initializers = get(this.constructor, 'initializers');
+        var initializersByName = get(this.constructor, 'initializers');
+        var initializers = props(initializersByName);
         var container = this.__container__;
         var graph = new DAG();
         var namespace = this;
         var name, initializer;
 
-        for (name in initializers) {
-          initializer = initializers[name];
+        for (var i = 0; i < initializers.length; i++) {
+          initializer = initializersByName[initializers[i]];
           graph.addEdges(initializer.name, initializer.initialize, initializer.before, initializer.after);
         }
 
@@ -2840,7 +2944,7 @@ define("ember-application/system/application",
     });
 
     Application.reopenClass({
-      initializers: {},
+      initializers: create(null),
 
       /**
         Initializer receives an object which has the following attributes:
@@ -3006,9 +3110,9 @@ define("ember-application/system/application",
         var container = new Container();
 
         container.set = set;
-        container.resolver  = resolverFor(namespace);
-        container.normalize = container.resolver.normalize;
-        container.describe  = container.resolver.describe;
+        container.resolver = resolverFor(namespace);
+        container.normalizeFullName = container.resolver.normalize;
+        container.describe = container.resolver.describe;
         container.makeToString = container.resolver.makeToString;
 
         container.optionsForType('component', { singleton: false });
@@ -3021,6 +3125,9 @@ define("ember-application/system/application",
         container.register('controller:basic', Controller, { instantiate: false });
         container.register('controller:object', ObjectController, { instantiate: false });
         container.register('controller:array', ArrayController, { instantiate: false });
+
+        container.register('view:select', SelectView);
+
         container.register('route:basic', Route, { instantiate: false });
         container.register('event_dispatcher:main', EventDispatcher);
 
@@ -3109,7 +3216,7 @@ define("ember-application/system/application",
 
     __exports__["default"] = Application;
   });
-define("ember-application/system/dag",
+enifed("ember-application/system/dag",
   ["ember-metal/error","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -3152,7 +3259,22 @@ define("ember-application/system/dag",
      */
     function DAG() {
       this.names = [];
-      this.vertices = {};
+      this.vertices = Object.create(null);
+    }
+
+    /**
+     * DAG Vertex
+     *
+     * @class Vertex
+     * @constructor
+     */
+
+    function Vertex(name) {
+      this.name = name;
+      this.incoming = {};
+      this.incomingNames = [];
+      this.hasOutgoing = false;
+      this.value = null;
     }
 
     /**
@@ -3163,13 +3285,13 @@ define("ember-application/system/dag",
      * @param {String} name The name of the vertex to add
      */
     DAG.prototype.add = function(name) {
-      if (!name) { return; }
-      if (this.vertices.hasOwnProperty(name)) {
+      if (!name) {
+        throw new Error("Can't add Vertex without name");
+      }
+      if (this.vertices[name] !== undefined) {
         return this.vertices[name];
       }
-      var vertex = {
-        name: name, incoming: {}, incomingNames: [], hasOutgoing: false, value: null
-      };
+      var vertex = new Vertex(name);
       this.vertices[name] = vertex;
       this.names.push(name);
       return vertex;
@@ -3189,7 +3311,7 @@ define("ember-application/system/dag",
 
     /**
      * Connects the vertices with the given names, adding them to the graph if
-     * necesary, only if this does not produce is any circular dependency.
+     * necessary, only if this does not produce is any circular dependency.
      *
      * @private
      * @method addEdge
@@ -3200,7 +3322,8 @@ define("ember-application/system/dag",
       if (!fromName || !toName || fromName === toName) {
         return;
       }
-      var from = this.add(fromName), to = this.add(toName);
+      var from = this.add(fromName);
+      var to = this.add(toName);
       if (to.incoming.hasOwnProperty(fromName)) {
         return;
       }
@@ -3279,9 +3402,9 @@ define("ember-application/system/dag",
 
     __exports__["default"] = DAG;
   });
-define("ember-application/system/resolver",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+enifed("ember-application/system/resolver",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/logger","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/system/namespace","ember-handlebars","ember-metal/dictionary","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -3386,6 +3509,7 @@ define("ember-application/system/resolver",
       @namespace Ember
       @extends Ember.Object
     */
+    var dictionary = __dependency8__["default"];
 
     __exports__["default"] = EmberObject.extend({
       /**
@@ -3396,21 +3520,28 @@ define("ember-application/system/resolver",
       */
       namespace: null,
 
+      init: function() {
+        this._parseNameCache = dictionary(null);
+      },
       normalize: function(fullName) {
-        var split = fullName.split(':', 2),
-            type = split[0],
-            name = split[1];
+        var split = fullName.split(':', 2);
+        var type = split[0];
+        var name = split[1];
 
         
         if (type !== 'template') {
           var result = name;
 
           if (result.indexOf('.') > -1) {
-            result = result.replace(/\.(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+            result = result.replace(/\.(.)/g, function(m) {
+              return m.charAt(1).toUpperCase();
+            });
           }
 
           if (name.indexOf('_') > -1) {
-            result = result.replace(/_(.)/g, function(m) { return m.charAt(1).toUpperCase(); });
+            result = result.replace(/_(.)/g, function(m) {
+              return m.charAt(1).toUpperCase();
+            });
           }
 
           return type + ':' + result;
@@ -3430,9 +3561,9 @@ define("ember-application/system/resolver",
         @return {Object} the resolved factory
       */
       resolve: function(fullName) {
-        var parsedName = this.parseName(fullName),
-            resolveMethodName = parsedName.resolveMethodName,
-            resolved;
+        var parsedName = this.parseName(fullName);
+        var resolveMethodName = parsedName.resolveMethodName;
+        var resolved;
 
         if (!(parsedName.name && parsedName.type)) {
           throw new TypeError('Invalid fullName: `' + fullName + '`, must be of the form `type:name` ');
@@ -3461,12 +3592,19 @@ define("ember-application/system/resolver",
         @param {String} fullName the lookup string
         @method parseName
       */
+
       parseName: function(fullName) {
-        var nameParts = fullName.split(':'),
-            type = nameParts[0], fullNameWithoutType = nameParts[1],
-            name = fullNameWithoutType,
-            namespace = get(this, 'namespace'),
-            root = namespace;
+        return this._parseNameCache[fullName] || (
+          this._parseNameCache[fullName] = this._parseName(fullName)
+        );
+      },
+
+      _parseName: function(fullName) {
+        var nameParts = fullName.split(':');
+        var type = nameParts[0], fullNameWithoutType = nameParts[1];
+        var name = fullNameWithoutType;
+        var namespace = get(this, 'namespace');
+        var root = namespace;
 
         if (type !== 'template' && name.indexOf('/') !== -1) {
           var parts = name.split('/');
@@ -3504,7 +3642,10 @@ define("ember-application/system/resolver",
         }
 
         var description = parsedName.root + '.' + classify(parsedName.name);
-        if (parsedName.type !== 'model') { description += classify(parsedName.type); }
+
+        if (parsedName.type !== 'model') {
+          description += classify(parsedName.type);
+        }
 
         return description;
       },
@@ -3547,6 +3688,7 @@ define("ember-application/system/resolver",
           return Ember.TEMPLATES[templateName];
         }
       },
+
       /**
         Lookup the view using `resolveOther`
 
@@ -3559,6 +3701,7 @@ define("ember-application/system/resolver",
         this.useRouterNaming(parsedName);
         return this.resolveOther(parsedName);
       },
+
       /**
         Lookup the controller using `resolveOther`
 
@@ -3647,7 +3790,7 @@ define("ember-application/system/resolver",
       }
     });
   });
-define("ember-extension-support",
+enifed("ember-extension-support",
   ["ember-metal/core","ember-extension-support/data_adapter","ember-extension-support/container_debug_adapter"],
   function(__dependency1__, __dependency2__, __dependency3__) {
     "use strict";
@@ -3666,7 +3809,7 @@ define("ember-extension-support",
     Ember.DataAdapter = DataAdapter;
     Ember.ContainerDebugAdapter = ContainerDebugAdapter;
   });
-define("ember-extension-support/container_debug_adapter",
+enifed("ember-extension-support/container_debug_adapter",
   ["ember-metal/core","ember-runtime/system/native_array","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -3743,7 +3886,7 @@ define("ember-extension-support/container_debug_adapter",
         classes in the resolver for a given type.
 
         @method canCatalogEntriesByType
-        @param {string} type The type. e.g. "model", "controller", "route"
+        @param {String} type The type. e.g. "model", "controller", "route"
         @return {boolean} whether a list is available for this type.
       */
       canCatalogEntriesByType: function(type) {
@@ -3755,7 +3898,7 @@ define("ember-extension-support/container_debug_adapter",
         Returns the available classes a given type.
 
         @method catalogEntriesByType
-        @param {string} type The type. e.g. "model", "controller", "route"
+        @param {String} type The type. e.g. "model", "controller", "route"
         @return {Array} An array of strings.
       */
       catalogEntriesByType: function(type) {
@@ -3779,7 +3922,7 @@ define("ember-extension-support/container_debug_adapter",
       }
     });
   });
-define("ember-extension-support/data_adapter",
+enifed("ember-extension-support/data_adapter",
   ["ember-metal/core","ember-metal/property_get","ember-metal/run_loop","ember-runtime/system/string","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/native_array","ember-application/system/application","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -3917,8 +4060,10 @@ define("ember-extension-support/data_adapter",
         @return {Function} Method to call to remove all observers
       */
       watchModelTypes: function(typesAdded, typesUpdated) {
-        var modelTypes = this.getModelTypes(),
-            self = this, typesToSend, releaseMethods = emberA();
+        var modelTypes = this.getModelTypes();
+        var self = this;
+        var releaseMethods = emberA();
+        var typesToSend;
 
         typesToSend = modelTypes.map(function(type) {
           var klass = type.klass;
@@ -4059,7 +4204,8 @@ define("ember-extension-support/data_adapter",
       */
 
       observeModelType: function(type, typesUpdated) {
-        var self = this, records = this.getRecords(type);
+        var self = this;
+        var records = this.getRecords(type);
 
         var onChange = function() {
           typesUpdated([self.wrapModelType(type)]);
@@ -4099,8 +4245,9 @@ define("ember-extension-support/data_adapter",
           release: {Function} The function to remove observers
       */
       wrapModelType: function(type, name) {
-        var release, records = this.getRecords(type),
-            typeToSend, self = this;
+        var records = this.getRecords(type);
+        var self = this;
+        var release, typeToSend;
 
         typeToSend = {
           name: name || type.toString(),
@@ -4122,8 +4269,9 @@ define("ember-extension-support/data_adapter",
         @return {Array} Array of model types
       */
       getModelTypes: function() {
-        var types, self = this,
-            containerDebugAdapter = this.get('containerDebugAdapter');
+        var self = this;
+        var containerDebugAdapter = this.get('containerDebugAdapter');
+        var types;
 
         if (containerDebugAdapter.canCatalogEntriesByType('model')) {
           types = containerDebugAdapter.catalogEntriesByType('model');
@@ -4154,9 +4302,9 @@ define("ember-extension-support/data_adapter",
         @return {Array} Array of model type strings
       */
       _getObjectsOnNamespaces: function() {
-        var namespaces = emberA(Namespace.NAMESPACES),
-            types = emberA(),
-            self = this;
+        var namespaces = emberA(Namespace.NAMESPACES);
+        var types = emberA();
+        var self = this;
 
         namespaces.forEach(function(namespace) {
           for (var key in namespace) {
@@ -4199,7 +4347,9 @@ define("ember-extension-support/data_adapter",
         searchKeywords: {Array}
       */
       wrapRecord: function(record) {
-        var recordToSend = { object: record }, columnValues = {}, self = this;
+        var recordToSend = { object: record };
+        var columnValues = {};
+        var self = this;
 
         recordToSend.columnValues = this.getRecordColumnValues(record);
         recordToSend.searchKeywords = this.getRecordKeywords(record);
@@ -4272,17 +4422,21 @@ define("ember-extension-support/data_adapter",
       }
     });
   });
-define("ember-extension-support/initializers",
+enifed("ember-extension-support/initializers",
   [],
   function() {
     "use strict";
 
   });
-define("ember-handlebars-compiler",
+enifed("ember-handlebars-compiler",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
-    "use strict";
-    /* global Handlebars:true */
+        /* global Handlebars:true */
+
+    // Remove "use strict"; from transpiled module (in browser builds only) until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
 
     /**
     @module ember
@@ -4307,8 +4461,8 @@ define("ember-handlebars-compiler",
     // ES6Todo: when ember-debug is es6'ed import this.
     // var emberAssert = Ember.assert;
     var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars);
-    if (!Handlebars && typeof require === 'function') {
-      Handlebars = require('handlebars');
+    if (!Handlebars && typeof eriuqer === 'function') {
+      Handlebars = eriuqer('handlebars');
     }
 
     
@@ -4370,7 +4524,7 @@ define("ember-handlebars-compiler",
       Which is functionally equivalent to:
 
       ```handlebars
-      {{view App.CalendarView}}
+      {{view 'calendar'}}
       ```
 
       Options in the helper will be passed to the view in exactly the same
@@ -4481,14 +4635,14 @@ define("ember-handlebars-compiler",
     // This can go away once the following is closed:
     // https://github.com/wycats/handlebars.js/issues/634
 
-    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/,
-        BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/,
-        INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
+    var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/;
+    var BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/;
+    var INVOCATION_SPLITTING_REGEX = /(.*blockHelperMissing\.call\(.*)(stack[0-9]+)(,.*)/;
 
     EmberHandlebars.JavaScriptCompiler.stringifyLastBlockHelperMissingInvocation = function(source) {
-      var helperInvocation = source[source.length - 1],
-          helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1],
-          matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
+      var helperInvocation = source[source.length - 1];
+      var helperName = (DOT_LOOKUP_REGEX.exec(helperInvocation) || BRACKET_STRING_LOOKUP_REGEX.exec(helperInvocation))[1];
+      var matches = INVOCATION_SPLITTING_REGEX.exec(helperInvocation);
 
       source[source.length - 1] = matches[1] + "'" + helperName + "'" + matches[3];
     };
@@ -4541,12 +4695,12 @@ define("ember-handlebars-compiler",
       @method precompile
       @for Ember.Handlebars
       @static
-      @param {String} string The template to precompile
+      @param {String|Object} value The template to precompile or an Handlebars AST
       @param {Boolean} asObject optional parameter, defaulting to true, of whether or not the
                                 compiled template should be returned as an Object or a String
     */
-    EmberHandlebars.precompile = function(string, asObject) {
-      var ast = Handlebars.parse(string);
+    EmberHandlebars.precompile = function(value, asObject) {
+      var ast = Handlebars.parse(value);
 
       var options = {
         knownHelpers: {
@@ -4595,7 +4749,7 @@ define("ember-handlebars-compiler",
 
     __exports__["default"] = EmberHandlebars;
   });
-define("ember-handlebars",
+enifed("ember-handlebars",
   ["ember-handlebars-compiler","ember-metal/core","ember-runtime/system/lazy_load","ember-handlebars/loader","ember-handlebars/ext","ember-handlebars/string","ember-handlebars/helpers/shared","ember-handlebars/helpers/binding","ember-handlebars/helpers/collection","ember-handlebars/helpers/view","ember-handlebars/helpers/unbound","ember-handlebars/helpers/debug","ember-handlebars/helpers/each","ember-handlebars/helpers/template","ember-handlebars/helpers/partial","ember-handlebars/helpers/yield","ember-handlebars/helpers/loc","ember-handlebars/controls/checkbox","ember-handlebars/controls/select","ember-handlebars/controls/text_area","ember-handlebars/controls/text_field","ember-handlebars/controls/text_support","ember-handlebars/controls","ember-handlebars/component_lookup","ember-handlebars/views/handlebars_bound_view","ember-handlebars/views/metamorph_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __exports__) {
     "use strict";
@@ -4746,7 +4900,7 @@ define("ember-handlebars",
 
     __exports__["default"] = EmberHandlebars;
   });
-define("ember-handlebars/component_lookup",
+enifed("ember-handlebars/component_lookup",
   ["ember-runtime/system/object","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -4757,9 +4911,9 @@ define("ember-handlebars/component_lookup",
 
         container = container || this.container;
 
-        var fullName = 'component:' + name,
-            templateFullName = 'template:components/' + name,
-            templateRegistered = container && container.has(templateFullName);
+        var fullName = 'component:' + name;
+        var templateFullName = 'template:components/' + name;
+        var templateRegistered = container && container.has(templateFullName);
 
         if (templateRegistered) {
           container.injection(fullName, 'layout', templateFullName);
@@ -4781,7 +4935,7 @@ define("ember-handlebars/component_lookup",
 
     __exports__["default"] = ComponentLookup;
   });
-define("ember-handlebars/controls",
+enifed("ember-handlebars/controls",
   ["ember-handlebars/controls/checkbox","ember-handlebars/controls/text_field","ember-handlebars/controls/text_area","ember-metal/core","ember-handlebars-compiler","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -4872,7 +5026,7 @@ define("ember-handlebars/controls",
 
       The helper can send multiple actions based on user events.
 
-      The action property defines the action which is send when
+      The action property defines the action which is sent when
       the user presses the return key.
 
       ```handlebars
@@ -4888,6 +5042,7 @@ define("ember-handlebars/controls",
     * `focus-out`
     * `key-press`
 
+
       For example, if you desire an action to be sent when the input is blurred,
       you only need to setup the action name to the event name property.
 
@@ -4986,10 +5141,10 @@ define("ember-handlebars/controls",
     */
     function inputHelper(options) {
       
-      var hash = options.hash,
-          types = options.hashTypes,
-          inputType = _resolveOption(this, options, 'type'),
-          onEvent = hash.on;
+      var hash = options.hash;
+      var types = options.hashTypes;
+      var inputType = _resolveOption(this, options, 'type');
+      var onEvent = hash.on;
 
       if (inputType === 'checkbox') {
         delete hash.type;
@@ -5168,7 +5323,7 @@ define("ember-handlebars/controls",
       Internally, `{{textarea}}` creates an instance of `Ember.TextArea`, passing
       arguments from the helper to `Ember.TextArea`'s `create` method. You can
       extend the capabilities of text areas in your application by reopening this
-      class. For example, if you are building a Bootstrap project where `data-*` 
+      class. For example, if you are building a Bootstrap project where `data-*`
       attributes are used, you can globally add support for a `data-*` attribute
       on all `{{textarea}}`s' in your app by reopening `Ember.TextArea` or
       `Ember.TextSupport` and adding it to the `attributeBindings` concatenated
@@ -5192,15 +5347,15 @@ define("ember-handlebars/controls",
     */
     function textareaHelper(options) {
       
-      var hash = options.hash,
-          types = options.hashTypes;
+      var hash = options.hash;
+      var types = options.hashTypes;
 
       return helpers.view.call(this, TextArea, options);
     }
 
     __exports__.textareaHelper = textareaHelper;
   });
-define("ember-handlebars/controls/checkbox",
+enifed("ember-handlebars/controls/checkbox",
   ["ember-metal/property_get","ember-metal/property_set","ember-views/views/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -5276,7 +5431,7 @@ define("ember-handlebars/controls/checkbox",
       }
     });
   });
-define("ember-handlebars/controls/select",
+enifed("ember-handlebars/controls/select",
   ["ember-handlebars-compiler","ember-metal/enumerable_utils","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/collection_view","ember-metal/utils","ember-metal/is_none","ember-metal/computed","ember-runtime/system/native_array","ember-metal/mixin","ember-metal/properties","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -5324,8 +5479,8 @@ define("ember-handlebars/controls/select",
       },
 
       selected: computed(function() {
-        var content = get(this, 'content'),
-            selection = get(this, 'parentView.selection');
+        var content = get(this, 'content');
+        var selection = get(this, 'parentView.selection');
         if (get(this, 'parentView.multiple')) {
           return selection && indexOf(selection, content.valueOf()) > -1;
         } else {
@@ -5395,7 +5550,7 @@ define("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view Ember.Select content=names}}
+      {{view "select" content=names}}
       ```
 
       Would result in the following HTML:
@@ -5418,10 +5573,7 @@ define("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view Ember.Select
-             content=names
-             value=selectedName
-      }}
+      {{view "select" content=names value=selectedName}}
       ```
 
       Would result in the following HTML with the `<option>` for 'Tom' selected:
@@ -5460,7 +5612,7 @@ define("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"}}
@@ -5491,7 +5643,7 @@ define("ember-handlebars/controls/select",
       ```
 
       ```handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"
@@ -5524,15 +5676,12 @@ define("ember-handlebars/controls/select",
 
       App.ApplicationController = Ember.ObjectController.extend({
         selectedPerson: tom,
-        programmers: [
-          yehuda,
-          tom
-        ]
+        programmers: [ yehuda, tom ]
       });
       ```
 
       ```handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              optionValuePath="content.id"
              optionLabelPath="content.firstName"
@@ -5561,15 +5710,12 @@ define("ember-handlebars/controls/select",
       ```javascript
       App.ApplicationController = Ember.ObjectController.extend({
         selectedProgrammer: null,
-        programmers: [
-          "Yehuda",
-          "Tom"
-        ]
+        programmers: ["Yehuda", "Tom"]
       });
       ```
 
       ``` handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              value=selectedProgrammer
       }}
@@ -5593,15 +5739,12 @@ define("ember-handlebars/controls/select",
       ```javascript
       App.ApplicationController = Ember.ObjectController.extend({
         selectedProgrammer: null,
-        programmers: [
-          "Yehuda",
-          "Tom"
-        ]
+        programmers: [ "Yehuda", "Tom" ]
       });
       ```
 
       ```handlebars
-      {{view Ember.Select
+      {{view "select"
              content=programmers
              value=selectedProgrammer
              prompt="Please select a name"
@@ -5723,7 +5866,8 @@ define("ember-handlebars/controls/select",
         Otherwise, this should be a list of objects. For instance:
 
         ```javascript
-        Ember.Select.create({
+        var App = Ember.Application.create();
+        var App.MySelect = Ember.Select.extend({
           content: Ember.A([
               { id: 1, firstName: 'Yehuda' },
               { id: 2, firstName: 'Tom' }
@@ -5866,11 +6010,11 @@ define("ember-handlebars/controls/select",
       }),
 
       valueDidChange: observer('value', function() {
-        var content = get(this, 'content'),
-            value = get(this, 'value'),
-            valuePath = get(this, 'optionValuePath').replace(/^content\.?/, ''),
-            selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection')),
-            selection;
+        var content = get(this, 'content');
+        var value = get(this, 'value');
+        var valuePath = get(this, 'optionValuePath').replace(/^content\.?/, '');
+        var selectedValue = (valuePath ? get(this, 'selection.' + valuePath) : get(this, 'selection'));
+        var selection;
 
         if (value !== selectedValue) {
           selection = content ? content.find(function(obj) {
@@ -5893,9 +6037,9 @@ define("ember-handlebars/controls/select",
       },
 
       _changeSingle: function() {
-        var selectedIndex = this.$()[0].selectedIndex,
-            content = get(this, 'content'),
-            prompt = get(this, 'prompt');
+        var selectedIndex = this.$()[0].selectedIndex;
+        var content = get(this, 'content');
+        var prompt = get(this, 'prompt');
 
         if (!content || !get(content, 'length')) { return; }
         if (prompt && selectedIndex === 0) { set(this, 'selection', null); return; }
@@ -5906,11 +6050,11 @@ define("ember-handlebars/controls/select",
 
 
       _changeMultiple: function() {
-        var options = this.$('option:selected'),
-            prompt = get(this, 'prompt'),
-            offset = prompt ? 1 : 0,
-            content = get(this, 'content'),
-            selection = get(this, 'selection');
+        var options = this.$('option:selected');
+        var prompt = get(this, 'prompt');
+        var offset = prompt ? 1 : 0;
+        var content = get(this, 'content');
+        var selection = get(this, 'selection');
 
         if (!content) { return; }
         if (options) {
@@ -5931,23 +6075,23 @@ define("ember-handlebars/controls/select",
         var el = this.get('element');
         if (!el) { return; }
 
-        var content = get(this, 'content'),
-            selection = get(this, 'selection'),
-            selectionIndex = content ? indexOf(content, selection) : -1,
-            prompt = get(this, 'prompt');
+        var content = get(this, 'content');
+        var selection = get(this, 'selection');
+        var selectionIndex = content ? indexOf(content, selection) : -1;
+        var prompt = get(this, 'prompt');
 
         if (prompt) { selectionIndex += 1; }
         if (el) { el.selectedIndex = selectionIndex; }
       },
 
       _selectionDidChangeMultiple: function() {
-        var content = get(this, 'content'),
-            selection = get(this, 'selection'),
-            selectedIndexes = content ? indexesOf(content, selection) : [-1],
-            prompt = get(this, 'prompt'),
-            offset = prompt ? 1 : 0,
-            options = this.$('option'),
-            adjusted;
+        var content = get(this, 'content');
+        var selection = get(this, 'selection');
+        var selectedIndexes = content ? indexesOf(content, selection) : [-1];
+        var prompt = get(this, 'prompt');
+        var offset = prompt ? 1 : 0;
+        var options = this.$('option');
+        var adjusted;
 
         if (options) {
           options.each(function() {
@@ -5969,7 +6113,7 @@ define("ember-handlebars/controls/select",
     __exports__.SelectOption = SelectOption;
     __exports__.SelectOptgroup = SelectOptgroup;
   });
-define("ember-handlebars/controls/text_area",
+enifed("ember-handlebars/controls/text_area",
   ["ember-metal/property_get","ember-views/views/component","ember-handlebars/controls/text_support","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6006,14 +6150,14 @@ define("ember-handlebars/controls/text_area",
       classNames: ['ember-text-area'],
 
       tagName: "textarea",
-      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap'],
+      attributeBindings: ['rows', 'cols', 'name', 'selectionEnd', 'selectionStart', 'wrap', 'lang', 'dir'],
       rows: null,
       cols: null,
 
       _updateElementValue: observer('value', function() {
         // We do this check so cursor position doesn't get affected in IE
-        var value = get(this, 'value'),
-            $el = this.$();
+        var value = get(this, 'value');
+        var $el = this.$();
         if ($el && value !== $el.val()) {
           $el.val(value);
         }
@@ -6025,7 +6169,7 @@ define("ember-handlebars/controls/text_area",
       }
     });
   });
-define("ember-handlebars/controls/text_field",
+enifed("ember-handlebars/controls/text_field",
   ["ember-metal/property_get","ember-metal/property_set","ember-views/views/component","ember-handlebars/controls/text_support","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6065,7 +6209,7 @@ define("ember-handlebars/controls/text_field",
       attributeBindings: ['type', 'value', 'size', 'pattern', 'name', 'min', 'max',
                           'accept', 'autocomplete', 'autosave', 'formaction',
                           'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
-                          'height', 'inputmode', 'list', 'multiple', 'step',
+                          'height', 'inputmode', 'list', 'multiple', 'step', 'lang', 'dir',
                           'width'],
 
       /**
@@ -6126,7 +6270,7 @@ define("ember-handlebars/controls/text_field",
       max: null
     });
   });
-define("ember-handlebars/controls/text_support",
+enifed("ember-handlebars/controls/text_support",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/target_action_support","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -6197,7 +6341,7 @@ define("ember-handlebars/controls/text_support",
       onEvent: 'enter',
 
       /**
-        Whether they `keyUp` event that triggers an `action` to be sent continues
+        Whether the `keyUp` event that triggers an `action` to be sent continues
         propagating to other views.
 
         By default, when the user presses the return key on their keyboard and
@@ -6265,7 +6409,7 @@ define("ember-handlebars/controls/text_support",
       },
 
       /**
-        Called when the text area is blurred. 
+        Called when the text area is blurred.
 
         Uses sendAction to send the `focus-out` action.
 
@@ -6300,9 +6444,9 @@ define("ember-handlebars/controls/text_support",
     // sendAction semantics for TextField are different from
     // the component semantics so this method normalizes them.
     function sendAction(eventName, view, event) {
-      var action = get(view, eventName),
-          on = get(view, 'onEvent'),
-          value = get(view, 'value');
+      var action = get(view, eventName);
+      var on = get(view, 'onEvent');
+      var value = get(view, 'value');
 
       // back-compat support for keyPress as an event name even though
       // it's also a method name that consumes the event (and therefore
@@ -6322,9 +6466,9 @@ define("ember-handlebars/controls/text_support",
 
     __exports__["default"] = TextSupport;
   });
-define("ember-handlebars/ext",
-  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/binding","ember-metal/error","ember-metal/mixin","ember-metal/is_empty","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
+enifed("ember-handlebars/ext",
+  ["ember-metal/core","ember-runtime/system/string","ember-handlebars-compiler","ember-metal/property_get","ember-metal/error","ember-metal/mixin","ember-views/views/view","ember-handlebars/views/metamorph_view","ember-metal/path_cache","ember-metal/is_empty","ember-metal/cache","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.assert, Ember.Handlebars, Ember.lookup
@@ -6336,17 +6480,20 @@ define("ember-handlebars/ext",
     var helpers = EmberHandlebars.helpers;
 
     var get = __dependency4__.get;
-    var isGlobalPath = __dependency5__.isGlobalPath;
-    var EmberError = __dependency6__["default"];
-    var IS_BINDING = __dependency7__.IS_BINDING;
+    var EmberError = __dependency5__["default"];
+    var IS_BINDING = __dependency6__.IS_BINDING;
+
+    var View = __dependency7__["default"];
+    var _Metamorph = __dependency8__._Metamorph;
+    var detectIsGlobal = __dependency9__.isGlobal;
 
     // late bound via requireModule because of circular dependencies.
-    var resolveHelper,
-        SimpleHandlebarsView;
+    var resolveHelper, SimpleHandlebarsView;
 
-    var isEmpty = __dependency8__["default"];
+    var isEmpty = __dependency10__["default"];
 
-    var slice = [].slice, originalTemplate = EmberHandlebars.template;
+    var slice = [].slice;
+    var originalTemplate = EmberHandlebars.template;
 
     /**
       If a path starts with a reserved keyword, returns the root
@@ -6359,13 +6506,20 @@ define("ember-handlebars/ext",
       @param path {String}
       @param data {Hash}
     */
+
+    var Cache = __dependency11__["default"];
+
+    var FIRST_SEGMENT_CACHE = new Cache(1000, function(path){
+      return path.split('.', 1)[0];
+    });
+
     function normalizePath(root, path, data) {
-      var keywords = (data && data.keywords) || {},
-          keyword, isKeyword;
+      var keywords = (data && data.keywords) || {};
+      var keyword, isKeyword;
 
       // Get the first segment of the path. For example, if the
       // path is "foo.bar.baz", returns "foo".
-      keyword = path.split('.', 1)[0];
+      keyword = FIRST_SEGMENT_CACHE.get(path);
 
       // Test to see if the first path is a keyword that has been
       // passed along in the view's data hash. If so, we will treat
@@ -6386,7 +6540,11 @@ define("ember-handlebars/ext",
         }
       }
 
-      return { root: root, path: path, isKeyword: isKeyword };
+      return {
+        root: root,
+        path: path,
+        isKeyword: isKeyword
+      };
     }
 
 
@@ -6402,24 +6560,127 @@ define("ember-handlebars/ext",
       @param {Object} options The template's option hash
     */
     function handlebarsGet(root, path, options) {
-      var data = options && options.data,
-          normalizedPath = normalizePath(root, path, data),
-          value;
+      var data = options && options.data;
+      var normalizedPath = normalizePath(root, path, data);
+      var value;
 
-      
-        root = normalizedPath.root;
-        path = normalizedPath.path;
+      // In cases where the path begins with a keyword, change the
+      // root to the value represented by that keyword, and ensure
+      // the path is relative to it.
+      root = normalizedPath.root;
+      path = normalizedPath.path;
 
+      // Ember.get with a null root and GlobalPath will fall back to
+      // Ember.lookup, which is no longer allowed in templates.
+      //
+      // But when outputting a primitive, root will be the primitive
+      // and path a blank string. These primitives should pass through
+      // to `get`.
+      if (root || path === '') {
         value = get(root, path);
+      }
 
-        if (value === undefined && root !== Ember.lookup && isGlobalPath(path)) {
-          value = get(Ember.lookup, path);
+      if (detectIsGlobal(path)) {
+        if (value === undefined && root !== Ember.lookup) {
+          root = Ember.lookup;
+          value = get(root, path);
         }
-      
+        if (root === Ember.lookup || root === null) {
+                  }
+      }
 
       return value;
     }
 
+    function lookupViewInContainer(container, path) {
+            return container.lookupFactory('view:'+path);
+    }
+
+    function lookupViewByClassName(path) {
+      var viewClass;
+      if (detectIsGlobal(path)) {
+        viewClass = get(path);
+                return viewClass;
+      }
+    }
+
+    /**
+      handlebarsGetView resolves a view based on strings passed into a template.
+      For example:
+
+      ```handlebars
+      {{view "some-view"}}
+      {{view view.someView}}
+      {{view App.SomeView}} {{! deprecated }}
+      ```
+
+      A value is first checked to be a string- non-strings are presumed to be
+      an object and returned. This handles the "access a view on a context"
+      case (line 2 in the above examples).
+
+      Next a string is normalized, then called on the context with `get`. If
+      there is still no value, a GlobalPath will be fetched from the global
+      context (raising a deprecation) and a localPath will be passed to the
+      container to be looked up.
+
+      @private
+      @for Ember.Handlebars
+      @param {Object} context The context of the template being rendered
+      @param {String} path The path to be lookedup
+      @param {Object} container The container
+      @param {Object} options The options from the template
+    */
+    function handlebarsGetView(context, path, container, options) {
+      var viewClass;
+      var data;
+      var pathType;
+      if (options) {
+        data      = options.data;
+        pathType  = options.types && options.types[0];
+      }
+
+      if ('string' === typeof path) {
+        if('STRING' === pathType && container) {
+          viewClass = lookupViewInContainer(container, path);
+          
+        }
+
+        if(!viewClass) {
+          viewClass = lookupViewByClassName(path);
+        }
+
+        if(!viewClass) {
+          if (data) {
+            var normalizedPath = normalizePath(context, path, data);
+            context = normalizedPath.root;
+            path = normalizedPath.path;
+          }
+
+          // Only lookup view class on context if there is a context. If not,
+          // the global lookup path on get may kick in.
+          viewClass = context && get(context, path);
+
+          if(!viewClass) {
+            // try the container once more with the normalized path
+            viewClass = lookupViewInContainer(container, path);
+          }
+        }
+      } else {
+        viewClass = path;
+      }
+
+      // Sometimes a view's value is yet another path
+      if ('string' === typeof viewClass && data && data.view) {
+        viewClass = handlebarsGetView(data.view, viewClass, container, {
+          data: data,
+          types: ['ID']
+        });
+      }
+
+      
+      return viewClass;
+    }
+
     /**
       This method uses `Ember.Handlebars.get` to lookup a value, then ensures
       that the value is escaped properly.
@@ -6656,8 +6917,8 @@ define("ember-handlebars/ext",
       @param {String} dependentKeys*
     */
     function registerBoundHelper(name, fn) {
-      var boundHelperArgs = slice.call(arguments, 1),
-          boundFn = makeBoundHelper.apply(this, boundHelperArgs);
+      var boundHelperArgs = slice.call(arguments, 1);
+      var boundFn = makeBoundHelper.apply(this, boundHelperArgs);
       EmberHandlebars.registerHelper(name, boundFn);
     }
 
@@ -6692,21 +6953,21 @@ define("ember-handlebars/ext",
       var dependentKeys = slice.call(arguments, 1);
 
       function helper() {
-        var properties = slice.call(arguments, 0, -1),
-          numProperties = properties.length,
-          options = arguments[arguments.length - 1],
-          normalizedProperties = [],
-          data = options.data,
-          types = data.isUnbound ? slice.call(options.types, 1) : options.types,
-          hash = options.hash,
-          view = data.view,
-          contexts = options.contexts,
-          currentContext = (contexts && contexts.length) ? contexts[0] : this,
-          prefixPathForDependentKeys = '',
-          loc, len, hashOption,
-          boundOption, property,
-          normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
+        var properties = slice.call(arguments, 0, -1);
+        var numProperties = properties.length;
+        var options = arguments[arguments.length - 1];
+        var normalizedProperties = [];
+        var data = options.data;
+        var types = data.isUnbound ? slice.call(options.types, 1) : options.types;
+        var hash = options.hash;
         var hashTypes = options.hashTypes;
+        var view = data.view;
+        var contexts = options.contexts;
+        var currentContext = (contexts && contexts.length) ? contexts[0] : this;
+        var prefixPathForDependentKeys = '';
+        var loc, len, hashOption;
+        var boundOption, property;
+        var normalizedValue = SimpleHandlebarsView.prototype.normalizedValue;
 
         
         // Detect bound options (e.g. countBinding="otherCount")
@@ -6730,7 +6991,7 @@ define("ember-handlebars/ext",
             normalizedProperties.push(normalizedProp);
             watchedProperties.push(normalizedProp);
           } else {
-            if(data.isUnbound) {
+            if (data.isUnbound) {
               normalizedProperties.push({path: properties[loc]});
             }else {
               normalizedProperties.push(null);
@@ -6748,7 +7009,8 @@ define("ember-handlebars/ext",
 
         // Override SimpleHandlebarsView's method for generating the view's content.
         bindView.normalizedValue = function() {
-          var args = [], boundOption;
+          var args = [];
+          var boundOption;
 
           // Copy over bound hash options.
           for (boundOption in boundOptions) {
@@ -6795,9 +7057,9 @@ define("ember-handlebars/ext",
         }
 
         // Add dependent key observers to the first param
-        var normalized = normalizedProperties[0],
-            pathRoot = normalized.root,
-            path = normalized.path;
+        var normalized = normalizedProperties[0];
+        var pathRoot = normalized.root;
+        var path = normalized.path;
 
         if(!isEmpty(path)) {
           prefixPathForDependentKeys = path + '.';
@@ -6822,25 +7084,21 @@ define("ember-handlebars/ext",
       @param {String} options
     */
     function evaluateUnboundHelper(context, fn, normalizedProperties, options) {
-      var args = [],
-       hash = options.hash,
-       boundOptions = hash.boundOptions,
-       types = slice.call(options.types, 1),
-       loc,
-       len,
-       property,
-       propertyType,
-       boundOption;
+      var args = [];
+      var hash = options.hash;
+      var boundOptions = hash.boundOptions;
+      var types = slice.call(options.types, 1);
+      var loc, len, property, propertyType, boundOption;
 
       for (boundOption in boundOptions) {
         if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
         hash[boundOption] = handlebarsGet(context, boundOptions[boundOption], options);
       }
 
-      for(loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
+      for (loc = 0, len = normalizedProperties.length; loc < len; ++loc) {
         property = normalizedProperties[loc];
         propertyType = types[loc];
-        if(propertyType === "ID") {
+        if (propertyType === "ID") {
           args.push(handlebarsGet(property.root, property.path, options));
         } else {
           args.push(property.path);
@@ -6868,11 +7126,12 @@ define("ember-handlebars/ext",
     __exports__.template = template;__exports__.normalizePath = normalizePath;
     __exports__.makeBoundHelper = makeBoundHelper;
     __exports__.handlebarsGet = handlebarsGet;
+    __exports__.handlebarsGetView = handlebarsGetView;
     __exports__.evaluateUnboundHelper = evaluateUnboundHelper;
   });
-define("ember-handlebars/helpers/binding",
-  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/string","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-runtime/keys","ember-handlebars/views/handlebars_bound_view","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
+enifed("ember-handlebars/helpers/binding",
+  ["ember-metal/core","ember-handlebars-compiler","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/string","ember-metal/platform","ember-metal/is_none","ember-metal/enumerable_utils","ember-metal/array","ember-views/views/view","ember-metal/run_loop","ember-metal/observer","ember-metal/binding","ember-views/system/jquery","ember-handlebars/ext","ember-metal/keys","ember-metal/cache","ember-handlebars/views/handlebars_bound_view","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -6902,9 +7161,10 @@ define("ember-handlebars/helpers/binding",
     var isArray = __dependency5__.isArray;
     var handlebarsGetEscaped = __dependency16__.getEscaped;
     var keys = __dependency17__["default"];
+    var Cache = __dependency18__["default"];
 
-    var _HandlebarsBoundView = __dependency18__._HandlebarsBoundView;
-    var SimpleHandlebarsView = __dependency18__.SimpleHandlebarsView;
+    var _HandlebarsBoundView = __dependency19__._HandlebarsBoundView;
+    var SimpleHandlebarsView = __dependency19__.SimpleHandlebarsView;
 
     var normalizePath = __dependency16__.normalizePath;
     var handlebarsGet = __dependency16__.handlebarsGet;
@@ -6973,11 +7233,11 @@ define("ember-handlebars/helpers/binding",
     // Binds a property into the DOM. This will create a hook in DOM that the
     // KVO system will look for and update if the property changes.
     function bind(property, options, preserveContext, shouldDisplay, valueNormalizer, childProperties) {
-      var data = options.data,
-          fn = options.fn,
-          inverse = options.inverse,
-          view = data.view,
-          normalized, observer, i;
+      var data = options.data;
+      var fn = options.fn;
+      var inverse = options.inverse;
+      var view = data.view;
+      var normalized, observer, i;
 
       // we relied on the behavior of calling without
       // context to mean this === window, but when running
@@ -6986,84 +7246,78 @@ define("ember-handlebars/helpers/binding",
 
       normalized = normalizePath(currentContext, property, data);
 
-      // Set up observers for observable objects
-      if ('object' === typeof this) {
-        if (data.insideGroup) {
-          observer = function() {
-            while (view._contextView) {
-              view = view._contextView;
-            }
-            run.once(view, 'rerender');
-          };
-
-          var template, context, result = handlebarsGet(currentContext, property, options);
-
-          result = valueNormalizer ? valueNormalizer(result) : result;
-
-          context = preserveContext ? currentContext : result;
-          if (shouldDisplay(result)) {
-            template = fn;
-          } else if (inverse) {
-            template = inverse;
+      if (data.insideGroup) {
+        observer = function() {
+          while (view._contextView) {
+            view = view._contextView;
           }
+          run.once(view, 'rerender');
+        };
 
-          template(context, { data: options.data });
-        } else {
-          var viewClass = _HandlebarsBoundView;
-          var viewOptions = {
-            preserveContext: preserveContext,
-            shouldDisplayFunc: shouldDisplay,
-            valueNormalizerFunc: valueNormalizer,
-            displayTemplate: fn,
-            inverseTemplate: inverse,
-            path: property,
-            pathRoot: currentContext,
-            previousContext: currentContext,
-            isEscaped: !options.hash.unescaped,
-            templateData: options.data,
-            templateHash: options.hash,
-            helperName: options.helperName
-          };
+        var template, context;
+        var result = handlebarsGet(currentContext, property, options);
 
-          if (options.isWithHelper) {
-            viewClass = WithView;
-          }
+        result = valueNormalizer ? valueNormalizer(result) : result;
 
-          // Create the view that will wrap the output of this template/property
-          // and add it to the nearest view's childViews array.
-          // See the documentation of Ember._HandlebarsBoundView for more.
-          var bindView = view.createChildView(viewClass, viewOptions);
-
-          view.appendChild(bindView);
-
-          observer = function() {
-            run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
-          };
+        context = preserveContext ? currentContext : result;
+        if (shouldDisplay(result)) {
+          template = fn;
+        } else if (inverse) {
+          template = inverse;
         }
 
-        // Observes the given property on the context and
-        // tells the Ember._HandlebarsBoundView to re-render. If property
-        // is an empty string, we are printing the current context
-        // object ({{this}}) so updating it is not our responsibility.
-        if (normalized.path !== '') {
-          view.registerObserver(normalized.root, normalized.path, observer);
-          if (childProperties) {
-            for (i=0; i<childProperties.length; i++) {
-              view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
-            }
-          }
-        }
+        template(context, { data: options.data });
       } else {
-        // The object is not observable, so just render it out and
-        // be done with it.
-        data.buffer.push(handlebarsGetEscaped(currentContext, property, options));
+        var viewClass = _HandlebarsBoundView;
+        var viewOptions = {
+          preserveContext: preserveContext,
+          shouldDisplayFunc: shouldDisplay,
+          valueNormalizerFunc: valueNormalizer,
+          displayTemplate: fn,
+          inverseTemplate: inverse,
+          path: property,
+          pathRoot: currentContext,
+          previousContext: currentContext,
+          isEscaped: !options.hash.unescaped,
+          templateData: options.data,
+          templateHash: options.hash,
+          helperName: options.helperName
+        };
+
+        if (options.isWithHelper) {
+          viewClass = WithView;
+        }
+
+        // Create the view that will wrap the output of this template/property
+        // and add it to the nearest view's childViews array.
+        // See the documentation of Ember._HandlebarsBoundView for more.
+        var bindView = view.createChildView(viewClass, viewOptions);
+
+        view.appendChild(bindView);
+
+        observer = function() {
+          run.scheduleOnce('render', bindView, 'rerenderIfNeeded');
+        };
+      }
+
+      // Observes the given property on the context and
+      // tells the Ember._HandlebarsBoundView to re-render. If property
+      // is an empty string, we are printing the current context
+      // object ({{this}}) so updating it is not our responsibility.
+      if (typeof this === 'object' && normalized.path !== '') {
+        view.registerObserver(normalized.root, normalized.path, observer);
+        if (childProperties) {
+          for (i=0; i<childProperties.length; i++) {
+            view.registerObserver(normalized.root, normalized.path+'.'+childProperties[i], observer);
+          }
+        }
       }
     }
 
     function simpleBind(currentContext, property, options) {
-      var data = options.data,
-          view = data.view,
-          normalized, observer, pathRoot, output;
+      var data = options.data;
+      var view = data.view;
+      var normalized, observer, pathRoot, output;
 
       normalized = normalizePath(currentContext, property, data);
       pathRoot = normalized.root;
@@ -7145,6 +7399,10 @@ define("ember-handlebars/helpers/binding",
       return helpers.bind.call(this, property, options);
     }
 
+    var ISNT_HELPER_CACHE = new Cache(1000, function(key) {
+      return key.indexOf('-') === -1;
+    });
+    __exports__.ISNT_HELPER_CACHE = ISNT_HELPER_CACHE;
     /**
       Used to lookup/resolve handlebars helpers. The lookup order is:
 
@@ -7165,7 +7423,7 @@ define("ember-handlebars/helpers/binding",
         return helpers[name];
       }
 
-      if (!container || name.indexOf('-') === -1) {
+      if (!container || ISNT_HELPER_CACHE.get(name)) {
         return;
       }
 
@@ -7244,7 +7502,6 @@ define("ember-handlebars/helpers/binding",
       return bind.call(context, property, fn, true, shouldDisplayIfHelperContent, shouldDisplayIfHelperContent, ['isTruthy', 'length']);
     }
 
-
     /**
       @private
 
@@ -7264,11 +7521,11 @@ define("ember-handlebars/helpers/binding",
       @since 1.4.0
     */
     function unboundIfHelper(property, fn) {
-      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this,
-          data = fn.data,
-          template = fn.fn,
-          inverse = fn.inverse,
-          normalized, propertyValue, result;
+      var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this;
+      var data = fn.data;
+      var template = fn.fn;
+      var inverse = fn.inverse;
+      var normalized, propertyValue, result;
 
       normalized = normalizePath(context, property, data);
       propertyValue = handlebarsGet(context, property, fn);
@@ -7359,7 +7616,8 @@ define("ember-handlebars/helpers/binding",
       @return {String} HTML string
     */
     function withHelper(context, options) {
-      var bindContext, preserveContext, controller, helperName = 'with';
+      var bindContext, preserveContext, controller;
+      var helperName = 'with';
 
       if (arguments.length === 4) {
         var keywordName, path, rootPath, normalized, contextPath;
@@ -7441,7 +7699,9 @@ define("ember-handlebars/helpers/binding",
     */
     function unlessHelper(context, options) {
             
-      var fn = options.fn, inverse = options.inverse, helperName = 'unless';
+      var fn = options.fn;
+      var inverse = options.inverse;
+      var helperName = 'unless';
 
       if (context) {
         helperName += ' ' + context;
@@ -7613,14 +7873,14 @@ define("ember-handlebars/helpers/binding",
       // For each attribute passed, create an observer and emit the
       // current value of the property as an attribute.
       forEach.call(attrKeys, function(attr) {
-        var path = attrs[attr],
-            normalized;
+        var path = attrs[attr];
+        var normalized;
 
         
         normalized = normalizePath(ctx, path, options.data);
 
-        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options),
-            type = typeOf(value);
+        var value = (path === 'this') ? normalized.root : handlebarsGet(ctx, path, options);
+        var type = typeOf(value);
 
         
         var observer;
@@ -7705,14 +7965,15 @@ define("ember-handlebars/helpers/binding",
       @return {Array} An array of class names to add
     */
     function bindClasses(context, classBindings, view, bindAttrId, options) {
-      var ret = [], newClass, value, elem;
+      var ret = [];
+      var newClass, value, elem;
 
       // Helper method to retrieve the property from the context and
       // determine which class string to return, based on whether it is
       // a Boolean or not.
       var classStringForPath = function(root, parsedPath, options) {
-        var val,
-            path = parsedPath.path;
+        var val;
+        var path = parsedPath.path;
 
         if (path === 'this') {
           val = root;
@@ -7733,13 +7994,11 @@ define("ember-handlebars/helpers/binding",
         // closes over this variable, so it knows which string to remove when
         // the property changes.
         var oldClass;
-
         var observer;
-
-        var parsedPath = View._parsePropertyPath(binding),
-            path = parsedPath.path,
-            pathRoot = context,
-            normalized;
+        var parsedPath = View._parsePropertyPath(binding);
+        var path = parsedPath.path;
+        var pathRoot = context;
+        var normalized;
 
         if (path !== '' && path !== 'this') {
           normalized = normalizePath(context, path, options.data);
@@ -7809,7 +8068,7 @@ define("ember-handlebars/helpers/binding",
     __exports__.bindAttrHelperDeprecated = bindAttrHelperDeprecated;
     __exports__.bindClasses = bindClasses;
   });
-define("ember-handlebars/helpers/collection",
+enifed("ember-handlebars/helpers/collection",
   ["ember-metal/core","ember-metal/utils","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-handlebars/ext","ember-handlebars/helpers/view","ember-metal/computed","ember-views/views/collection_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -7831,6 +8090,7 @@ define("ember-handlebars/helpers/collection",
     var fmt = __dependency4__.fmt;
     var get = __dependency5__.get;
     var handlebarsGet = __dependency6__.handlebarsGet;
+    var handlebarsGetView = __dependency6__.handlebarsGetView;
     var ViewHelper = __dependency7__.ViewHelper;
     var computed = __dependency8__.computed;
     var CollectionView = __dependency9__["default"];
@@ -7852,7 +8112,8 @@ define("ember-handlebars/helpers/collection",
       Given an empty `<body>` the following template:
 
       ```handlebars
-      {{#collection contentBinding="App.items"}}
+      {{! application.hbs }}
+      {{#collection content=model}}
         Hi {{view.content.name}}
       {{/collection}}
       ```
@@ -7860,44 +8121,45 @@ define("ember-handlebars/helpers/collection",
       And the following application code
 
       ```javascript
-      App = Ember.Application.create()
-      App.items = [
-        Ember.Object.create({name: 'Dave'}),
-        Ember.Object.create({name: 'Mary'}),
-        Ember.Object.create({name: 'Sara'})
-      ]
+      App = Ember.Application.create();
+      App.ApplicationRoute = Ember.Route.extend({
+        model: function(){
+          return [{name: 'Yehuda'},{name: 'Tom'},{name: 'Peter'}];
+        }
+      });
       ```
 
-      Will result in the HTML structure below
+      The following HTML will result:
 
       ```html
       <div class="ember-view">
-        <div class="ember-view">Hi Dave</div>
-        <div class="ember-view">Hi Mary</div>
-        <div class="ember-view">Hi Sara</div>
+        <div class="ember-view">Hi Yehuda</div>
+        <div class="ember-view">Hi Tom</div>
+        <div class="ember-view">Hi Peter</div>
       </div>
       ```
 
-      ### Blockless use in a collection
+      ### Non-block version of collection
 
-      If you provide an `itemViewClass` option that has its own `template` you can
+      If you provide an `itemViewClass` option that has its own `template` you may
       omit the block.
 
       The following template:
 
       ```handlebars
-      {{collection contentBinding="App.items" itemViewClass="App.AnItemView"}}
+      {{! application.hbs }}
+      {{collection content=model itemViewClass="an-item"}}
       ```
 
       And application code
 
       ```javascript
       App = Ember.Application.create();
-      App.items = [
-        Ember.Object.create({name: 'Dave'}),
-        Ember.Object.create({name: 'Mary'}),
-        Ember.Object.create({name: 'Sara'})
-      ];
+      App.ApplicationRoute = Ember.Route.extend({
+        model: function(){
+          return [{name: 'Yehuda'},{name: 'Tom'},{name: 'Peter'}];
+        }
+      });
 
       App.AnItemView = Ember.View.extend({
         template: Ember.Handlebars.compile("Greetings {{view.content.name}}")
@@ -7908,9 +8170,9 @@ define("ember-handlebars/helpers/collection",
 
       ```html
       <div class="ember-view">
-        <div class="ember-view">Greetings Dave</div>
-        <div class="ember-view">Greetings Mary</div>
-        <div class="ember-view">Greetings Sara</div>
+        <div class="ember-view">Greetings Yehuda</div>
+        <div class="ember-view">Greetings Tom</div>
+        <div class="ember-view">Greetings Peter</div>
       </div>
       ```
 
@@ -7921,11 +8183,13 @@ define("ember-handlebars/helpers/collection",
       the helper by passing it as the first argument:
 
       ```handlebars
-      {{#collection App.MyCustomCollectionClass contentBinding="App.items"}}
+      {{#collection "my-custom-collection" content=model}}
         Hi {{view.content.name}}
       {{/collection}}
       ```
 
+      This example would look for the class `App.MyCustomCollection`.
+
       ### Forwarded `item.*`-named Options
 
       As with the `{{view}}`, helper options passed to the `{{collection}}` will be
@@ -7934,7 +8198,7 @@ define("ember-handlebars/helpers/collection",
       item (note the camelcasing):
 
       ```handlebars
-      {{#collection contentBinding="App.items"
+      {{#collection content=model
                     itemTagName="p"
                     itemClassNames="greeting"}}
         Howdy {{view.content.name}}
@@ -7945,9 +8209,9 @@ define("ember-handlebars/helpers/collection",
 
       ```html
       <div class="ember-view">
-        <p class="ember-view greeting">Howdy Dave</p>
-        <p class="ember-view greeting">Howdy Mary</p>
-        <p class="ember-view greeting">Howdy Sara</p>
+        <p class="ember-view greeting">Howdy Yehuda</p>
+        <p class="ember-view greeting">Howdy Tom</p>
+        <p class="ember-view greeting">Howdy Peter</p>
       </div>
       ```
 
@@ -7967,38 +8231,38 @@ define("ember-handlebars/helpers/collection",
               } else {
               }
 
-      var fn = options.fn;
-      var data = options.data;
-      var inverse = options.inverse;
-      var view = options.data.view;
+      var fn        = options.fn,
+          data      = options.data,
+          inverse   = options.inverse,
+          view      = options.data.view,
+          // This should be deterministic, and should probably come from a
+          // parent view and not the controller.
+          container = (view.controller && view.controller.container ? view.controller.container : view.container);
 
-
-      var controller, container;
       // If passed a path string, convert that into an object.
       // Otherwise, just default to the standard class.
       var collectionClass;
       if (path) {
-        controller = data.keywords.controller;
-        container = controller && controller.container;
-        collectionClass = handlebarsGet(this, path, options) || container.lookupFactory('view:' + path);
+        collectionClass = handlebarsGetView(this, path, container, options);
               }
       else {
         collectionClass = CollectionView;
       }
 
-      var hash = options.hash, itemHash = {}, match;
+      var hash = options.hash;
+      var itemHash = {};
+      var match;
 
       // Extract item view class if provided else default to the standard class
-      var collectionPrototype = collectionClass.proto(), itemViewClass;
+      var collectionPrototype = collectionClass.proto();
+      var itemViewClass;
 
       if (hash.itemView) {
-        controller = data.keywords.controller;
-                container = controller.container;
-        itemViewClass = container.lookupFactory('view:' + hash.itemView);
-              } else if (hash.itemViewClass) {
-        itemViewClass = handlebarsGet(collectionPrototype, hash.itemViewClass, options);
+        itemViewClass = handlebarsGetView(this, hash.itemView, container, options);
+      } else if (hash.itemViewClass) {
+        itemViewClass = handlebarsGetView(collectionPrototype, hash.itemViewClass, container, options);
       } else {
-        itemViewClass = collectionPrototype.itemViewClass;
+        itemViewClass = handlebarsGetView(collectionPrototype, collectionPrototype.itemViewClass, container, options);
       }
 
       
@@ -8034,7 +8298,7 @@ define("ember-handlebars/helpers/collection",
               tagName: itemHash.tagName
         });
       } else if (hash.emptyViewClass) {
-        emptyViewClass = handlebarsGet(this, hash.emptyViewClass, options);
+        emptyViewClass = handlebarsGetView(this, hash.emptyViewClass, container, options);
       }
       if (emptyViewClass) { hash.emptyView = emptyViewClass; }
 
@@ -8054,7 +8318,7 @@ define("ember-handlebars/helpers/collection",
 
     __exports__["default"] = collectionHelper;
   });
-define("ember-handlebars/helpers/debug",
+enifed("ember-handlebars/helpers/debug",
   ["ember-metal/core","ember-metal/utils","ember-metal/logger","ember-metal/property_get","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -8088,18 +8352,18 @@ define("ember-handlebars/helpers/debug",
       @param {String} property
     */
     function logHelper() {
-      var params = a_slice.call(arguments, 0, -1),
-          options = arguments[arguments.length - 1],
-          logger = Logger.log,
-          values = [],
-          allowPrimitives = true;
+      var params = a_slice.call(arguments, 0, -1);
+      var options = arguments[arguments.length - 1];
+      var logger = Logger.log;
+      var values = [];
+      var allowPrimitives = true;
 
       for (var i = 0; i < params.length; i++) {
         var type = options.types[i];
 
         if (type === 'ID' || !allowPrimitives) {
-          var context = (options.contexts && options.contexts[i]) || this,
-              normalized = normalizePath(context, params[i], options.data);
+          var context = (options.contexts && options.contexts[i]) || this;
+          var normalized = normalizePath(context, params[i], options.data);
 
           if (normalized.path === 'this') {
             values.push(normalized.root);
@@ -8160,7 +8424,7 @@ define("ember-handlebars/helpers/debug",
     __exports__.logHelper = logHelper;
     __exports__.debuggerHelper = debuggerHelper;
   });
-define("ember-handlebars/helpers/each",
+enifed("ember-handlebars/helpers/each",
   ["ember-metal/core","ember-handlebars-compiler","ember-runtime/system/string","ember-metal/property_get","ember-metal/property_set","ember-views/views/collection_view","ember-metal/binding","ember-runtime/mixins/controller","ember-runtime/controllers/array_controller","ember-runtime/mixins/array","ember-runtime/copy","ember-metal/run_loop","ember-metal/events","ember-handlebars/ext","ember-metal/computed","ember-metal/observer","ember-handlebars/views/metamorph_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
     "use strict";
@@ -8171,7 +8435,6 @@ define("ember-handlebars/helpers/each",
     */
     var Ember = __dependency1__["default"];
     // Ember.assert;, Ember.K
-    // var emberAssert = Ember.assert,
     var K = Ember.K;
 
     var EmberHandlebars = __dependency2__["default"];
@@ -8290,20 +8553,9 @@ define("ember-handlebars/helpers/each",
       }
     });
 
-    // Defeatureify doesn't seem to like nested functions that need to be removed
-    function _addMetamorphCheck() {
-      EachView.reopen({
-        _checkMetamorph: on('didInsertElement', function() {
-                  })
-      });
-    }
-
-    // until ember-debug is es6ed
-    var runInDebug = function(f){ f(); };
-    
     var GroupedEach = EmberHandlebars.GroupedEach = function(context, path, options) {
-      var self = this,
-          normalized = EmberHandlebars.normalizePath(context, path, options.data);
+      var self = this;
+      var normalized = EmberHandlebars.normalizePath(context, path, options.data);
 
       this.context = context;
       this.path = path;
@@ -8374,11 +8626,11 @@ define("ember-handlebars/helpers/each",
       render: function() {
         if (!this.content) { return; }
 
-        var content = this.content,
-            contentLength = get(content, 'length'),
-            options = this.options,
-            data = options.data,
-            template = this.template;
+        var content = this.content;
+        var contentLength = get(content, 'length');
+        var options = this.options;
+        var data = options.data;
+        var template = this.template;
 
         data.insideEach = true;
         for (var i = 0; i < contentLength; i++) {
@@ -8408,131 +8660,161 @@ define("ember-handlebars/helpers/each",
     };
 
     /**
-      The `{{#each}}` helper loops over elements in a collection, rendering its
-      block once for each item. It is an extension of the base Handlebars `{{#each}}`
-      helper:
+      The `{{#each}}` helper loops over elements in a collection. It is an extension
+      of the base Handlebars `{{#each}}` helper.
+
+      The default behavior of `{{#each}}` is to yield its inner block once for every
+      item in an array. Each yield will provide the item as the context of the block.
 
       ```javascript
-      Developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
+      var developers = [{name: 'Yehuda'},{name: 'Tom'}, {name: 'Paul'}];
       ```
 
       ```handlebars
-      {{#each Developers}}
+      {{#each developers}}
         {{name}}
+        {{! `this` is each developer }}
       {{/each}}
       ```
 
-      `{{each}}` supports an alternative syntax with element naming:
+      `{{#each}}` supports an alternative syntax with element naming. This preserves
+      context of the yielded block:
 
       ```handlebars
-      {{#each person in Developers}}
+      {{#each person in developers}}
         {{person.name}}
+        {{! `this` is whatever it was outside the #each }}
       {{/each}}
       ```
 
-      When looping over objects that do not have properties, `{{this}}` can be used
-      to render the object:
+      The same rules apply to arrays of primitives, but the items may need to be
+      references with `{{this}}`.
 
       ```javascript
-      DeveloperNames = ['Yehuda', 'Tom', 'Paul']
+      var developerNames = ['Yehuda', 'Tom', 'Paul']
       ```
 
       ```handlebars
-      {{#each DeveloperNames}}
+      {{#each developerNames}}
         {{this}}
       {{/each}}
       ```
+
       ### {{else}} condition
+
       `{{#each}}` can have a matching `{{else}}`. The contents of this block will render
       if the collection is empty.
 
       ```
-      {{#each person in Developers}}
+      {{#each person in developers}}
         {{person.name}}
       {{else}}
         <p>Sorry, nobody is available for this task.</p>
       {{/each}}
       ```
-      ### Specifying a View class for items
-      If you provide an `itemViewClass` option that references a view class
-      with its own `template` you can omit the block.
+
+      ### Specifying an alternative view for each item
+
+      `itemViewClass` can control which view will be used during the render of each
+      item's template.
 
       The following template:
 
       ```handlebars
-      {{#view App.MyView }}
-        {{each view.items itemViewClass="App.AnItemView"}}
-      {{/view}}
+      <ul>
+      {{#each developers itemViewClass="person"}}
+        {{name}}
+      {{/each}}
+      </ul>
       ```
 
-      And application code
+      Will use the following view for each item
 
       ```javascript
-      App = Ember.Application.create({
-        MyView: Ember.View.extend({
-          items: [
-            Ember.Object.create({name: 'Dave'}),
-            Ember.Object.create({name: 'Mary'}),
-            Ember.Object.create({name: 'Sara'})
-          ]
-        })
-      });
-
-      App.AnItemView = Ember.View.extend({
-        template: Ember.Handlebars.compile("Greetings {{name}}")
+      App.PersonView = Ember.View.extend({
+        tagName: 'li'
       });
       ```
 
-      Will result in the HTML structure below
+      Resulting in HTML output that looks like the following:
 
       ```html
-      <div class="ember-view">
-        <div class="ember-view">Greetings Dave</div>
-        <div class="ember-view">Greetings Mary</div>
-        <div class="ember-view">Greetings Sara</div>
-      </div>
+      <ul>
+        <li class="ember-view">Yehuda</li>
+        <li class="ember-view">Tom</li>
+        <li class="ember-view">Paul</li>
+      </ul>
       ```
 
-      If an `itemViewClass` is defined on the helper, and therefore the helper is not
-      being used as a block, an `emptyViewClass` can also be provided optionally.
-      The `emptyViewClass` will match the behavior of the `{{else}}` condition
-      described above. That is, the `emptyViewClass` will render if the collection
-      is empty.
-
-      ### Representing each item with a Controller.
-      By default the controller lookup within an `{{#each}}` block will be
-      the controller of the template where the `{{#each}}` was used. If each
-      item needs to be presented by a custom controller you can provide a
-      `itemController` option which references a controller by lookup name.
-      Each item in the loop will be wrapped in an instance of this controller
-      and the item itself will be set to the `model` property of that controller.
-
-      This is useful in cases where properties of model objects need transformation
-      or synthesis for display:
+      `itemViewClass` also enables a non-block form of `{{each}}`. The view
+      must {{#crossLink "Ember.View/toc_templates"}}provide its own template{{/crossLink}},
+      and then the block should be dropped. An example that outputs the same HTML
+      as the previous one:
 
       ```javascript
-      App.DeveloperController = Ember.ObjectController.extend({
+      App.PersonView = Ember.View.extend({
+        tagName: 'li',
+        template: '{{name}}'
+      });
+      ```
+
+      ```handlebars
+      <ul>
+        {{each developers itemViewClass="person"}}
+      </ul>
+      ```
+
+      ### Specifying an alternative view for no items (else)
+
+      The `emptyViewClass` option provides the same flexibility to the `{{else}}`
+      case of the each helper.
+
+      ```javascript
+      App.NoPeopleView = Ember.View.extend({
+        tagName: 'li',
+        template: 'No person is available, sorry'
+      });
+      ```
+
+      ```handlebars
+      <ul>
+      {{#each developers emptyViewClass="no-people"}}
+        <li>{{name}}</li>
+      {{/each}}
+      </ul>
+      ```
+
+      ### Wrapping each item in a controller
+
+      Controllers in Ember manage state and decorate data. In many cases,
+      providing a controller for each item in a list can be useful.
+      Specifically, an {{#crossLink "Ember.ObjectController"}}Ember.ObjectController{{/crossLink}}
+      should probably be used. Item controllers are passed the item they
+      will present as a `model` property, and an object controller will
+      proxy property lookups to `model` for us.
+
+      This allows state and decoration to be added to the controller
+      while any other property lookups are delegated to the model. An example:
+
+      ```javascript
+      App.RecruitController = Ember.ObjectController.extend({
         isAvailableForHire: function() {
-          return !this.get('model.isEmployed') && this.get('model.isSeekingWork');
+          return !this.get('isEmployed') && this.get('isSeekingWork');
         }.property('isEmployed', 'isSeekingWork')
       })
       ```
 
       ```handlebars
-      {{#each person in developers itemController="developer"}}
+      {{#each person in developers itemController="recruit"}}
         {{person.name}} {{#if person.isAvailableForHire}}Hire me!{{/if}}
       {{/each}}
       ```
 
-      Each itemController will receive a reference to the current controller as
-      a `parentController` property.
-
       ### (Experimental) Grouped Each
 
-      When used in conjunction with the experimental [group helper](https://github.com/emberjs/group-helper),
-      you can inform Handlebars to re-render an entire group of items instead of
-      re-rendering them one at a time (in the event that they are changed en masse
-      or an item is added/removed).
+      If a list's membership often changes, but properties of items in that
+      group rarely change, a significant improvement in template rendering
+      time can be achieved by using the experimental [group helper](https://github.com/emberjs/group-helper).
 
       ```handlebars
       {{#group}}
@@ -8542,33 +8824,32 @@ define("ember-handlebars/helpers/each",
       {{/group}}
       ```
 
-      This can be faster than the normal way that Handlebars re-renders items
-      in some cases.
+      When the membership of `people` changes, or when any property changes, the entire
+      `{{#group}}` block will be re-rendered.
 
-      If for some reason you have a group with more than one `#each`, you can make
-      one of the collections be updated in normal (non-grouped) fashion by setting
-      the option `groupedRows=true` (counter-intuitive, I know).
-
-      For example,
+      An `{{#each}}` inside the `{{#group}}` helper can opt-out of the special group
+      behavior by passing the `groupedRows` option. For example:
 
       ```handlebars
-      {{dealershipName}}
-
       {{#group}}
         {{#each dealers}}
+          {{! uses group's special behavior }}
           {{firstName}} {{lastName}}
         {{/each}}
 
         {{#each car in cars groupedRows=true}}
+          {{! does not use group's special behavior }}
           {{car.make}} {{car.model}} {{car.color}}
         {{/each}}
       {{/group}}
       ```
-      Any change to `dealershipName` or the `dealers` collection will cause the
-      entire group to be re-rendered. However, changes to the `cars` collection
-      will be re-rendered individually (as normal).
 
-      Note that `group` behavior is also disabled by specifying an `itemViewClass`.
+      Any change to the `dealers` collection will cause the entire group to be re-rendered.
+      Changes to the `cars` collection will be re-rendered individually, as they are with
+      normal `{{#each}}` usage.
+
+      `{{#group}}` is implemented with an `itemViewClass`, so specifying an `itemViewClass`
+      on an `{{#each}}` will also disable the special re-rendering behavior.
 
       @method each
       @for Ember.Handlebars.helpers
@@ -8576,11 +8857,13 @@ define("ember-handlebars/helpers/each",
       @param [path] {String} path
       @param [options] {Object} Handlebars key/value pairs of options
       @param [options.itemViewClass] {String} a path to a view class used for each item
+      @param [options.emptyViewClass] {String} a path to a view class used for each item
       @param [options.itemController] {String} name of a controller to be created for each item
       @param [options.groupedRows] {boolean} enable normal item-by-item rendering when inside a `#group` helper
     */
     function eachHelper(path, options) {
-      var ctx, helperName = 'each';
+      var ctx;
+      var helperName = 'each';
 
       if (arguments.length === 4) {
         
@@ -8615,8 +8898,7 @@ define("ember-handlebars/helpers/each",
       if (options.data.insideGroup && !options.hash.groupedRows && !options.hash.itemViewClass) {
         new GroupedEach(ctx, path, options).render();
       } else {
-        // ES6TODO: figure out how to do this without global lookup.
-        return helpers.collection.call(ctx, 'Ember.Handlebars.EachView', options);
+        return helpers.collection.call(ctx, EmberHandlebars.EachView, options);
       }
     }
 
@@ -8624,7 +8906,7 @@ define("ember-handlebars/helpers/each",
     __exports__.GroupedEach = GroupedEach;
     __exports__.eachHelper = eachHelper;
   });
-define("ember-handlebars/helpers/loc",
+enifed("ember-handlebars/helpers/loc",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -8635,26 +8917,31 @@ define("ember-handlebars/helpers/loc",
     @submodule ember-handlebars
     */
 
-    // ES6TODO:
-    // Pretty sure this can be expressed as
-    // var locHelper EmberStringUtils.loc ?
-
     /**
       Calls [Ember.String.loc](/api/classes/Ember.String.html#method_loc) with the
       provided string.
 
-      This is a convenient way to localize text. For example:
+      This is a convenient way to localize text within a template:
 
-      ```html
-      <script type="text/x-handlebars" data-template-name="home">
-        {{loc "welcome"}}
-      </script>
+      ```javascript
+      Ember.STRINGS = {
+        '_welcome_': 'Bonjour'
+      };
       ```
 
-      Take note that `"welcome"` is a string and not an object
-      reference.
+      ```handlebars
+      <div class='message'>
+        {{loc '_welcome_'}}
+      </div>
+      ```
 
-      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to 
+      ```html
+      <div class='message'>
+        Bonjour
+      </div>
+      ```
+
+      See [Ember.String.loc](/api/classes/Ember.String.html#method_loc) for how to
       set up localized string references.
 
       @method loc
@@ -8662,11 +8949,9 @@ define("ember-handlebars/helpers/loc",
       @param {String} str The string to format
       @see {Ember.String#loc}
     */
-    __exports__["default"] = function locHelper(str) {
-      return loc(str);
-    }
+    __exports__["default"] = loc;
   });
-define("ember-handlebars/helpers/partial",
+enifed("ember-handlebars/helpers/partial",
   ["ember-metal/core","ember-metal/is_none","ember-handlebars/ext","ember-handlebars/helpers/binding","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -8776,17 +9061,17 @@ define("ember-handlebars/helpers/partial",
       template(context, { data: options.data });
     }
   });
-define("ember-handlebars/helpers/shared",
+enifed("ember-handlebars/helpers/shared",
   ["ember-handlebars/ext","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
     var handlebarsGet = __dependency1__.handlebarsGet;
 
     __exports__["default"] = function resolvePaths(options) {
-      var ret = [],
-          contexts = options.contexts,
-          roots = options.roots,
-          data = options.data;
+      var ret = [];
+      var contexts = options.contexts;
+      var roots = options.roots;
+      var data = options.data;
 
       for (var i=0, l=contexts.length; i<l; i++) {
         ret.push(handlebarsGet(roots[i], contexts[i], { data: data }));
@@ -8795,12 +9080,12 @@ define("ember-handlebars/helpers/shared",
       return ret;
     }
   });
-define("ember-handlebars/helpers/template",
+enifed("ember-handlebars/helpers/template",
   ["ember-metal/core","ember-handlebars-compiler","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
-    // var emberDeprecate = Ember.deprecate;
+    // Ember.deprecate;
 
     var EmberHandlebars = __dependency2__["default"];
     var helpers = EmberHandlebars.helpers;
@@ -8810,43 +9095,6 @@ define("ember-handlebars/helpers/template",
     */
 
     /**
-      `template` allows you to render a template from inside another template.
-      This allows you to re-use the same template in multiple places. For example:
-
-      ```html
-      <script type="text/x-handlebars" data-template-name="logged_in_user">
-        {{#with loggedInUser}}
-          Last Login: {{lastLogin}}
-          User Info: {{template "user_info"}}
-        {{/with}}
-      </script>
-      ```
-
-      ```html
-      <script type="text/x-handlebars" data-template-name="user_info">
-        Name: <em>{{name}}</em>
-        Karma: <em>{{karma}}</em>
-      </script>
-      ```
-
-      ```handlebars
-      {{#if isUser}}
-        {{template "user_info"}}
-      {{else}}
-        {{template "unlogged_user_info"}}
-      {{/if}}
-      ```
-
-      This helper looks for templates in the global `Ember.TEMPLATES` hash. If you
-      add `<script>` tags to your page with the `data-template-name` attribute set,
-      they will be compiled and placed in this hash automatically.
-
-      You can also manually register templates by adding them to the hash:
-
-      ```javascript
-      Ember.TEMPLATES["my_cool_template"] = Ember.Handlebars.compile('<b>{{user}}</b>');
-      ```
-
       @deprecated
       @method template
       @for Ember.Handlebars.helpers
@@ -8859,7 +9107,7 @@ define("ember-handlebars/helpers/template",
       return helpers.partial.apply(this, arguments);
     }
   });
-define("ember-handlebars/helpers/unbound",
+enifed("ember-handlebars/helpers/unbound",
   ["ember-handlebars-compiler","ember-handlebars/helpers/binding","ember-handlebars/ext","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -8899,9 +9147,9 @@ define("ember-handlebars/helpers/unbound",
       @return {String} HTML string
     */
     __exports__["default"] = function unboundHelper(property, fn) {
-      var options = arguments[arguments.length - 1],
-          container = options.data.view.container,
-          helper, context, out, ctx;
+      var options = arguments[arguments.length - 1];
+      var container = options.data.view.container;
+      var helper, context, out, ctx;
 
       ctx = this;
       if (arguments.length > 2) {
@@ -8917,9 +9165,9 @@ define("ember-handlebars/helpers/unbound",
       return handlebarsGet(context, property, fn);
     }
   });
-define("ember-handlebars/helpers/view",
-  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-handlebars/ext","ember-runtime/system/string","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+enifed("ember-handlebars/helpers/view",
+  ["ember-metal/core","ember-runtime/system/object","ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-views/system/jquery","ember-views/views/view","ember-metal/binding","ember-metal/keys","ember-handlebars/ext","ember-runtime/system/string","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
     /*globals Handlebars */
 
@@ -8939,17 +9187,19 @@ define("ember-handlebars/helpers/view",
     var jQuery = __dependency6__["default"];
     var View = __dependency7__["default"];
     var isGlobalPath = __dependency8__.isGlobalPath;
-    var normalizePath = __dependency9__.normalizePath;
-    var handlebarsGet = __dependency9__.handlebarsGet;
-    var EmberString = __dependency10__["default"];
+    var keys = __dependency9__["default"];
+    var normalizePath = __dependency10__.normalizePath;
+    var handlebarsGet = __dependency10__.handlebarsGet;
+    var handlebarsGetView = __dependency10__.handlebarsGetView;
+    var EmberString = __dependency11__["default"];
 
 
-    var LOWERCASE_A_Z = /^[a-z]/,
-        VIEW_PREFIX = /^view\./;
+    var LOWERCASE_A_Z = /^[a-z]/;
+    var VIEW_PREFIX = /^view\./;
 
     function makeBindings(thisContext, options) {
-      var hash = options.hash,
-          hashType = options.hashTypes;
+      var hash = options.hash;
+      var hashType = options.hashTypes;
 
       for (var prop in hash) {
         if (hashType[prop] === 'ID') {
@@ -8976,73 +9226,71 @@ define("ember-handlebars/helpers/view",
     }
 
     var ViewHelper = EmberObject.create({
-
       propertiesFromHTMLOptions: function(options) {
-        var hash = options.hash, data = options.data;
-        var extensions = {},
-            classes = hash['class'],
-            dup = false;
+        var hash    = options.hash;
+        var data    = options.data;
+        var classes = hash['class'];
+
+        var extensions = {
+          helperName: options.helperName || ''
+        };
 
         if (hash.id) {
           extensions.elementId = hash.id;
-          dup = true;
         }
 
         if (hash.tag) {
           extensions.tagName = hash.tag;
-          dup = true;
         }
 
         if (classes) {
           classes = classes.split(' ');
           extensions.classNames = classes;
-          dup = true;
         }
 
         if (hash.classBinding) {
           extensions.classNameBindings = hash.classBinding.split(' ');
-          dup = true;
         }
 
         if (hash.classNameBindings) {
-          if (extensions.classNameBindings === undefined) extensions.classNameBindings = [];
+          if (extensions.classNameBindings === undefined) {
+            extensions.classNameBindings = [];
+          }
           extensions.classNameBindings = extensions.classNameBindings.concat(hash.classNameBindings.split(' '));
-          dup = true;
         }
 
         if (hash.attributeBindings) {
                     extensions.attributeBindings = null;
-          dup = true;
-        }
-
-        if (dup) {
-          hash = jQuery.extend({}, hash);
-          delete hash.id;
-          delete hash.tag;
-          delete hash['class'];
-          delete hash.classBinding;
         }
 
         // Set the proper context for all bindings passed to the helper. This applies to regular attribute bindings
         // as well as class name bindings. If the bindings are local, make them relative to the current context
         // instead of the view.
         var path;
+        var hashKeys = keys(hash);
 
-        // Evaluate the context of regular attribute bindings:
-        for (var prop in hash) {
-          if (!hash.hasOwnProperty(prop)) { continue; }
+        for (var i = 0, l = hashKeys.length; i < l; i++) {
+          var prop      = hashKeys[i];
+          var isBinding = IS_BINDING.test(prop);
+
+          if (prop !== 'classNameBindings') {
+            extensions[prop] = hash[prop];
+          }
 
           // Test if the property ends in "Binding"
-          if (IS_BINDING.test(prop) && typeof hash[prop] === 'string') {
+          if (isBinding && typeof extensions[prop] === 'string') {
             path = this.contextualizeBindingPath(hash[prop], data);
-            if (path) { hash[prop] = path; }
+            if (path) {
+              extensions[prop] = path;
+            }
           }
         }
 
-        // Evaluate the context of class name bindings:
         if (extensions.classNameBindings) {
-          for (var b in extensions.classNameBindings) {
-            var full = extensions.classNameBindings[b];
+          // Evaluate the context of class name bindings:
+          for (var j = 0, k = extensions.classNameBindings.length; j < k; j++) {
+            var full = extensions.classNameBindings[j];
+
             if (typeof full === 'string') {
               // Contextualize the path of classNameBinding so this:
               //
@@ -9052,15 +9300,17 @@ define("ember-handlebars/helpers/view",
               //
               //     classNameBinding="_parentView.context.isGreen:green"
               var parsedPath = View._parsePropertyPath(full);
-              if(parsedPath.path !== '') {
-                path = this.contextualizeBindingPath(parsedPath.path, data); 
-                if (path) { extensions.classNameBindings[b] = path + parsedPath.classNames; }
+              if (parsedPath.path !== '') {
+                path = this.contextualizeBindingPath(parsedPath.path, data);
+                if (path) {
+                  extensions.classNameBindings[j] = path + parsedPath.classNames;
+                }
               }
             }
           }
         }
 
-        return jQuery.extend(hash, extensions);
+        return extensions;
       },
 
       // Transform bindings from the current context to a context that can be evaluated within the view.
@@ -9082,40 +9332,25 @@ define("ember-handlebars/helpers/view",
       },
 
       helper: function(thisContext, path, options) {
-        var data = options.data,
-            fn = options.fn,
-            newView;
+        var data = options.data;
+        var fn   = options.fn;
+        var newView;
+        var newViewProto;
 
         makeBindings(thisContext, options);
 
-        if ('string' === typeof path) {
-          var lookup;
-          // TODO: this is a lame conditional, this should likely change
-          // but something along these lines will likely need to be added
-          // as deprecation warnings
-          //
-          if (options.types[0] === 'STRING' && LOWERCASE_A_Z.test(path) && !VIEW_PREFIX.test(path)) {
-            lookup = path;
-          } else {
-            newView = handlebarsGet(thisContext, path, options);
-            if (typeof newView === 'string') {
-              lookup = newView;
-            }
-          }
+        var container = this.container || (data && data.view && data.view.container);
+        newView = handlebarsGetView(thisContext, path, container, options);
 
-          if (lookup) {
-                        newView = data.view.container.lookupFactory('view:' + lookup);
-          }
-
-                  } else {
-          newView = path;
+        if (View.detectInstance(newView)) {
+          newViewProto = newView;
+        } else {
+          newViewProto = newView.proto();
         }
 
-        
         var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
         var currentView = data.view;
         viewOptions.templateData = data;
-        var newViewProto = newView.proto ? newView.proto() : newView;
 
         if (fn) {
                     viewOptions.template = fn;
@@ -9127,9 +9362,28 @@ define("ember-handlebars/helpers/view",
           viewOptions._context = thisContext;
         }
 
-        // for instrumentation
-        if (options.helperName) {
-          viewOptions.helperName = options.helperName;
+        currentView.appendChild(newView, viewOptions);
+      },
+
+      instanceHelper: function(thisContext, newView, options) {
+        var data = options.data;
+        var fn   = options.fn;
+
+        makeBindings(thisContext, options);
+
+        
+        var viewOptions = this.propertiesFromHTMLOptions(options, thisContext);
+        var currentView = data.view;
+        viewOptions.templateData = data;
+
+        if (fn) {
+                    viewOptions.template = fn;
+        }
+
+        // We only want to override the `_context` computed property if there is
+        // no specified controller. See View#_context for more information.
+        if (!newView.controller && !newView.controllerBinding && !viewOptions.controller && !viewOptions.controllerBinding) {
+          viewOptions._context = thisContext;
         }
 
         currentView.appendChild(newView, viewOptions);
@@ -9240,7 +9494,7 @@ define("ember-handlebars/helpers/view",
       specify a path to a custom view class.
 
       ```handlebars
-      {{#view "MyApp.CustomView"}}
+      {{#view "custom"}}{{! will look up App.CustomView }}
         hello.
       {{/view}}
       ```
@@ -9254,7 +9508,7 @@ define("ember-handlebars/helpers/view",
         innerViewClass: Ember.View.extend({
           classNames: ['a-custom-view-class-as-property']
         }),
-        template: Ember.Handlebars.compile('{{#view "view.innerViewClass"}} hi {{/view}}')
+        template: Ember.Handlebars.compile('{{#view view.innerViewClass}} hi {{/view}}')
       });
 
       MyApp.OuterView.create().appendTo('body');
@@ -9277,8 +9531,21 @@ define("ember-handlebars/helpers/view",
       supplying a block. Attempts to use both a `templateName` option and supply a
       block will throw an error.
 
+      ```javascript
+      var App = Ember.Application.create();
+      App.WithTemplateDefinedView = Ember.View.extend({
+        templateName: 'defined-template'
+      });
+      ```
+
       ```handlebars
-      {{view "MyApp.ViewWithATemplateDefined"}}
+      {{! application.hbs }}
+      {{view 'with-template-defined'}}
+      ```
+
+      ```handlebars
+      {{! defined-template.hbs }}
+      Some content for the defined template view.
       ```
 
       ### `viewName` property
@@ -9307,7 +9574,11 @@ define("ember-handlebars/helpers/view",
       // and get an instance of the registered `view:toplevel`
       if (path && path.data && path.data.isRenderData) {
         options = path;
-                path = options.data.view.container.lookupFactory('view:toplevel');
+        if (options.data && options.data.view && options.data.view.container) {
+          path = options.data.view.container.lookupFactory('view:toplevel');
+        } else {
+          path = View;
+        }
       }
 
       options.helperName = options.helperName || 'view';
@@ -9317,7 +9588,7 @@ define("ember-handlebars/helpers/view",
 
     __exports__.viewHelper = viewHelper;
   });
-define("ember-handlebars/helpers/yield",
+enifed("ember-handlebars/helpers/yield",
   ["ember-metal/core","ember-metal/property_get","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -9428,7 +9699,7 @@ define("ember-handlebars/helpers/yield",
       view._yield(this, options);
     }
   });
-define("ember-handlebars/loader",
+enifed("ember-handlebars/loader",
   ["ember-handlebars/component_lookup","ember-views/system/jquery","ember-metal/error","ember-runtime/system/lazy_load","ember-handlebars-compiler","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -9472,12 +9743,12 @@ define("ember-handlebars/loader",
 
         var compile = (script.attr('type') === 'text/x-raw-handlebars') ?
                       jQuery.proxy(Handlebars.compile, Handlebars) :
-                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars),
-          // Get the name of the script, used by Ember.View's templateName property.
-          // First look for data-template-name attribute, then fall back to its
-          // id if no name is found.
-          templateName = script.attr('data-template-name') || script.attr('id') || 'application',
-          template = compile(script.html());
+                      jQuery.proxy(EmberHandlebars.compile, EmberHandlebars);
+        // Get the name of the script, used by Ember.View's templateName property.
+        // First look for data-template-name attribute, then fall back to its
+        // id if no name is found.
+        var templateName = script.attr('data-template-name') || script.attr('id') || 'application';
+        var template = compile(script.html());
 
         // Check if template of same name already exists
         if (Ember.TEMPLATES[templateName] !== undefined) {
@@ -9526,7 +9797,7 @@ define("ember-handlebars/loader",
 
     __exports__["default"] = bootstrap;
   });
-define("ember-handlebars/string",
+enifed("ember-handlebars/string",
   ["ember-runtime/system/string","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -9548,6 +9819,13 @@ define("ember-handlebars/string",
       @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
     */
     function htmlSafe(str) {
+      if (str === undefined || str === null) {
+        return "";
+      }
+
+      if (typeof str !== 'string') {
+        str = ''+str;
+      }
       return new Handlebars.SafeString(str);
     }
 
@@ -9574,9 +9852,9 @@ define("ember-handlebars/string",
 
     __exports__["default"] = htmlSafe;
   });
-define("ember-handlebars/views/handlebars_bound_view",
-  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-views/views/view","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+enifed("ember-handlebars/views/handlebars_bound_view",
+  ["ember-handlebars-compiler","ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-views/views/view","ember-handlebars/string","ember-views/views/states","ember-handlebars/views/metamorph_view","ember-handlebars/ext","ember-metal/utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
     /*globals Handlebars, Metamorph:true */
     /*jshint newcap:false*/
@@ -9595,34 +9873,33 @@ define("ember-handlebars/views/handlebars_bound_view",
     // Ember.K
     var K = Ember.K;
 
-    var Metamorph = requireModule('metamorph');
-
     var EmberError = __dependency3__["default"];
     var get = __dependency4__.get;
     var set = __dependency5__.set;
     var merge = __dependency6__["default"];
     var run = __dependency7__["default"];
-    var computed = __dependency8__.computed;
-    var View = __dependency9__["default"];
+    var View = __dependency8__["default"];
+    var htmlSafe = __dependency9__["default"];
     var cloneStates = __dependency10__.cloneStates;
     var states = __dependency10__.states;
     var viewStates = states;
 
     var _MetamorphView = __dependency11__["default"];
     var handlebarsGet = __dependency12__.handlebarsGet;
+    var uuid = __dependency13__.uuid;
 
     function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {
       this.path = path;
       this.pathRoot = pathRoot;
       this.isEscaped = isEscaped;
       this.templateData = templateData;
-
+      this[Ember.GUID_KEY] = uuid();
       this._lastNormalizedValue = undefined;
-      this.morph = Metamorph();
       this.state = 'preRender';
       this.updateId = null;
       this._parentView = null;
       this.buffer = null;
+      this._morph = null;
     }
 
     SimpleHandlebarsView.prototype = {
@@ -9648,6 +9925,7 @@ define("ember-handlebars/views/handlebars_bound_view",
       normalizedValue: function() {
         var path = this.path;
         var pathRoot = this.pathRoot;
+        var escape = this.isEscaped;
         var result, templateData;
 
         // Use the pathRoot as the result if no path is provided. This
@@ -9661,35 +9939,19 @@ define("ember-handlebars/views/handlebars_bound_view",
           result = handlebarsGet(pathRoot, path, { data: templateData });
         }
 
-        return result;
-      },
-
-      renderToBuffer: function(buffer) {
-        var string = '';
-
-        string += this.morph.startTag();
-        string += this.render();
-        string += this.morph.endTag();
-
-        buffer.push(string);
-      },
-
-      render: function(value) {
-        // If not invoked via a triple-mustache ({{{foo}}}), escape
-        // the content of the template.
-        var escape = this.isEscaped;
-        var result = value || this.normalizedValue();
-        this._lastNormalizedValue = result;
-        if (result === null || result === undefined) {
-          result = "";
-        } else if (!(result instanceof SafeString)) {
-          result = String(result);
+        if (!escape && !(result instanceof SafeString)) {
+          result = htmlSafe(result);
         }
 
-        if (escape) { result = Handlebars.Utils.escapeExpression(result); }
         return result;
       },
 
+      render: function(buffer) {
+        var value = this.normalizedValue();
+        this._lastNormalizedValue = value;
+        buffer._element = value;
+      },
+
       rerender: function() {
         switch(this.state) {
           case 'preRender':
@@ -9702,15 +9964,16 @@ define("ember-handlebars/views/handlebars_bound_view",
             this.updateId = run.scheduleOnce('render', this, 'update');
             break;
         }
-
         return this;
       },
 
       update: function () {
         this.updateId = null;
         var value = this.normalizedValue();
+        // doesn't diff SafeString instances
         if (value !== this._lastNormalizedValue) {
-          this.morph.html(this.render(value));
+          this._lastNormalizedValue = value;
+          this._morph.update(value);
         }
       },
 
@@ -9833,10 +10096,10 @@ define("ember-handlebars/views/handlebars_bound_view",
       pathRoot: null,
 
       normalizedValue: function() {
-        var path = get(this, 'path'),
-            pathRoot  = get(this, 'pathRoot'),
-            valueNormalizer = get(this, 'valueNormalizerFunc'),
-            result, templateData;
+        var path = get(this, 'path');
+        var pathRoot  = get(this, 'pathRoot');
+        var valueNormalizer = get(this, 'valueNormalizerFunc');
+        var result, templateData;
 
         // Use the pathRoot as the result if no path is provided. This
         // happens if the path is `this`, which gets normalized into
@@ -9878,14 +10141,15 @@ define("ember-handlebars/views/handlebars_bound_view",
         // the content of the template.
         var escape = get(this, 'isEscaped');
 
-        var shouldDisplay = get(this, 'shouldDisplayFunc'),
-            preserveContext = get(this, 'preserveContext'),
-            context = get(this, 'previousContext');
+        var shouldDisplay = get(this, 'shouldDisplayFunc');
+        var preserveContext = get(this, 'preserveContext');
+        var context = get(this, 'previousContext');
 
-        var inverseTemplate = get(this, 'inverseTemplate'),
-            displayTemplate = get(this, 'displayTemplate');
+        var inverseTemplate = get(this, 'inverseTemplate');
+        var displayTemplate = get(this, 'displayTemplate');
 
         var result = this.normalizedValue();
+
         this._lastNormalizedValue = result;
 
         // First, test the conditional to see if we should
@@ -9935,93 +10199,30 @@ define("ember-handlebars/views/handlebars_bound_view",
     __exports__._HandlebarsBoundView = _HandlebarsBoundView;
     __exports__.SimpleHandlebarsView = SimpleHandlebarsView;
   });
-define("ember-handlebars/views/metamorph_view",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
+enifed("ember-handlebars/views/metamorph_view",
+  ["ember-metal/core","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /* global Metamorph:true */
 
     /*jshint newcap:false*/
     var Ember = __dependency1__["default"];
     // Ember.deprecate
-    // var emberDeprecate = Ember.deprecate;
 
-    var get = __dependency2__.get;
-    var set = __dependency3__["default"];
-
-    var CoreView = __dependency4__["default"];
-    var View = __dependency5__["default"];
-    var Mixin = __dependency6__.Mixin;
-    var run = __dependency7__["default"];
+    var CoreView = __dependency2__["default"];
+    var View = __dependency3__["default"];
+    var Mixin = __dependency4__.Mixin;
+    var run = __dependency5__["default"];
 
     /**
     @module ember
     @submodule ember-handlebars
     */
 
-    var Metamorph = requireModule('metamorph');
-
     function notifyMutationListeners() {
       run.once(View, 'notifyMutationListeners');
     }
 
-    // DOMManager should just abstract dom manipulation between jquery and metamorph
-    var DOMManager = {
-      remove: function(view) {
-        view.morph.remove();
-        notifyMutationListeners();
-      },
-
-      prepend: function(view, html) {
-        view.morph.prepend(html);
-        notifyMutationListeners();
-      },
-
-      after: function(view, html) {
-        view.morph.after(html);
-        notifyMutationListeners();
-      },
-
-      html: function(view, html) {
-        view.morph.html(html);
-        notifyMutationListeners();
-      },
-
-      // This is messed up.
-      replace: function(view) {
-        var morph = view.morph;
-
-        view._transitionTo('preRender');
-
-        run.schedule('render', this, function renderMetamorphView() {
-          if (view.isDestroying) { return; }
-
-          view.clearRenderedChildren();
-          var buffer = view.renderToBuffer();
-
-          view.invokeRecursively(function(view) {
-            view.propertyWillChange('element');
-          });
-          view.triggerRecursively('willInsertElement');
-
-          morph.replaceWith(buffer.string());
-          view._transitionTo('inDOM');
-
-          view.invokeRecursively(function(view) {
-            view.propertyDidChange('element');
-          });
-          view.triggerRecursively('didInsertElement');
-
-          notifyMutationListeners();
-        });
-      },
-
-      empty: function(view) {
-        view.morph.html("");
-        notifyMutationListeners();
-      }
-    };
-
     // The `morph` and `outerHTML` properties are internal only
     // and not observable.
 
@@ -10038,30 +10239,9 @@ define("ember-handlebars/views/metamorph_view",
 
       init: function() {
         this._super();
-        this.morph = Metamorph();
-              },
-
-      beforeRender: function(buffer) {
-        buffer.push(this.morph.startTag());
-        buffer.pushOpeningTag();
-      },
-
-      afterRender: function(buffer) {
-        buffer.pushClosingTag();
-        buffer.push(this.morph.endTag());
-      },
-
-      createElement: function() {
-        var buffer = this.renderToBuffer();
-        this.outerHTML = buffer.string();
-        this.clearBuffer();
-      },
-
-      domManager: DOMManager
+              }
     });
     __exports__._Metamorph = _Metamorph;
-    var _wrapMap = Metamorph._wrapMap;
-    __exports__._wrapMap = _wrapMap;
     /**
       @class _MetamorphView
       @namespace Ember
@@ -10081,9 +10261,306 @@ define("ember-handlebars/views/metamorph_view",
     var _SimpleMetamorphView = CoreView.extend(_Metamorph);
     __exports__._SimpleMetamorphView = _SimpleMetamorphView;__exports__["default"] = View.extend(_Metamorph);
   });
-define("ember-metal",
-  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __exports__) {
+enifed("ember-metal-views",
+  ["ember-metal-views/renderer","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Renderer = __dependency1__["default"];
+    __exports__.Renderer = Renderer;
+  });
+enifed("ember-metal-views/renderer",
+  ["morph","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var DOMHelper = __dependency1__.DOMHelper;
+
+    function Renderer() {
+      this._uuid = 0;
+      this._views = new Array(2000);
+      this._queue = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
+      this._parents = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0];
+      this._elements = new Array(17);
+      this._inserts = {};
+      this._dom = new DOMHelper();
+    }
+
+    function Renderer_renderTree(_view, _parentView, _insertAt) {
+      var views = this._views;
+      views[0] = _view;
+      var insertAt = _insertAt === undefined ? -1 : _insertAt;
+      var index = 0;
+      var total = 1;
+      var levelBase = _parentView ? _parentView._level+1 : 0;
+
+      var root = _parentView == null ? _view : _parentView._root;
+
+      // if root view has a _morph assigned
+      var willInsert = !!root._morph;
+
+      var queue = this._queue;
+      queue[0] = 0;
+      var length = 1;
+
+      var parentIndex = -1;
+      var parents = this._parents;
+      var parent = _parentView || null;
+      var elements = this._elements;
+      var element = null;
+      var contextualElement = null;
+      var level = 0;
+
+      var view = _view;
+      var children, i, l, child;
+      while (length) {
+        elements[level] = element;
+        if (!view._morph) {
+          // ensure props we add are in same order
+          view._morph = null;
+        }
+        view._root = root;
+        this.uuid(view);
+        view._level = levelBase + level;
+        if (view._elementCreated) {
+          this.remove(view, false, true);
+        }
+
+        this.willCreateElement(view);
+
+        contextualElement = view._morph && view._morph.contextualElement;
+        if (!contextualElement && parent && parent._childViewsMorph) {
+          contextualElement = parent._childViewsMorph.contextualElement;
+        }
+        if (!contextualElement && view._didCreateElementWithoutMorph) {
+          // This code path is only used by createElement and rerender when createElement
+          // was previously called on a view.
+          contextualElement = document.body;
+        }
+                element = this.createElement(view, contextualElement);
+
+        parents[level++] = parentIndex;
+        parentIndex = index;
+        parent = view;
+
+        // enqueue for end
+        queue[length++] = index;
+        // enqueue children
+        children = this.childViews(view);
+        if (children) {
+          for (i=children.length-1;i>=0;i--) {
+            child = children[i];
+            index = total++;
+            views[index] = child;
+            queue[length++] = index;
+            view = child;
+          }
+        }
+
+        index = queue[--length];
+        view = views[index];
+
+        while (parentIndex === index) {
+          level--;
+          view._elementCreated = true;
+          this.didCreateElement(view);
+          if (willInsert) {
+            this.willInsertElement(view);
+          }
+
+          if (level === 0) {
+            length--;
+            break;
+          }
+
+          parentIndex = parents[level];
+          parent = parentIndex === -1 ? _parentView : views[parentIndex];
+          this.insertElement(view, parent, element, -1);
+          index = queue[--length];
+          view = views[index];
+          element = elements[level];
+          elements[level] = null;
+        }
+      }
+
+      this.insertElement(view, _parentView, element, insertAt);
+
+      for (i=total-1;i>=0;i--) {
+        if (willInsert) {
+          views[i]._elementInserted = true;
+          this.didInsertElement(views[i]);
+        }
+        views[i] = null;
+      }
+
+      return element;
+    }
+
+    Renderer.prototype.uuid = function Renderer_uuid(view) {
+      if (view._uuid === undefined) {
+        view._uuid = ++this._uuid;
+        view._renderer = this;
+      } // else assert(view._renderer === this)
+      return view._uuid;
+    };
+
+    Renderer.prototype.scheduleInsert =
+      function Renderer_scheduleInsert(view, morph) {
+        if (view._morph || view._elementCreated) {
+          throw new Error("You cannot insert a View that has already been rendered");
+        }
+                view._morph = morph;
+        var viewId = this.uuid(view);
+        this._inserts[viewId] = this.scheduleRender(this, function() {
+          this._inserts[viewId] = null;
+          this.renderTree(view);
+        });
+      };
+
+    Renderer.prototype.appendTo =
+      function Renderer_appendTo(view, target) {
+        var morph = this._dom.appendMorph(target);
+        this.scheduleInsert(view, morph);
+      };
+
+    Renderer.prototype.replaceIn =
+      function Renderer_replaceIn(view, target) {
+        var morph = this._dom.createMorph(target, null, null);
+        this.scheduleInsert(view, morph);
+      };
+
+    function Renderer_remove(_view, shouldDestroy, reset) {
+      var viewId = this.uuid(_view);
+
+      if (this._inserts[viewId]) {
+        this.cancelRender(this._inserts[viewId]);
+        this._inserts[viewId] = undefined;
+      }
+
+      if (!_view._elementCreated) {
+        return;
+      }
+
+      var removeQueue = [];
+      var destroyQueue = [];
+      var morph = _view._morph;
+      var  idx, len, view, staticChildren, queue,
+        childViews, i, l, parentView;
+
+      removeQueue.push(_view);
+
+      for (idx=0; idx<removeQueue.length; idx++) {
+        view = removeQueue[idx];
+
+        if (!shouldDestroy && view._childViewsMorph) {
+          queue = removeQueue;
+        } else {
+          queue = destroyQueue;
+        }
+
+        this.beforeRemove(removeQueue[idx]);
+
+        childViews = view._childViews;
+        if (childViews) {
+          for (i=0,l=childViews.length; i<l; i++) {
+            queue.push(childViews[i]);
+          }
+        }
+      }
+
+      for (idx=0; idx<destroyQueue.length; idx++) {
+        view = destroyQueue[idx];
+
+        this.beforeRemove(destroyQueue[idx]);
+
+        childViews = view._childViews;
+        if (childViews) {
+          for (i=0,l=childViews.length; i<l; i++) {
+            destroyQueue.push(childViews[i]);
+          }
+        }
+      }
+
+      // destroy DOM from root insertion
+      if (morph && !reset) {
+        morph.destroy();
+      }
+
+      for (idx=0, len=removeQueue.length; idx < len; idx++) {
+        this.afterRemove(removeQueue[idx], false);
+      }
+
+      for (idx=0, len=destroyQueue.length; idx < len; idx++) {
+        this.afterRemove(destroyQueue[idx], true);
+      }
+
+      if (reset) {
+        _view._morph = morph;
+      }
+    }
+
+    function Renderer_insertElement(view, parentView, element, index) {
+      if (element === null || element === undefined) return;
+      if (view._morph) {
+        view._morph.update(element);
+      } else if (parentView) {
+        if (index === -1) {
+          view._morph = parentView._childViewsMorph.append(element);
+        } else {
+          view._morph = parentView._childViewsMorph.insert(index, element);
+        }
+      }
+    }
+
+    function Renderer_beforeRemove(view) {
+      if (view._elementCreated) {
+        this.willDestroyElement(view);
+      }
+      if (view._elementInserted) {
+        this.willRemoveElement(view);
+      }
+    }
+
+    function Renderer_afterRemove(view, shouldDestroy) {
+      view._elementInserted = false;
+      view._morph = null;
+      view._childViewsMorph = null;
+      if (view._elementCreated) {
+        view._elementCreated = false;
+        this.didDestroyElement(view);
+      }
+      if (shouldDestroy) {
+        this.destroyView(view);
+      }
+    }
+
+    Renderer.prototype.remove = Renderer_remove;
+    Renderer.prototype.destroy = function (view) {
+      this.remove(view, true);
+    };
+
+    Renderer.prototype.renderTree = Renderer_renderTree;
+    Renderer.prototype.insertElement = Renderer_insertElement;
+    Renderer.prototype.beforeRemove = Renderer_beforeRemove;
+    Renderer.prototype.afterRemove = Renderer_afterRemove;
+
+    /// HOOKS
+    var noop = function () {};
+
+    Renderer.prototype.willCreateElement = noop; // inBuffer
+    Renderer.prototype.createElement = noop; // renderToBuffer or createElement
+    Renderer.prototype.didCreateElement = noop; // hasElement
+    Renderer.prototype.willInsertElement = noop; // will place into DOM
+    Renderer.prototype.didInsertElement = noop; // inDOM // placed into DOM
+    Renderer.prototype.willRemoveElement = noop; // removed from DOM  willDestroyElement currently paired with didInsertElement
+    Renderer.prototype.willDestroyElement = noop; // willClearRender (currently balanced with render) this is now paired with createElement
+    Renderer.prototype.didDestroyElement = noop; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
+    Renderer.prototype.destroyView = noop;
+    Renderer.prototype.childViews = noop;
+
+    __exports__["default"] = Renderer;
+  });
+enifed("ember-metal",
+  ["ember-metal/core","ember-metal/merge","ember-metal/instrumentation","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/cache","ember-metal/platform","ember-metal/array","ember-metal/logger","ember-metal/property_get","ember-metal/events","ember-metal/observer_set","ember-metal/property_events","ember-metal/properties","ember-metal/property_set","ember-metal/map","ember-metal/get_properties","ember-metal/set_properties","ember-metal/watch_key","ember-metal/chains","ember-metal/watch_path","ember-metal/watching","ember-metal/expand_properties","ember-metal/computed","ember-metal/computed_macros","ember-metal/observer","ember-metal/mixin","ember-metal/binding","ember-metal/run_loop","ember-metal/libraries","ember-metal/is_none","ember-metal/is_empty","ember-metal/is_blank","ember-metal/is_present","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __exports__) {
     "use strict";
     /**
     Ember Metal
@@ -10101,7 +10578,6 @@ define("ember-metal",
     var reset = __dependency3__.reset;
     var generateGuid = __dependency4__.generateGuid;
     var GUID_KEY = __dependency4__.GUID_KEY;
-    var GUID_PREFIX = __dependency4__.GUID_PREFIX;
     var guidFor = __dependency4__.guidFor;
     var META_DESC = __dependency4__.META_DESC;
     var EMPTY_META = __dependency4__.EMPTY_META;
@@ -10123,100 +10599,103 @@ define("ember-metal",
     var uuid = __dependency4__.uuid;
     var EmberError = __dependency5__["default"];
     var EnumerableUtils = __dependency6__["default"];
+    var Cache = __dependency7__["default"];
+    var create = __dependency8__.create;
+    var hasPropertyAccessors = __dependency8__.hasPropertyAccessors;
+    var filter = __dependency9__.filter;
+    var forEach = __dependency9__.forEach;
+    var indexOf = __dependency9__.indexOf;
+    var map = __dependency9__.map;
+    var Logger = __dependency10__["default"];
 
-    var create = __dependency7__.create;
-    var platform = __dependency7__.platform;
-    var map = __dependency8__.map;
-    var forEach = __dependency8__.forEach;
-    var filter = __dependency8__.filter;
-    var indexOf = __dependency8__.indexOf;
-    var Logger = __dependency9__["default"];
+    var get = __dependency11__.get;
+    var getWithDefault = __dependency11__.getWithDefault;
+    var normalizeTuple = __dependency11__.normalizeTuple;
+    var _getPath = __dependency11__._getPath;
 
-    var get = __dependency10__.get;
-    var getWithDefault = __dependency10__.getWithDefault;
-    var normalizeTuple = __dependency10__.normalizeTuple;
-    var _getPath = __dependency10__._getPath;
+    var on = __dependency12__.on;
+    var addListener = __dependency12__.addListener;
+    var removeListener = __dependency12__.removeListener;
+    var suspendListener = __dependency12__.suspendListener;
+    var suspendListeners = __dependency12__.suspendListeners;
+    var sendEvent = __dependency12__.sendEvent;
+    var hasListeners = __dependency12__.hasListeners;
+    var watchedEvents = __dependency12__.watchedEvents;
+    var listenersFor = __dependency12__.listenersFor;
+    var listenersDiff = __dependency12__.listenersDiff;
+    var listenersUnion = __dependency12__.listenersUnion;
 
-    var on = __dependency11__.on;
-    var addListener = __dependency11__.addListener;
-    var removeListener = __dependency11__.removeListener;
-    var suspendListener = __dependency11__.suspendListener;
-    var suspendListeners = __dependency11__.suspendListeners;
-    var sendEvent = __dependency11__.sendEvent;
-    var hasListeners = __dependency11__.hasListeners;
-    var watchedEvents = __dependency11__.watchedEvents;
-    var listenersFor = __dependency11__.listenersFor;
-    var listenersDiff = __dependency11__.listenersDiff;
-    var listenersUnion = __dependency11__.listenersUnion;
+    var ObserverSet = __dependency13__["default"];
 
-    var ObserverSet = __dependency12__["default"];
+    var propertyWillChange = __dependency14__.propertyWillChange;
+    var propertyDidChange = __dependency14__.propertyDidChange;
+    var overrideChains = __dependency14__.overrideChains;
+    var beginPropertyChanges = __dependency14__.beginPropertyChanges;
+    var endPropertyChanges = __dependency14__.endPropertyChanges;
+    var changeProperties = __dependency14__.changeProperties;
 
-    var propertyWillChange = __dependency13__.propertyWillChange;
-    var propertyDidChange = __dependency13__.propertyDidChange;
-    var overrideChains = __dependency13__.overrideChains;
-    var beginPropertyChanges = __dependency13__.beginPropertyChanges;
-    var endPropertyChanges = __dependency13__.endPropertyChanges;
-    var changeProperties = __dependency13__.changeProperties;
+    var Descriptor = __dependency15__.Descriptor;
+    var defineProperty = __dependency15__.defineProperty;
+    var set = __dependency16__.set;
+    var trySet = __dependency16__.trySet;
 
-    var Descriptor = __dependency14__.Descriptor;
-    var defineProperty = __dependency14__.defineProperty;
-    var set = __dependency15__.set;
-    var trySet = __dependency15__.trySet;
-
-    var OrderedSet = __dependency16__.OrderedSet;
-    var Map = __dependency16__.Map;
-    var MapWithDefault = __dependency16__.MapWithDefault;
-    var getProperties = __dependency17__["default"];
-    var setProperties = __dependency18__["default"];
-    var watchKey = __dependency19__.watchKey;
-    var unwatchKey = __dependency19__.unwatchKey;
-    var flushPendingChains = __dependency20__.flushPendingChains;
-    var removeChainWatcher = __dependency20__.removeChainWatcher;
-    var ChainNode = __dependency20__.ChainNode;
-    var finishChains = __dependency20__.finishChains;
-    var watchPath = __dependency21__.watchPath;
-    var unwatchPath = __dependency21__.unwatchPath;
-    var watch = __dependency22__.watch;
-    var isWatching = __dependency22__.isWatching;
-    var unwatch = __dependency22__.unwatch;
-    var rewatch = __dependency22__.rewatch;
-    var destroy = __dependency22__.destroy;
-    var expandProperties = __dependency23__["default"];
-    var ComputedProperty = __dependency24__.ComputedProperty;
-    var computed = __dependency24__.computed;
-    var cacheFor = __dependency24__.cacheFor;
+    var OrderedSet = __dependency17__.OrderedSet;
+    var Map = __dependency17__.Map;
+    var MapWithDefault = __dependency17__.MapWithDefault;
+    var getProperties = __dependency18__["default"];
+    var setProperties = __dependency19__["default"];
+    var watchKey = __dependency20__.watchKey;
+    var unwatchKey = __dependency20__.unwatchKey;
+    var flushPendingChains = __dependency21__.flushPendingChains;
+    var removeChainWatcher = __dependency21__.removeChainWatcher;
+    var ChainNode = __dependency21__.ChainNode;
+    var finishChains = __dependency21__.finishChains;
+    var watchPath = __dependency22__.watchPath;
+    var unwatchPath = __dependency22__.unwatchPath;
+    var watch = __dependency23__.watch;
+    var isWatching = __dependency23__.isWatching;
+    var unwatch = __dependency23__.unwatch;
+    var rewatch = __dependency23__.rewatch;
+    var destroy = __dependency23__.destroy;
+    var expandProperties = __dependency24__["default"];
+    var ComputedProperty = __dependency25__.ComputedProperty;
+    var computed = __dependency25__.computed;
+    var cacheFor = __dependency25__.cacheFor;
 
     // side effect of defining the computed.* macros
 
-    var addObserver = __dependency26__.addObserver;
-    var observersFor = __dependency26__.observersFor;
-    var removeObserver = __dependency26__.removeObserver;
-    var addBeforeObserver = __dependency26__.addBeforeObserver;
-    var _suspendBeforeObserver = __dependency26__._suspendBeforeObserver;
-    var _suspendObserver = __dependency26__._suspendObserver;
-    var _suspendBeforeObservers = __dependency26__._suspendBeforeObservers;
-    var _suspendObservers = __dependency26__._suspendObservers;
-    var beforeObserversFor = __dependency26__.beforeObserversFor;
-    var removeBeforeObserver = __dependency26__.removeBeforeObserver;
-    var IS_BINDING = __dependency27__.IS_BINDING;
-    var mixin = __dependency27__.mixin;
-    var Mixin = __dependency27__.Mixin;
-    var required = __dependency27__.required;
-    var aliasMethod = __dependency27__.aliasMethod;
-    var observer = __dependency27__.observer;
-    var immediateObserver = __dependency27__.immediateObserver;
-    var beforeObserver = __dependency27__.beforeObserver;
-    var Binding = __dependency28__.Binding;
-    var isGlobalPath = __dependency28__.isGlobalPath;
-    var bind = __dependency28__.bind;
-    var oneWay = __dependency28__.oneWay;
-    var run = __dependency29__["default"];
-    var libraries = __dependency30__["default"];
-    var isNone = __dependency31__.isNone;
-    var none = __dependency31__.none;
-    var isEmpty = __dependency32__.isEmpty;
-    var empty = __dependency32__.empty;
-    var isBlank = __dependency33__["default"];
+    var addObserver = __dependency27__.addObserver;
+    var observersFor = __dependency27__.observersFor;
+    var removeObserver = __dependency27__.removeObserver;
+    var addBeforeObserver = __dependency27__.addBeforeObserver;
+    var _suspendBeforeObserver = __dependency27__._suspendBeforeObserver;
+    var _suspendObserver = __dependency27__._suspendObserver;
+    var _suspendBeforeObservers = __dependency27__._suspendBeforeObservers;
+    var _suspendObservers = __dependency27__._suspendObservers;
+    var beforeObserversFor = __dependency27__.beforeObserversFor;
+    var removeBeforeObserver = __dependency27__.removeBeforeObserver;
+    var IS_BINDING = __dependency28__.IS_BINDING;
+    var mixin = __dependency28__.mixin;
+    var Mixin = __dependency28__.Mixin;
+    var required = __dependency28__.required;
+    var aliasMethod = __dependency28__.aliasMethod;
+    var observer = __dependency28__.observer;
+    var immediateObserver = __dependency28__.immediateObserver;
+    var beforeObserver = __dependency28__.beforeObserver;
+    var Binding = __dependency29__.Binding;
+    var isGlobalPath = __dependency29__.isGlobalPath;
+    var bind = __dependency29__.bind;
+    var oneWay = __dependency29__.oneWay;
+    var run = __dependency30__["default"];
+    var libraries = __dependency31__["default"];
+    var isNone = __dependency32__.isNone;
+    var none = __dependency32__.none;
+    var isEmpty = __dependency33__.isEmpty;
+    var empty = __dependency33__.empty;
+    var isBlank = __dependency34__["default"];
+    var isPresent = __dependency35__["default"];
+    var keys = __dependency36__["default"];
+
     // END IMPORTS
 
     // BEGIN EXPORTS
@@ -10229,11 +10708,16 @@ define("ember-metal",
     Ember.instrument = instrument;
     Ember.subscribe = subscribe;
 
+    Ember._Cache = Cache;
+
     Ember.generateGuid    = generateGuid;
     Ember.GUID_KEY        = GUID_KEY;
-    Ember.GUID_PREFIX     = GUID_PREFIX;
     Ember.create          = create;
-    Ember.platform        = platform;
+    Ember.keys            = keys;
+    Ember.platform        = {
+      defineProperty: defineProperty,
+      hasPropertyAccessors: hasPropertyAccessors
+    };
 
     var EmberArrayPolyfills = Ember.ArrayPolyfills = {};
 
@@ -10367,6 +10851,10 @@ define("ember-metal",
 
     Ember.isBlank = isBlank;
 
+    
+      Ember.isPresent = isPresent;
+    
+
     Ember.merge = merge;
 
     /**
@@ -10400,7 +10888,7 @@ define("ember-metal",
 
     __exports__["default"] = Ember;
   });
-define("ember-metal/alias",
+enifed("ember-metal/alias",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/error","ember-metal/properties","ember-metal/computed","ember-metal/platform","ember-metal/utils","ember-metal/dependent_keys","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -10480,7 +10968,7 @@ define("ember-metal/alias",
     AliasedProperty.prototype._meta = undefined;
     AliasedProperty.prototype.meta = ComputedProperty.prototype.meta;
   });
-define("ember-metal/array",
+enifed("ember-metal/array",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -10497,22 +10985,26 @@ define("ember-metal/array",
       return func && Function.prototype.toString.call(func).indexOf('[native code]') > -1;
     };
 
+    var defineNativeShim = function(nativeFunc, shim) {
+      if (isNativeFunc(nativeFunc)) {
+        return nativeFunc;
+      }
+      return shim;
+    };
+
     // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/map
-    var map = isNativeFunc(ArrayPrototype.map) ? ArrayPrototype.map : function(fun /*, thisp */) {
+    var map = defineNativeShim(ArrayPrototype.map, function(fun /*, thisp */) {
       //"use strict";
 
-      if (this === void 0 || this === null) {
+      if (this === void 0 || this === null || typeof fun !== "function") {
         throw new TypeError();
       }
 
       var t = Object(this);
       var len = t.length >>> 0;
-      if (typeof fun !== "function") {
-        throw new TypeError();
-      }
-
       var res = new Array(len);
       var thisp = arguments[1];
+
       for (var i = 0; i < len; i++) {
         if (i in t) {
           res[i] = fun.call(thisp, t[i], i, t);
@@ -10520,44 +11012,61 @@ define("ember-metal/array",
       }
 
       return res;
-    };
+    });
 
     // From: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/foreach
-    var forEach = isNativeFunc(ArrayPrototype.forEach) ? ArrayPrototype.forEach : function(fun /*, thisp */) {
+    var forEach = defineNativeShim(ArrayPrototype.forEach, function(fun /*, thisp */) {
       //"use strict";
 
-      if (this === void 0 || this === null) {
+      if (this === void 0 || this === null || typeof fun !== "function") {
         throw new TypeError();
       }
 
       var t = Object(this);
       var len = t.length >>> 0;
-      if (typeof fun !== "function") {
-        throw new TypeError();
-      }
-
       var thisp = arguments[1];
+
       for (var i = 0; i < len; i++) {
         if (i in t) {
           fun.call(thisp, t[i], i, t);
         }
       }
-    };
+    });
+
+    var indexOf = defineNativeShim(ArrayPrototype.indexOf, function (obj, fromIndex) {
+      if (fromIndex === null || fromIndex === undefined) {
+        fromIndex = 0;
+      }
+      else if (fromIndex < 0) {
+        fromIndex = Math.max(0, this.length + fromIndex);
+      }
 
-    var indexOf = isNativeFunc(ArrayPrototype.indexOf) ? ArrayPrototype.indexOf : function (obj, fromIndex) {
-      if (fromIndex === null || fromIndex === undefined) { fromIndex = 0; }
-      else if (fromIndex < 0) { fromIndex = Math.max(0, this.length + fromIndex); }
       for (var i = fromIndex, j = this.length; i < j; i++) {
-        if (this[i] === obj) { return i; }
+        if (this[i] === obj) {
+          return i;
+        }
       }
       return -1;
-    };
+    });
 
-    var filter = isNativeFunc(ArrayPrototype.filter) ? ArrayPrototype.filter : function (fn, context) {
-      var i,
-      value,
-      result = [],
-      length = this.length;
+    var lastIndexOf = defineNativeShim(ArrayPrototype.lastIndexOf, function(obj, fromIndex) {
+        var len = this.length;
+        var idx;
+
+        if (fromIndex === undefined) fromIndex = len-1;
+        else fromIndex = (fromIndex < 0) ? Math.ceil(fromIndex) : Math.floor(fromIndex);
+        if (fromIndex < 0) fromIndex += len;
+
+        for(idx = fromIndex;idx>=0;idx--) {
+          if (this[idx] === obj) return idx ;
+        }
+        return -1;
+    });
+
+    var filter = defineNativeShim(ArrayPrototype.filter, function (fn, context) {
+      var i, value;
+      var result = [];
+      var length = this.length;
 
       for (i = 0; i < length; i++) {
         if (this.hasOwnProperty(i)) {
@@ -10568,25 +11077,14 @@ define("ember-metal/array",
         }
       }
       return result;
-    };
-
+    });
 
     if (Ember.SHIM_ES5) {
-      if (!ArrayPrototype.map) {
-        ArrayPrototype.map = map;
-      }
-
-      if (!ArrayPrototype.forEach) {
-        ArrayPrototype.forEach = forEach;
-      }
-
-      if (!ArrayPrototype.filter) {
-        ArrayPrototype.filter = filter;
-      }
-
-      if (!ArrayPrototype.indexOf) {
-        ArrayPrototype.indexOf = indexOf;
-      }
+      ArrayPrototype.map = ArrayPrototype.map || map;
+      ArrayPrototype.forEach = ArrayPrototype.forEach || forEach;
+      ArrayPrototype.filter = ArrayPrototype.filter || filter;
+      ArrayPrototype.indexOf = ArrayPrototype.indexOf || indexOf;
+      ArrayPrototype.lastIndexOf = ArrayPrototype.lastIndexOf || lastIndexOf;
     }
 
     /**
@@ -10599,9 +11097,10 @@ define("ember-metal/array",
     __exports__.forEach = forEach;
     __exports__.filter = filter;
     __exports__.indexOf = indexOf;
+    __exports__.lastIndexOf = lastIndexOf;
   });
-define("ember-metal/binding",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/map","ember-metal/observer","ember-metal/run_loop","exports"],
+enifed("ember-metal/binding",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/run_loop","ember-metal/path_cache","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -10610,11 +11109,12 @@ define("ember-metal/binding",
     var set = __dependency3__.set;
     var trySet = __dependency3__.trySet;
     var guidFor = __dependency4__.guidFor;
-    var Map = __dependency5__.Map;
-    var addObserver = __dependency6__.addObserver;
-    var removeObserver = __dependency6__.removeObserver;
-    var _suspendObserver = __dependency6__._suspendObserver;
-    var run = __dependency7__["default"];
+    var addObserver = __dependency5__.addObserver;
+    var removeObserver = __dependency5__.removeObserver;
+    var _suspendObserver = __dependency5__._suspendObserver;
+    var run = __dependency6__["default"];
+    var isGlobalPath = __dependency7__.isGlobal;
+
 
     // ES6TODO: where is Ember.lookup defined?
     /**
@@ -10637,8 +11137,6 @@ define("ember-metal/binding",
     */
     Ember.LOG_BINDINGS = false || !!Ember.ENV.LOG_BINDINGS;
 
-    var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
-
     /**
       Returns true if the provided path is global (e.g., `MyApp.fooController.bar`)
       instead of local (`foo.bar.baz`).
@@ -10649,9 +11147,6 @@ define("ember-metal/binding",
       @param {String} path
       @return Boolean
     */
-    function isGlobalPath(path) {
-      return IS_GLOBAL.test(path);
-    }
 
     function getWithGlobals(obj, path) {
       return get(isGlobalPath(path) ? Ember.lookup : obj, path);
@@ -10662,10 +11157,9 @@ define("ember-metal/binding",
     //
 
     function Binding(toPath, fromPath) {
-      this._direction = 'fwd';
+      this._direction = undefined;
       this._from = fromPath;
       this._to   = toPath;
-      this._directionMap = Map.create();
       this._readyToSync = undefined;
       this._oneWay = undefined;
     }
@@ -10766,7 +11260,8 @@ define("ember-metal/binding",
       */
       connect: function(obj) {
         
-        var fromPath = this._from, toPath = this._to;
+        var fromPath = this._from;
+        var toPath = this._to;
         trySet(obj, toPath, getWithGlobals(obj, fromPath));
 
         // add an observer on the object to be notified when the binding should be updated
@@ -10818,19 +11313,18 @@ define("ember-metal/binding",
       },
 
       _scheduleSync: function(obj, dir) {
-        var directionMap = this._directionMap;
-        var existingDir = directionMap.get(obj);
+        var existingDir = this._direction;
 
         // if we haven't scheduled the binding yet, schedule it
-        if (!existingDir) {
+        if (existingDir === undefined) {
           run.schedule('sync', this, this._sync, obj);
-          directionMap.set(obj, dir);
+          this._direction  = dir;
         }
 
         // If both a 'back' and 'fwd' sync have been scheduled on the same object,
         // default to a 'fwd' sync so that it remains deterministic.
         if (existingDir === 'back' && dir === 'fwd') {
-          directionMap.set(obj, 'fwd');
+          this._direction = 'fwd';
         }
       },
 
@@ -10842,12 +11336,12 @@ define("ember-metal/binding",
 
         // get the direction of the binding for the object we are
         // synchronizing from
-        var directionMap = this._directionMap;
-        var direction = directionMap.get(obj);
+        var direction = this._direction;
 
-        var fromPath = this._from, toPath = this._to;
+        var fromPath = this._from;
+        var toPath = this._to;
 
-        directionMap.remove(obj);
+        this._direction = undefined;
 
         // if we're synchronizing from the remote object...
         if (direction === 'fwd') {
@@ -10892,9 +11386,9 @@ define("ember-metal/binding",
         @method from
         @static
       */
-      from: function() {
-        var C = this, binding = new C();
-        return binding.from.apply(binding, arguments);
+      from: function(from) {
+        var C = this;
+        return new C(undefined, from);
       },
 
       /*
@@ -10903,9 +11397,9 @@ define("ember-metal/binding",
         @method to
         @static
       */
-      to: function() {
-        var C = this, binding = new C();
-        return binding.to.apply(binding, arguments);
+      to: function(to) {
+        var C = this;
+        return new C(to, undefined);
       },
 
       /**
@@ -10925,8 +11419,8 @@ define("ember-metal/binding",
         @return {Ember.Binding} `this`
       */
       oneWay: function(from, flag) {
-        var C = this, binding = new C(null, from);
-        return binding.oneWay(flag);
+        var C = this;
+        return new C(undefined, from).oneWay(flag);
       }
 
     });
@@ -11096,7 +11590,67 @@ define("ember-metal/binding",
     __exports__.oneWay = oneWay;__exports__.Binding = Binding;
     __exports__.isGlobalPath = isGlobalPath;
   });
-define("ember-metal/chains",
+enifed("ember-metal/cache",
+  ["ember-metal/dictionary","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var dictionary = __dependency1__["default"];
+    __exports__["default"] = Cache;
+
+    function Cache(limit, func) {
+      this.store  = dictionary(null);
+      this.size   = 0;
+      this.misses = 0;
+      this.hits   = 0;
+      this.limit  = limit;
+      this.func   = func;
+    }
+
+    var FALSE     = function() { };
+    var ZERO      = function() { };
+    var UNDEFINED = function() { };
+    var NULL      = function() { };
+
+    Cache.prototype = {
+      set: function(key, value) {
+        if (this.limit > this.size) {
+          this.size ++;
+          if (value === undefined) {
+            this.store[key] = UNDEFINED;
+          } else {
+            this.store[key] = value;
+          }
+        }
+
+        return value;
+      },
+
+      get: function(key) {
+        var value = this.store[key];
+
+        if (value === undefined) {
+          this.misses ++;
+          value = this.set(key, this.func(key));
+        } else if (value === UNDEFINED) {
+          this.hits ++;
+          value = undefined;
+        } else {
+          this.hits ++;
+          // nothing to translate
+        }
+
+        return value;
+      },
+
+      purge: function() {
+        this.store  = dictionary(null);
+        this.size   = 0;
+        this.hits   = 0;
+        this.misses = 0;
+      }
+    };
+  });
+enifed("ember-metal/chains",
   ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/array","ember-metal/watch_key","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -11105,14 +11659,13 @@ define("ember-metal/chains",
     var get = __dependency2__.get;
     var normalizeTuple = __dependency2__.normalizeTuple;
     var meta = __dependency3__.meta;
-    var META_KEY = __dependency3__.META_KEY;
     var forEach = __dependency4__.forEach;
     var watchKey = __dependency5__.watchKey;
     var unwatchKey = __dependency5__.unwatchKey;
 
-    var metaFor = meta,
-        warn = Ember.warn,
-        FIRST_KEY = /^([^\.]+)/;
+    var metaFor = meta;
+    var warn = Ember.warn;
+    var FIRST_KEY = /^([^\.]+)/;
 
     function firstKey(path) {
       return path.match(FIRST_KEY)[0];
@@ -11137,7 +11690,8 @@ define("ember-metal/chains",
     __exports__.flushPendingChains = flushPendingChains;function addChainWatcher(obj, keyName, node) {
       if (!obj || ('object' !== typeof obj)) { return; } // nothing to do
 
-      var m = metaFor(obj), nodes = m.chainWatchers;
+      var m = metaFor(obj);
+      var nodes = m.chainWatchers;
 
       if (!m.hasOwnProperty('chainWatchers')) {
         nodes = m.chainWatchers = {};
@@ -11151,7 +11705,7 @@ define("ember-metal/chains",
     function removeChainWatcher(obj, keyName, node) {
       if (!obj || 'object' !== typeof obj) { return; } // nothing to do
 
-      var m = obj[META_KEY];
+      var m = obj['__ember_meta__'];
       if (m && !m.hasOwnProperty('chainWatchers')) { return; } // nothing to do
 
       var nodes = m && m.chainWatchers;
@@ -11205,7 +11759,7 @@ define("ember-metal/chains",
     function lazyGet(obj, key) {
       if (!obj) return undefined;
 
-      var meta = obj[META_KEY];
+      var meta = obj['__ember_meta__'];
       // check if object meant only to be a prototype
       if (meta && meta.proto === obj) return undefined;
 
@@ -11242,8 +11796,10 @@ define("ember-metal/chains",
 
     // copies a top level object only
     ChainNodePrototype.copy = function(obj) {
-      var ret = new ChainNode(null, null, obj),
-          paths = this._paths, path;
+      var ret = new ChainNode(null, null, obj);
+      var paths = this._paths;
+      var path;
+
       for (path in paths) {
         if (paths[path] <= 0) { continue; } // this check will also catch non-number vals.
         ret.add(path);
@@ -11313,7 +11869,8 @@ define("ember-metal/chains",
     ChainNodePrototype.count = 0;
 
     ChainNodePrototype.chain = function(key, path, src) {
-      var chains = this._chains, node;
+      var chains = this._chains;
+      var node;
       if (!chains) { chains = this._chains = {}; }
 
       node = chains[key];
@@ -11329,7 +11886,8 @@ define("ember-metal/chains",
     };
 
     ChainNodePrototype.unchain = function(key, path) {
-      var chains = this._chains, node = chains[key];
+      var chains = this._chains;
+      var node = chains[key];
 
       // unchain rest of path first...
       if (path && path.length>1) {
@@ -11425,12 +11983,26 @@ define("ember-metal/chains",
 
     function finishChains(obj) {
       // We only create meta if we really have to
-      var m = obj[META_KEY], chains = m && m.chains;
-      if (chains) {
-        if (chains.value() !== obj) {
+      var m = obj['__ember_meta__'],
+        chains, chainWatchers, chainNodes;
+      if (m) {
+        // finish any current chains node watchers that reference obj
+        chainWatchers = m.chainWatchers;
+        if (chainWatchers) {
+          for(var key in chainWatchers) {
+            if (!chainWatchers.hasOwnProperty(key)) { continue; }
+            chainNodes = chainWatchers[key];
+            if (chainNodes) {
+              for (var i=0,l=chainNodes.length;i<l;i++) {
+                chainNodes[i].didChange(null);
+              }
+            }
+          }
+        }
+        // copy chains from prototype
+        chains = m.chains;
+        if (chains && chains.value() !== obj) {
           metaFor(obj).chains = chains = chains.copy(obj);
-        } else {
-          chains.didChange(null);
         }
       }
     }
@@ -11438,7 +12010,7 @@ define("ember-metal/chains",
     __exports__.finishChains = finishChains;__exports__.removeChainWatcher = removeChainWatcher;
     __exports__.ChainNode = ChainNode;
   });
-define("ember-metal/computed",
+enifed("ember-metal/computed",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/expand_properties","ember-metal/error","ember-metal/properties","ember-metal/property_events","ember-metal/dependent_keys","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -11446,7 +12018,6 @@ define("ember-metal/computed",
     var get = __dependency2__.get;
     var set = __dependency3__.set;
     var meta = __dependency4__.meta;
-    var META_KEY = __dependency4__.META_KEY;
     var inspect = __dependency4__.inspect;
     var expandProperties = __dependency5__["default"];
     var EmberError = __dependency6__["default"];
@@ -11463,8 +12034,8 @@ define("ember-metal/computed",
 
     
 
-    var metaFor = meta,
-        a_slice = [].slice;
+    var metaFor = meta;
+    var a_slice = [].slice;
 
     function UNDEFINED() { }
 
@@ -11796,81 +12367,124 @@ define("ember-metal/computed",
       Generally speaking if you intend for your computed property to be set
       your backing function should accept either two or three arguments.
 
+      ```javascript
+      var Person = Ember.Object.extend({
+        // these will be supplied by `create`
+        firstName: null,
+        lastName: null,
+
+        fullName: function(key, value, oldValue) {
+          // getter
+          if (arguments.length === 1) {
+            var firstName = this.get('firstName');
+            var lastName = this.get('lastName');
+
+            return firstName + ' ' + lastName;
+
+          // setter
+          } else {
+            var name = value.split(' ');
+
+            this.set('firstName', name[0]);
+            this.set('lastName', name[1]);
+
+            return value;
+          }
+        }.property('firstName', 'lastName')
+      });
+
+      var person = Person.create();
+
+      person.set('fullName', 'Peter Wagenet');
+      person.get('firstName'); // 'Peter'
+      person.get('lastName');  // 'Wagenet'
+      ```
+
       @method set
       @param {String} keyName The key being accessed.
       @param {Object} newValue The new value being assigned.
       @param {String} oldValue The old value being replaced.
       @return {Object} The return value of the function backing the CP.
     */
-    ComputedPropertyPrototype.set = function(obj, keyName, value) {
-      var cacheable = this._cacheable,
-          func = this.func,
-          meta = metaFor(obj, cacheable),
-          oldSuspended = this._suspended,
-          hadCachedValue = false,
-          cache = meta.cache,
-          funcArgLength, cachedValue, ret;
+    ComputedPropertyPrototype.set = function computedPropertySetWithSuspend(obj, keyName, value) {
+      var oldSuspended = this._suspended;
+
+      this._suspended = obj;
+
+      try {
+        this._set(obj, keyName, value);
+      } finally {
+        this._suspended = oldSuspended;
+      }
+    };
+
+    ComputedPropertyPrototype._set = function computedPropertySet(obj, keyName, value) {
+      var cacheable      = this._cacheable;
+      var func           = this.func;
+      var meta           = metaFor(obj, cacheable);
+      var cache          = meta.cache;
+      var hadCachedValue = false;
+
+      var funcArgLength, cachedValue, ret;
 
       if (this._readOnly) {
         throw new EmberError('Cannot set read-only property "' + keyName + '" on object: ' + inspect(obj));
       }
 
-      this._suspended = obj;
-
-      try {
-
-        if (cacheable && cache[keyName] !== undefined) {
-          if(cache[keyName] !== UNDEFINED) {
-            cachedValue = cache[keyName];
-          }
-
-          hadCachedValue = true;
+      if (cacheable && cache[keyName] !== undefined) {
+        if(cache[keyName] !== UNDEFINED) {
+          cachedValue = cache[keyName];
         }
 
-        // Check if the CP has been wrapped. If it has, use the
-        // length from the wrapped function.
-
-        funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
-
-        // For backwards-compatibility with computed properties
-        // that check for arguments.length === 2 to determine if
-        // they are being get or set, only pass the old cached
-        // value if the computed property opts into a third
-        // argument.
-        if (funcArgLength === 3) {
-          ret = func.call(obj, keyName, value, cachedValue);
-        } else if (funcArgLength === 2) {
-          ret = func.call(obj, keyName, value);
-        } else {
-          defineProperty(obj, keyName, null, cachedValue);
-          set(obj, keyName, value);
-          return;
-        }
-
-        if (hadCachedValue && cachedValue === ret) { return; }
-
-        var watched = meta.watching[keyName];
-        if (watched) { propertyWillChange(obj, keyName); }
-
-        if (hadCachedValue) {
-          cache[keyName] = undefined;
-        }
-
-        if (cacheable) {
-          if (!hadCachedValue) {
-            addDependentKeys(this, obj, keyName, meta);
-          }
-          if (ret === undefined) {
-            cache[keyName] = UNDEFINED;
-          } else {
-            cache[keyName] = ret;
-          }
-        }
-
-        if (watched) { propertyDidChange(obj, keyName); }
-      } finally {
-        this._suspended = oldSuspended;
+        hadCachedValue = true;
       }
+
+      // Check if the CP has been wrapped. If it has, use the
+      // length from the wrapped function.
+
+      funcArgLength = func.wrappedFunction ? func.wrappedFunction.__ember_arity__ : func.__ember_arity__;
+
+      // For backwards-compatibility with computed properties
+      // that check for arguments.length === 2 to determine if
+      // they are being get or set, only pass the old cached
+      // value if the computed property opts into a third
+      // argument.
+      if (funcArgLength === 3) {
+        ret = func.call(obj, keyName, value, cachedValue);
+      } else if (funcArgLength === 2) {
+        ret = func.call(obj, keyName, value);
+      } else {
+        defineProperty(obj, keyName, null, cachedValue);
+        set(obj, keyName, value);
+        return;
+      }
+
+      if (hadCachedValue && cachedValue === ret) { return; }
+
+      var watched = meta.watching[keyName];
+      if (watched) {
+        propertyWillChange(obj, keyName);
+      }
+
+      if (hadCachedValue) {
+        cache[keyName] = undefined;
+      }
+
+      if (cacheable) {
+        if (!hadCachedValue) {
+          addDependentKeys(this, obj, keyName, meta);
+        }
+        if (ret === undefined) {
+          cache[keyName] = UNDEFINED;
+        } else {
+          cache[keyName] = ret;
+        }
+      }
+
+      if (watched) {
+        propertyDidChange(obj, keyName);
+      }
+
       return ret;
     };
 
@@ -11897,9 +12511,45 @@ define("ember-metal/computed",
       The function should accept two parameters, key and value. If value is not
       undefined you should set the value first. In either case return the
       current value of the property.
+      
+      A computed property defined in this way might look like this:
+
+      ```js
+      var Person = Ember.Object.extend({
+        firstName: 'Betty',
+        lastName: 'Jones',
+
+        fullName: Ember.computed('firstName', 'lastName', function(key, value) {
+          return this.get('firstName') + ' ' + this.get('lastName');
+        })
+      });
+
+      var client = Person.create();
+
+      client.get('fullName'); // 'Betty Jones'
+      
+      client.set('lastName', 'Fuller');
+      client.get('fullName'); // 'Betty Fuller'
+      ```
+
+      _Note: This is the prefered way to define computed properties when writing third-party
+      libraries that depend on or use Ember, since there is no guarantee that the user
+      will have prototype extensions enabled._
+
+      You might use this method if you disabled
+      [Prototype Extensions](http://emberjs.com/guides/configuring-ember/disabling-prototype-extensions/).
+      The alternative syntax might look like this
+      (if prototype extensions are enabled, which is the default behavior):
+
+      ```js
+      fullName: function () {
+        return this.get('firstName') + ' ' + this.get('lastName');
+      }.property('firstName', 'lastName')
+      ```
 
       @method computed
       @for Ember
+      @param {String} [dependentKeys*] Optional dependent keys that trigger this computed property.
       @param {Function} func The computed property function.
       @return {Ember.ComputedProperty} property descriptor instance
     */
@@ -11938,9 +12588,9 @@ define("ember-metal/computed",
       @return {Object} the cached value
     */
     function cacheFor(obj, key) {
-      var meta = obj[META_KEY],
-          cache = meta && meta.cache,
-          ret = cache && cache[key];
+      var meta = obj['__ember_meta__'];
+      var cache = meta && meta.cache;
+      var ret = cache && cache[key];
 
       if (ret === UNDEFINED) { return undefined; }
       return ret;
@@ -11968,7 +12618,7 @@ define("ember-metal/computed",
     __exports__.computed = computed;
     __exports__.cacheFor = cacheFor;
   });
-define("ember-metal/computed_macros",
+enifed("ember-metal/computed_macros",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_empty","ember-metal/is_none","ember-metal/alias"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__) {
     "use strict";
@@ -12232,7 +12882,7 @@ define("ember-metal/computed_macros",
     });
 
     /**
-      A computed property that returns true if the provied dependent property
+      A computed property that returns true if the provided dependent property
       is greater than the provided value.
 
       Example
@@ -12256,7 +12906,7 @@ define("ember-metal/computed_macros",
       @param {String} dependentKey
       @param {Number} value
       @return {Ember.ComputedProperty} computed property which returns true if
-      the original value for property is greater then given value.
+      the original value for property is greater than given value.
     */
     registerComputed('gt', function(dependentKey, value) {
       return get(this, dependentKey) > value;
@@ -12349,7 +12999,7 @@ define("ember-metal/computed_macros",
       @param {String} dependentKey
       @param {Number} value
       @return {Ember.ComputedProperty} computed property which returns true if
-      the original value for property is less or equal then given value.
+      the original value for property is less or equal than given value.
     */
     registerComputed('lte', function(dependentKey, value) {
       return get(this, dependentKey) <= value;
@@ -12479,7 +13129,7 @@ define("ember-metal/computed_macros",
       @for Ember
       @param {String} dependentKey*
       @return {Ember.ComputedProperty} computed property which maps
-      values of all passed properties in to an array.
+      values of all passed in properties to an array.
     */
     registerComputedWithProperties('collect', function(properties) {
       var res = [];
@@ -12559,19 +13209,17 @@ define("ember-metal/computed_macros",
       return alias(dependentKey).oneWay();
     };
 
-    
-      /**
-        This is a more semantically meaningful alias of `computed.oneWay`,
-        whose name is somewhat ambiguous as to which direction the data flows.
+    /**
+      This is a more semantically meaningful alias of `computed.oneWay`,
+      whose name is somewhat ambiguous as to which direction the data flows.
 
-        @method computed.reads
-        @for Ember
-        @param {String} dependentKey
-        @return {Ember.ComputedProperty} computed property which creates a
-          one way computed property to the original value for property.
-       */
-      computed.reads = computed.oneWay;
-    
+      @method computed.reads
+      @for Ember
+      @param {String} dependentKey
+      @return {Ember.ComputedProperty} computed property which creates a
+        one way computed property to the original value for property.
+     */
+    computed.reads = computed.oneWay;
 
     /**
       Where `computed.oneWay` provides oneWay bindings, `computed.readOnly` provides
@@ -12635,10 +13283,12 @@ define("ember-metal/computed_macros",
       @param {String} defaultPath
       @return {Ember.ComputedProperty} computed property which acts like
       a standard getter and setter, but defaults to the value from `defaultPath`.
+      @deprecated Use `Ember.computed.oneWay` or custom CP with default instead.
     */
     // ES6TODO: computed should have its own export path so you can do import {defaultTo} from computed
     computed.defaultTo = function(defaultPath) {
       return computed(function(key, newValue, cachedValue) {
+        
         if (arguments.length === 1) {
           return get(this, defaultPath);
         }
@@ -12671,7 +13321,7 @@ define("ember-metal/computed_macros",
       });
     };
   });
-define("ember-metal/core",
+enifed("ember-metal/core",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -12699,7 +13349,7 @@ define("ember-metal/core",
 
       @class Ember
       @static
-      @version 1.7.1
+      @version 1.8.1
     */
 
     if ('undefined' === typeof Ember) {
@@ -12726,10 +13376,10 @@ define("ember-metal/core",
     /**
       @property VERSION
       @type String
-      @default '1.7.1'
+      @default '1.8.1'
       @static
     */
-    Ember.VERSION = '1.7.1';
+    Ember.VERSION = '1.8.1';
 
     /**
       Standard environmental variables. You can define these in a global `EmberENV`
@@ -12886,15 +13536,15 @@ define("ember-metal/core",
 
     __exports__["default"] = Ember;
   });
-define("ember-metal/dependent_keys",
+enifed("ember-metal/dependent_keys",
   ["ember-metal/platform","ember-metal/watching","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
-        // Remove "use strict"; from transpiled module (in browser builds only) until
+        // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
     //
     // REMOVE_USE_STRICT: true
 
-    var create = __dependency1__.create;
+    var o_create = __dependency1__.create;
     var watch = __dependency2__.watch;
     var unwatch = __dependency2__.unwatch;
 
@@ -12902,8 +13552,6 @@ define("ember-metal/dependent_keys",
     @module ember-metal
     */
 
-    var o_create = create;
-
     // ..........................................................
     // DEPENDENT KEYS
     //
@@ -12977,7 +13625,68 @@ define("ember-metal/dependent_keys",
 
     __exports__.removeDependentKeys = removeDependentKeys;
   });
-define("ember-metal/enumerable_utils",
+enifed("ember-metal/deprecate_property",
+  ["ember-metal/core","ember-metal/platform","ember-metal/properties","ember-metal/property_get","ember-metal/property_set","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+    "use strict";
+    /**
+    @module ember-metal
+    */
+
+    var Ember = __dependency1__["default"];
+    var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
+    var defineProperty = __dependency3__.defineProperty;
+    var get = __dependency4__.get;
+    var set = __dependency5__.set;
+
+
+    /**
+      Used internally to allow changing properties in a backwards compatible way, and print a helpful
+      deprecation warning.
+
+      @method deprecateProperty
+      @param {Object} object The object to add the deprecated property to.
+      @param {String} deprecatedKey The property to add (and print deprecation warnings upon accessing).
+      @param {String} newKey The property that will be aliased.
+      @private
+      @since 1.7.0
+    */
+
+    function deprecateProperty(object, deprecatedKey, newKey) {
+      function deprecate() {
+              }
+
+      if (hasPropertyAccessors) {
+        defineProperty(object, deprecatedKey, {
+            configurable: true,
+            enumerable: false,
+            set: function(value) { deprecate(); set(this, newKey, value); },
+            get: function() { deprecate(); return get(this, newKey); }
+        });
+      }
+    }
+
+    __exports__.deprecateProperty = deprecateProperty;
+  });
+enifed("ember-metal/dictionary",
+  ["ember-metal/platform","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var create = __dependency1__.create;
+
+    // the delete is meant to hint at runtimes that this object should remain in
+    // dictionary mode. This is clearly a runtime specific hack, but currently it
+    // appears worthwile in some usecases. Please note, these deletes do increase
+    // the cost of creation dramatically over a plain Object.create. And as this
+    // only makes sense for long-lived dictionaries that aren't instantiated often.
+    __exports__["default"] = function makeDictionary(parent) {
+      var dict = create(parent);
+      dict['_dict'] = null;
+      delete dict['_dict'];
+      return dict;
+    }
+  });
+enifed("ember-metal/enumerable_utils",
   ["ember-metal/array","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -13009,7 +13718,7 @@ define("ember-metal/enumerable_utils",
      * @return {Array} An array of mapped values.
      */
     function map(obj, callback, thisArg) {
-      return obj.map ? obj.map.call(obj, callback, thisArg) : _map.call(obj, callback, thisArg);
+      return obj.map ? obj.map(callback, thisArg) : _map.call(obj, callback, thisArg);
     }
 
     __exports__.map = map;/**
@@ -13023,7 +13732,7 @@ define("ember-metal/enumerable_utils",
      *
      */
     function forEach(obj, callback, thisArg) {
-      return obj.forEach ? obj.forEach.call(obj, callback, thisArg) : a_forEach.call(obj, callback, thisArg);
+      return obj.forEach ? obj.forEach(callback, thisArg) : a_forEach.call(obj, callback, thisArg);
     }
 
     __exports__.forEach = forEach;/**
@@ -13039,7 +13748,7 @@ define("ember-metal/enumerable_utils",
      * @since 1.4.0
      */
     function filter(obj, callback, thisArg) {
-      return obj.filter ? obj.filter.call(obj, callback, thisArg) : _filter.call(obj, callback, thisArg);
+      return obj.filter ? obj.filter(callback, thisArg) : _filter.call(obj, callback, thisArg);
     }
 
     __exports__.filter = filter;/**
@@ -13053,7 +13762,7 @@ define("ember-metal/enumerable_utils",
      *
      */
     function indexOf(obj, element, index) {
-      return obj.indexOf ? obj.indexOf.call(obj, element, index) : _indexOf.call(obj, element, index);
+      return obj.indexOf ? obj.indexOf(element, index) : _indexOf.call(obj, element, index);
     }
 
     __exports__.indexOf = indexOf;/**
@@ -13112,9 +13821,13 @@ define("ember-metal/enumerable_utils",
     }
 
     __exports__.removeObject = removeObject;function _replace(array, idx, amt, objects) {
-      var args = [].concat(objects), chunk, ret = [],
-          // https://code.google.com/p/chromium/issues/detail?id=56588
-          size = 60000, start = idx, ends = amt, count;
+      var args = [].concat(objects);
+      var ret = [];
+      // https://code.google.com/p/chromium/issues/detail?id=56588
+      var size = 60000;
+      var start = idx;
+      var ends = amt;
+      var count, chunk;
 
       while (args.length) {
         count = ends > size ? size : ends;
@@ -13213,7 +13926,7 @@ define("ember-metal/enumerable_utils",
       replace: replace
     };
   });
-define("ember-metal/error",
+enifed("ember-metal/error",
   ["ember-metal/platform","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -13260,7 +13973,7 @@ define("ember-metal/error",
 
     __exports__["default"] = EmberError;
   });
-define("ember-metal/events",
+enifed("ember-metal/events",
   ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -13273,16 +13986,17 @@ define("ember-metal/events",
     */
     var Ember = __dependency1__["default"];
     var meta = __dependency2__.meta;
-    var META_KEY = __dependency2__.META_KEY;
     var tryFinally = __dependency2__.tryFinally;
     var apply = __dependency2__.apply;
     var applyStr = __dependency2__.applyStr;
     var create = __dependency3__.create;
 
-    var a_slice = [].slice,
-        metaFor = meta,
-        /* listener flags */
-        ONCE = 1, SUSPENDED = 2;
+    var a_slice = [].slice;
+    var metaFor = meta;
+
+    /* listener flags */
+    var ONCE = 1;
+    var SUSPENDED = 2;
 
 
     /*
@@ -13317,8 +14031,8 @@ define("ember-metal/events",
     }
 
     function actionsFor(obj, eventName) {
-      var meta = metaFor(obj, true),
-          actions;
+      var meta = metaFor(obj, true);
+      var actions;
 
       if (!meta.listeners) { meta.listeners = {}; }
 
@@ -13340,15 +14054,15 @@ define("ember-metal/events",
     }
 
     function listenersUnion(obj, eventName, otherActions) {
-      var meta = obj[META_KEY],
-          actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj['__ember_meta__'];
+      var actions = meta && meta.listeners && meta.listeners[eventName];
 
       if (!actions) { return; }
       for (var i = actions.length - 3; i >= 0; i -= 3) {
-        var target = actions[i],
-            method = actions[i+1],
-            flags = actions[i+2],
-            actionIndex = indexOf(otherActions, target, method);
+        var target = actions[i];
+        var method = actions[i+1];
+        var flags = actions[i+2];
+        var actionIndex = indexOf(otherActions, target, method);
 
         if (actionIndex === -1) {
           otherActions.push(target, method, flags);
@@ -13357,16 +14071,16 @@ define("ember-metal/events",
     }
 
     __exports__.listenersUnion = listenersUnion;function listenersDiff(obj, eventName, otherActions) {
-      var meta = obj[META_KEY],
-          actions = meta && meta.listeners && meta.listeners[eventName],
-          diffActions = [];
+      var meta = obj['__ember_meta__'];
+      var actions = meta && meta.listeners && meta.listeners[eventName];
+      var diffActions = [];
 
       if (!actions) { return; }
       for (var i = actions.length - 3; i >= 0; i -= 3) {
-        var target = actions[i],
-            method = actions[i+1],
-            flags = actions[i+2],
-            actionIndex = indexOf(otherActions, target, method);
+        var target = actions[i];
+        var method = actions[i+1];
+        var flags = actions[i+2];
+        var actionIndex = indexOf(otherActions, target, method);
 
         if (actionIndex !== -1) { continue; }
 
@@ -13395,9 +14109,9 @@ define("ember-metal/events",
         target = null;
       }
 
-      var actions = actionsFor(obj, eventName),
-          actionIndex = indexOf(actions, target, method),
-          flags = 0;
+      var actions = actionsFor(obj, eventName);
+      var actionIndex = indexOf(actions, target, method);
+      var flags = 0;
 
       if (once) flags |= ONCE;
 
@@ -13430,8 +14144,8 @@ define("ember-metal/events",
       }
 
       function _removeListener(target, method) {
-        var actions = actionsFor(obj, eventName),
-            actionIndex = indexOf(actions, target, method);
+        var actions = actionsFor(obj, eventName);
+        var actionIndex = indexOf(actions, target, method);
 
         // action doesn't exist, give up silently
         if (actionIndex === -1) { return; }
@@ -13446,8 +14160,8 @@ define("ember-metal/events",
       if (method) {
         _removeListener(target, method);
       } else {
-        var meta = obj[META_KEY],
-            actions = meta && meta.listeners && meta.listeners[eventName];
+        var meta = obj['__ember_meta__'];
+        var actions = meta && meta.listeners && meta.listeners[eventName];
 
         if (!actions) { return; }
         for (var i = actions.length - 3; i >= 0; i -= 3) {
@@ -13480,8 +14194,8 @@ define("ember-metal/events",
         target = null;
       }
 
-      var actions = actionsFor(obj, eventName),
-          actionIndex = indexOf(actions, target, method);
+      var actions = actionsFor(obj, eventName);
+      var actionIndex = indexOf(actions, target, method);
 
       if (actionIndex !== -1) {
         actions[actionIndex+2] |= SUSPENDED; // mark the action as suspended
@@ -13512,9 +14226,9 @@ define("ember-metal/events",
         target = null;
       }
 
-      var suspendedActions = [],
-          actionsList = [],
-          eventName, actions, i, l;
+      var suspendedActions = [];
+      var actionsList = [];
+      var eventName, actions, i, l;
 
       for (i=0, l=eventNames.length; i<l; i++) {
         eventName = eventNames[i];
@@ -13549,7 +14263,7 @@ define("ember-metal/events",
       @param obj
     */
     function watchedEvents(obj) {
-      var listeners = obj[META_KEY].listeners, ret = [];
+      var listeners = obj['__ember_meta__'].listeners, ret = [];
 
       if (listeners) {
         for(var eventName in listeners) {
@@ -13580,7 +14294,7 @@ define("ember-metal/events",
       }
 
       if (!actions) {
-        var meta = obj[META_KEY];
+        var meta = obj['__ember_meta__'];
         actions = meta && meta.listeners && meta.listeners[eventName];
       }
 
@@ -13617,8 +14331,8 @@ define("ember-metal/events",
       @param {String} eventName
     */
     function hasListeners(obj, eventName) {
-      var meta = obj[META_KEY],
-          actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj['__ember_meta__'];
+      var actions = meta && meta.listeners && meta.listeners[eventName];
 
       return !!(actions && actions.length);
     }
@@ -13632,14 +14346,14 @@ define("ember-metal/events",
     */
     function listenersFor(obj, eventName) {
       var ret = [];
-      var meta = obj[META_KEY],
-          actions = meta && meta.listeners && meta.listeners[eventName];
+      var meta = obj['__ember_meta__'];
+      var actions = meta && meta.listeners && meta.listeners[eventName];
 
       if (!actions) { return ret; }
 
       for (var i = 0, l = actions.length; i < l; i += 3) {
-        var target = actions[i],
-            method = actions[i+1];
+        var target = actions[i];
+        var method = actions[i+1];
         ret.push([target, method]);
       }
 
@@ -13670,58 +14384,68 @@ define("ember-metal/events",
       @return func
     */
     function on(){
-      var func = a_slice.call(arguments, -1)[0],
-          events = a_slice.call(arguments, 0, -1);
+      var func = a_slice.call(arguments, -1)[0];
+      var events = a_slice.call(arguments, 0, -1);
       func.__ember_listens__ = events;
       return func;
     }
 
     __exports__.on = on;__exports__.removeListener = removeListener;
   });
-define("ember-metal/expand_properties",
-  ["ember-metal/error","ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-metal/expand_properties",
+  ["ember-metal/core","ember-metal/error","ember-metal/enumerable_utils","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var EmberError = __dependency1__["default"];
-    var forEach = __dependency2__.forEach;
+    var Ember = __dependency1__["default"];
+    var EmberError = __dependency2__["default"];
+    var forEach = __dependency3__.forEach;
 
     /**
       @module ember-metal
       */
 
     var BRACE_EXPANSION = /^((?:[^\.]*\.)*)\{(.*)\}$/;
+    var SPLIT_REGEX = /\{|\}/;
 
     /**
       Expands `pattern`, invoking `callback` for each expansion.
 
       The only pattern supported is brace-expansion, anything else will be passed
-      once to `callback` directly. Brace expansion can only appear at the end of a
-      pattern, for an example see the last call below.
+      once to `callback` directly.
 
       Example
+
       ```js
       function echo(arg){ console.log(arg); }
 
-      Ember.expandProperties('foo.bar', echo);        //=> 'foo.bar'
-      Ember.expandProperties('{foo,bar}', echo);      //=> 'foo', 'bar'
-      Ember.expandProperties('foo.{bar,baz}', echo);  //=> 'foo.bar', 'foo.baz'
-      Ember.expandProperties('{foo,bar}.baz', echo);  //=> '{foo,bar}.baz'
+      Ember.expandProperties('foo.bar', echo);              //=> 'foo.bar'
+      Ember.expandProperties('{foo,bar}', echo);            //=> 'foo', 'bar'
+      Ember.expandProperties('foo.{bar,baz}', echo);        //=> 'foo.bar', 'foo.baz'
+      Ember.expandProperties('{foo,bar}.baz', echo);        //=> '{foo,bar}.baz'
+      Ember.expandProperties('foo.{bar,baz}.@each', echo)   //=> 'foo.bar.@each', 'foo.baz.@each'
+      Ember.expandProperties('{foo,bar}.{spam,eggs}', echo) //=> 'foo.spam', 'foo.eggs', 'bar.spam', 'bar.eggs'
+      Ember.expandProperties('{foo}.bar.{baz}')             //=> 'foo.bar.baz'
       ```
 
       @method
       @private
-      @param {string} pattern The property pattern to expand.
-      @param {function} callback The callback to invoke.  It is invoked once per
+      @param {String} pattern The property pattern to expand.
+      @param {Function} callback The callback to invoke.  It is invoked once per
       expansion, and is passed the expansion.
       */
     __exports__["default"] = function expandProperties(pattern, callback) {
-      var match, prefix, list;
-
       if (pattern.indexOf(' ') > -1) {
-        throw new EmberError('Brace expanded properties cannot contain spaces, ' + 
+        throw new EmberError('Brace expanded properties cannot contain spaces, ' +
           'e.g. `user.{firstName, lastName}` should be `user.{firstName,lastName}`');
       }
 
+      
+        return newExpandProperties(pattern, callback);
+          }
+
+    function oldExpandProperties(pattern, callback) {
+      var match, prefix, list;
+
       if (match = BRACE_EXPANSION.exec(pattern)) {
         prefix = match[1];
         list = match[2];
@@ -13733,8 +14457,41 @@ define("ember-metal/expand_properties",
         callback(pattern);
       }
     }
+
+    function newExpandProperties(pattern, callback) {
+      if ('string' === Ember.typeOf(pattern)) {
+        var parts = pattern.split(SPLIT_REGEX);
+        var properties = [parts];
+
+        forEach(parts, function(part, index) {
+          if (part.indexOf(',') >= 0) {
+            properties = duplicateAndReplace(properties, part.split(','), index);
+          }
+        });
+
+        forEach(properties, function(property) {
+          callback(property.join(''));
+        });
+      } else {
+        callback(pattern);
+      }
+    }
+
+    function duplicateAndReplace(properties, currentParts, index) {
+      var all = [];
+
+      forEach(properties, function(property) {
+        forEach(currentParts, function(part) {
+          var current = property.slice(0);
+          current[index] = part;
+          all.push(current);
+        });
+      });
+
+      return all;
+    }
   });
-define("ember-metal/get_properties",
+enifed("ember-metal/get_properties",
   ["ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -13763,9 +14520,9 @@ define("ember-metal/get_properties",
       @return {Hash}
     */
     __exports__["default"] = function getProperties(obj) {
-      var ret = {},
-          propertyNames = arguments,
-          i = 1;
+      var ret = {};
+      var propertyNames = arguments;
+      var i = 1;
 
       if (arguments.length === 2 && typeOf(arguments[1]) === 'array') {
         i = 0;
@@ -13777,7 +14534,7 @@ define("ember-metal/get_properties",
       return ret;
     }
   });
-define("ember-metal/instrumentation",
+enifed("ember-metal/instrumentation",
   ["ember-metal/core","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -13830,10 +14587,12 @@ define("ember-metal/instrumentation",
       @namespace Ember
       @static
     */
-    var subscribers = [], cache = {};
+    var subscribers = [];
+    __exports__.subscribers = subscribers;var cache = {};
 
     var populateListeners = function(name) {
-      var listeners = [], subscriber;
+      var listeners = [];
+      var subscriber;
 
       for (var i=0, l=subscribers.length; i<l; i++) {
         subscriber = subscribers[i];
@@ -13864,56 +14623,72 @@ define("ember-metal/instrumentation",
       @param {Function} callback Function that you're instrumenting.
       @param {Object} binding Context that instrument function is called with.
     */
-    function instrument(name, payload, callback, binding) {
-      var listeners = cache[name], timeName, ret;
-
-      // ES6TODO: Docs. What is this?
-      if (Ember.STRUCTURED_PROFILE) {
-        timeName = name + ": " + payload.object;
-        console.time(timeName);
+    function instrument(name, _payload, callback, binding) {
+      if (subscribers.length === 0) {
+        return callback.call(binding);
       }
+      var payload = _payload || {};
+      var finalizer = _instrumentStart(name, function () {
+        return payload;
+      });
+      if (finalizer) {
+        var tryable = function _instrumenTryable() {
+          return callback.call(binding);
+        };
+        var catchable = function _instrumentCatchable(e) {
+          payload.exception = e;
+        };
+        return tryCatchFinally(tryable, catchable, finalizer);
+      } else {
+        return callback.call(binding);
+      }
+    }
+
+    __exports__.instrument = instrument;// private for now
+    function _instrumentStart(name, _payload) {
+      var listeners = cache[name];
 
       if (!listeners) {
         listeners = populateListeners(name);
       }
 
       if (listeners.length === 0) {
-        ret = callback.call(binding);
-        if (Ember.STRUCTURED_PROFILE) { console.timeEnd(timeName); }
-        return ret;
+        return;
       }
 
-      var beforeValues = [], listener, i, l;
+      var payload = _payload();
 
-      function tryable() {
+      var STRUCTURED_PROFILE = Ember.STRUCTURED_PROFILE;
+      var timeName;
+      if (STRUCTURED_PROFILE) {
+        timeName = name + ": " + payload.object;
+        console.time(timeName);
+      }
+
+      var l = listeners.length;
+      var beforeValues = new Array(l);
+      var i, listener;
+      var timestamp = time();
+      for (i=0; i<l; i++) {
+        listener = listeners[i];
+        beforeValues[i] = listener.before(name, timestamp, payload);
+      }
+
+      return function _instrumentEnd() {
+        var i, l, listener;
+        var timestamp = time();
         for (i=0, l=listeners.length; i<l; i++) {
           listener = listeners[i];
-          beforeValues[i] = listener.before(name, time(), payload);
+          listener.after(name, timestamp, payload, beforeValues[i]);
         }
 
-        return callback.call(binding);
-      }
-
-      function catchable(e) {
-        payload = payload || {};
-        payload.exception = e;
-      }
-
-      function finalizer() {
-        for (i=0, l=listeners.length; i<l; i++) {
-          listener = listeners[i];
-          listener.after(name, time(), payload, beforeValues[i]);
-        }
-
-        if (Ember.STRUCTURED_PROFILE) {
+        if (STRUCTURED_PROFILE) {
           console.timeEnd(timeName);
         }
-      }
-
-      return tryCatchFinally(tryable, catchable, finalizer);
+      };
     }
 
-    __exports__.instrument = instrument;/**
+    __exports__._instrumentStart = _instrumentStart;/**
       Subscribes to a particular event or instrumented block of code.
 
       @method subscribe
@@ -13979,13 +14754,13 @@ define("ember-metal/instrumentation",
       @namespace Ember.Instrumentation
     */
     function reset() {
-      subscribers = [];
+      subscribers.length = 0;
       cache = {};
     }
 
     __exports__.reset = reset;
   });
-define("ember-metal/is_blank",
+enifed("ember-metal/is_blank",
   ["ember-metal/core","ember-metal/is_empty","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14020,7 +14795,7 @@ define("ember-metal/is_blank",
       return isEmpty(obj) || (typeof obj === 'string' && obj.match(/\S/) === null);
     }
   });
-define("ember-metal/is_empty",
+enifed("ember-metal/is_empty",
   ["ember-metal/core","ember-metal/property_get","ember-metal/is_none","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -14033,7 +14808,7 @@ define("ember-metal/is_empty",
       Verifies that a value is `null` or an empty string, empty array,
       or empty function.
 
-      Constrains the rules on `Ember.isNone` by returning false for empty
+      Constrains the rules on `Ember.isNone` by returning true for empty
       string and empty arrays.
 
       ```javascript
@@ -14052,7 +14827,36 @@ define("ember-metal/is_empty",
       @return {Boolean}
     */
     function isEmpty(obj) {
-      return isNone(obj) || (obj.length === 0 && typeof obj !== 'function') || (typeof obj === 'object' && get(obj, 'length') === 0);
+      var none = isNone(obj);
+      if (none) {
+        return none;
+      }
+
+      if (typeof obj.size === 'number') {
+        return !obj.size;
+      }
+
+      var objectType = typeof obj;
+
+      if (objectType === 'object') {
+        var size = get(obj, 'size');
+        if (typeof size === 'number') {
+          return !size;
+        }
+      }
+
+      if (typeof obj.length === 'number' && objectType !== 'function') {
+        return !obj.length;
+      }
+
+      if (objectType === 'object') {
+        var length = get(obj, 'length');
+        if (typeof length === 'number') {
+          return !length;
+        }
+      }
+
+      return false;
     }
 
     var empty = Ember.deprecateFunc("Ember.empty is deprecated. Please use Ember.isEmpty instead.", isEmpty);
@@ -14061,7 +14865,7 @@ define("ember-metal/is_empty",
     __exports__.isEmpty = isEmpty;
     __exports__.empty = empty;
   });
-define("ember-metal/is_none",
+enifed("ember-metal/is_none",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -14096,7 +14900,109 @@ define("ember-metal/is_none",
     __exports__["default"] = isNone;
     __exports__.isNone = isNone;
   });
-define("ember-metal/libraries",
+enifed("ember-metal/is_present",
+  ["ember-metal/is_blank","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var isBlank = __dependency1__["default"];
+    var isPresent;
+
+    
+      /**
+        A value is present if it not `isBlank`.
+
+        ```javascript
+        Ember.isPresent();                // false
+        Ember.isPresent(null);            // false
+        Ember.isPresent(undefined);       // false
+        Ember.isPresent('');              // false
+        Ember.isPresent([]);              // false
+        Ember.isPresent('\n\t');          // false
+        Ember.isPresent('  ');            // false
+        Ember.isPresent({});              // true
+        Ember.isPresent('\n\t Hello');    // true
+        Ember.isPresent('Hello world');   // true
+        Ember.isPresent([1,2,3]);         // true
+        ```
+
+        @method isPresent
+        @for Ember
+        @param {Object} obj Value to test
+        @return {Boolean}
+        @since 1.7.0
+        */
+      isPresent = function isPresent(obj) {
+        return !isBlank(obj);
+      };
+    
+
+    __exports__["default"] = isPresent;
+  });
+enifed("ember-metal/keys",
+  ["ember-metal/platform","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var canDefineNonEnumerableProperties = __dependency1__.canDefineNonEnumerableProperties;
+
+    /**
+      Returns all of the keys defined on an object or hash. This is useful
+      when inspecting objects for debugging. On browsers that support it, this
+      uses the native `Object.keys` implementation.
+
+      @method keys
+      @for Ember
+      @param {Object} obj
+      @return {Array} Array containing keys of obj
+    */
+    var keys = Object.keys;
+
+    if (!keys || !canDefineNonEnumerableProperties) {
+      // modified from
+      // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys
+      keys = (function () {
+        var hasOwnProperty = Object.prototype.hasOwnProperty,
+            hasDontEnumBug = !({toString: null}).propertyIsEnumerable('toString'),
+            dontEnums = [
+              'toString',
+              'toLocaleString',
+              'valueOf',
+              'hasOwnProperty',
+              'isPrototypeOf',
+              'propertyIsEnumerable',
+              'constructor'
+            ],
+            dontEnumsLength = dontEnums.length;
+
+        return function keys(obj) {
+          if (typeof obj !== 'object' && (typeof obj !== 'function' || obj === null)) {
+            throw new TypeError('Object.keys called on non-object');
+          }
+
+          var result = [], prop, i;
+
+          for (prop in obj) {
+            if (prop !== '_super' &&
+              prop.lastIndexOf('__',0) !== 0 &&
+              hasOwnProperty.call(obj, prop)) {
+              result.push(prop);
+            }
+          }
+
+          if (hasDontEnumBug) {
+            for (i = 0; i < dontEnumsLength; i++) {
+              if (hasOwnProperty.call(obj, dontEnums[i])) {
+                result.push(dontEnums[i]);
+              }
+            }
+          }
+          return result;
+        };
+      }());
+    }
+
+    __exports__["default"] = keys;
+  });
+enifed("ember-metal/libraries",
   ["ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -14144,7 +15050,7 @@ define("ember-metal/libraries",
 
     __exports__["default"] = libraries;
   });
-define("ember-metal/logger",
+enifed("ember-metal/logger",
   ["ember-metal/core","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -14292,8 +15198,8 @@ define("ember-metal/logger",
       assert: consoleMethod('assert') || assertPolyfill
     };
   });
-define("ember-metal/map",
-  ["ember-metal/property_set","ember-metal/utils","ember-metal/array","ember-metal/platform","exports"],
+enifed("ember-metal/map",
+  ["ember-metal/utils","ember-metal/array","ember-metal/platform","ember-metal/deprecate_property","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
@@ -14311,37 +15217,44 @@ define("ember-metal/map",
 
       This implementation follows the current iteration of the ES6 proposal for
       maps (http://wiki.ecmascript.org/doku.php?id=harmony:simple_maps_and_sets),
-      with two exceptions. First, because we need our implementation to be pleasant
-      on older browsers, we do not use the `delete` name (using `remove` instead).
-      Second, as we do not have the luxury of in-VM iteration, we implement a
+      with one exception:  as we do not have the luxury of in-VM iteration, we implement a
       forEach method for iteration.
 
       Map is mocked out to look like an Ember object, so you can do
       `Ember.Map.create()` for symmetry with other Ember classes.
     */
 
-    var set = __dependency1__.set;
-    var guidFor = __dependency2__.guidFor;
-    var indexOf = __dependency3__.indexOf;
-    var create = __dependency4__.create;
+    var guidFor = __dependency1__.guidFor;
+    var indexOf = __dependency2__.indexOf;
+    var create = __dependency3__.create;
+    var deprecateProperty = __dependency4__.deprecateProperty;
 
-    function copy(obj) {
-      var output = {};
+    function missingFunction(fn) {
+      throw new TypeError('' + Object.prototype.toString.call(fn) + " is not a function");
+    }
+
+    function missingNew(name) {
+      throw new TypeError("Constructor " + name + "requires 'new'");
+    }
+
+    function copyNull(obj) {
+      var output = create(null);
 
       for (var prop in obj) {
-        if (obj.hasOwnProperty(prop)) { output[prop] = obj[prop]; }
+        // hasOwnPropery is not needed because obj is Object.create(null);
+        output[prop] = obj[prop];
       }
 
       return output;
     }
 
     function copyMap(original, newObject) {
-      var keys = original.keys.copy(),
-          values = copy(original.values);
+      var keys = original.keys.copy();
+      var values = copyNull(original.values);
 
       newObject.keys = keys;
       newObject.values = values;
-      newObject.length = original.length;
+      newObject.size = original.size;
 
       return newObject;
     }
@@ -14357,7 +15270,13 @@ define("ember-metal/map",
       @private
     */
     function OrderedSet() {
-      this.clear();
+
+      if (this instanceof OrderedSet) {
+        this.clear();
+        this._silenceRemoveDeprecation = false;
+      } else {
+        missingNew("OrderedSet");
+      }
     }
 
     /**
@@ -14366,48 +15285,77 @@ define("ember-metal/map",
       @return {Ember.OrderedSet}
     */
     OrderedSet.create = function() {
-      return new OrderedSet();
+      var Constructor = this;
+
+      return new Constructor();
     };
 
-
     OrderedSet.prototype = {
+      constructor: OrderedSet,
       /**
         @method clear
       */
       clear: function() {
-        this.presenceSet = {};
+        this.presenceSet = create(null);
         this.list = [];
+        this.size = 0;
       },
 
       /**
         @method add
         @param obj
+        @param guid (optional, and for internal use)
+        @return {Ember.OrderedSet}
       */
-      add: function(obj) {
-        var guid = guidFor(obj),
-            presenceSet = this.presenceSet,
-            list = this.list;
+      add: function(obj, _guid) {
+        var guid = _guid || guidFor(obj);
+        var presenceSet = this.presenceSet;
+        var list = this.list;
 
-        if (guid in presenceSet) { return; }
+        if (presenceSet[guid] === true) {
+          return;
+        }
 
         presenceSet[guid] = true;
-        list.push(obj);
+        this.size = list.push(obj);
+
+        return this;
       },
 
       /**
+        @deprecated
+
         @method remove
         @param obj
+        @param _guid (optional and for internal use only)
+        @return {Boolean}
       */
-      remove: function(obj) {
-        var guid = guidFor(obj),
-            presenceSet = this.presenceSet,
-            list = this.list;
+      remove: function(obj, _guid) {
+        
+        return this["delete"](obj, _guid);
+      },
 
-        delete presenceSet[guid];
+      /**
+        @method delete
+        @param obj
+        @param _guid (optional and for internal use only)
+        @return {Boolean}
+      */
+      "delete": function(obj, _guid) {
+        var guid = _guid || guidFor(obj);
+        var presenceSet = this.presenceSet;
+        var list = this.list;
 
-        var index = indexOf.call(list, obj);
-        if (index > -1) {
-          list.splice(index, 1);
+        if (presenceSet[guid] === true) {
+          delete presenceSet[guid];
+          var index = indexOf.call(list, obj);
+          if (index > -1) {
+            list.splice(index, 1);
+          }
+          this.size = list.length;
+          return true;
+        } else {
+          return false;
         }
       },
 
@@ -14416,7 +15364,7 @@ define("ember-metal/map",
         @return {Boolean}
       */
       isEmpty: function() {
-        return this.list.length === 0;
+        return this.size === 0;
       },
 
       /**
@@ -14425,10 +15373,12 @@ define("ember-metal/map",
         @return {Boolean}
       */
       has: function(obj) {
-        var guid = guidFor(obj),
-            presenceSet = this.presenceSet;
+        if (this.size === 0) { return false; }
 
-        return guid in presenceSet;
+        var guid = guidFor(obj);
+        var presenceSet = this.presenceSet;
+
+        return presenceSet[guid] === true;
       },
 
       /**
@@ -14436,12 +15386,25 @@ define("ember-metal/map",
         @param {Function} fn
         @param self
       */
-      forEach: function(fn, self) {
-        // allow mutation during iteration
-        var list = this.toArray();
+      forEach: function(fn /*, thisArg*/) {
+        if (typeof fn !== 'function') {
+          missingFunction(fn);
+        }
 
-        for (var i = 0, j = list.length; i < j; i++) {
-          fn.call(self, list[i]);
+        if (this.size === 0) { return; }
+
+        var list = this.list;
+        var length = arguments.length;
+        var i;
+
+        if (length === 2) {
+          for (i = 0; i < list.length; i++) {
+            fn.call(arguments[1], list[i]);
+          }
+        } else {
+          for (i = 0; i < list.length; i++) {
+            fn(list[i]);
+          }
         }
       },
 
@@ -14458,15 +15421,20 @@ define("ember-metal/map",
         @return {Ember.OrderedSet}
       */
       copy: function() {
-        var set = new OrderedSet();
+        var Constructor = this.constructor;
+        var set = new Constructor();
 
-        set.presenceSet = copy(this.presenceSet);
+        set._silenceRemoveDeprecation = this._silenceRemoveDeprecation;
+        set.presenceSet = copyNull(this.presenceSet);
         set.list = this.toArray();
+        set.size = this.size;
 
         return set;
       }
     };
 
+    deprecateProperty(OrderedSet.prototype, 'length', 'size');
+
     /**
       A Map stores values indexed by keys. Unlike JavaScript's
       default Objects, the keys of a Map can be any JavaScript
@@ -14488,8 +15456,14 @@ define("ember-metal/map",
       @constructor
     */
     function Map() {
-      this.keys = OrderedSet.create();
-      this.values = {};
+      if (this instanceof this.constructor) {
+        this.keys = OrderedSet.create();
+        this.keys._silenceRemoveDeprecation = true;
+        this.values = create(null);
+        this.size = 0;
+      } else {
+        missingNew("OrderedSet");
+      }
     }
 
     Ember.Map = Map;
@@ -14499,18 +15473,21 @@ define("ember-metal/map",
       @static
     */
     Map.create = function() {
-      return new Map();
+      var Constructor = this;
+      return new Constructor();
     };
 
     Map.prototype = {
+      constructor: Map,
+
       /**
         This property will change as the number of objects in the map changes.
 
-        @property length
+        @property size
         @type number
         @default 0
       */
-      length: 0,
+      size: 0,
 
       /**
         Retrieve the value associated with a given key.
@@ -14520,8 +15497,10 @@ define("ember-metal/map",
         @return {*} the value associated with the key, or `undefined`
       */
       get: function(key) {
-        var values = this.values,
-            guid = guidFor(key);
+        if (this.size === 0) { return; }
+
+        var values = this.values;
+        var guid = guidFor(key);
 
         return values[guid];
       },
@@ -14533,18 +15512,27 @@ define("ember-metal/map",
         @method set
         @param {*} key
         @param {*} value
+        @return {Ember.Map}
       */
       set: function(key, value) {
-        var keys = this.keys,
-            values = this.values,
-            guid = guidFor(key);
+        var keys = this.keys;
+        var values = this.values;
+        var guid = guidFor(key);
+
+        // ensure we don't store -0
+        var k = key === -0 ? 0 : key;
+
+        keys.add(k, guid);
 
-        keys.add(key);
         values[guid] = value;
-        set(this, 'length', keys.list.length);
+
+        this.size = keys.size;
+
+        return this;
       },
 
       /**
+        @deprecated see delete
         Removes a value from the map for an associated key.
 
         @method remove
@@ -14552,16 +15540,28 @@ define("ember-metal/map",
         @return {Boolean} true if an item was removed, false otherwise
       */
       remove: function(key) {
+        
+        return this["delete"](key);
+      },
+
+      /**
+        Removes a value from the map for an associated key.
+
+        @method delete
+        @param {*} key
+        @return {Boolean} true if an item was removed, false otherwise
+      */
+      "delete": function(key) {
+        if (this.size === 0) { return false; }
         // don't use ES6 "delete" because it will be annoying
         // to use in browsers that are not ES6 friendly;
-        var keys = this.keys,
-            values = this.values,
-            guid = guidFor(key);
+        var keys = this.keys;
+        var values = this.values;
+        var guid = guidFor(key);
 
-        if (values.hasOwnProperty(guid)) {
-          keys.remove(key);
+        if (keys["delete"](key, guid)) {
           delete values[guid];
-          set(this, 'length', keys.list.length);
+          this.size = keys.size;
           return true;
         } else {
           return false;
@@ -14576,10 +15576,7 @@ define("ember-metal/map",
         @return {Boolean} true if the item was present, false otherwise
       */
       has: function(key) {
-        var values = this.values,
-            guid = guidFor(key);
-
-        return values.hasOwnProperty(guid);
+        return this.keys.has(key);
       },
 
       /**
@@ -14593,14 +15590,38 @@ define("ember-metal/map",
         @param {*} self if passed, the `this` value inside the
           callback. By default, `this` is the map.
       */
-      forEach: function(callback, self) {
-        var keys = this.keys,
-            values = this.values;
+      forEach: function(callback /*, thisArg*/) {
+        if (typeof callback !== 'function') {
+          missingFunction(callback);
+        }
 
-        keys.forEach(function(key) {
-          var guid = guidFor(key);
-          callback.call(self, key, values[guid]);
-        });
+        if (this.size === 0) { return; }
+
+        var length = arguments.length;
+        var map = this;
+        var cb, thisArg;
+
+        if (length === 2) {
+          thisArg = arguments[1];
+          cb = function(key) {
+            callback.call(thisArg, map.get(key), key);
+          };
+        } else {
+          cb = function(key) {
+            callback(map.get(key), key);
+          };
+        }
+
+        this.keys.forEach(cb);
+      },
+
+      /**
+        @method clear
+      */
+      clear: function() {
+        this.keys.clear();
+        this.values = create(null);
+        this.size = 0;
       },
 
       /**
@@ -14612,6 +15633,8 @@ define("ember-metal/map",
       }
     };
 
+    deprecateProperty(Map.prototype, 'length', 'size');
+
     /**
       @class MapWithDefault
       @namespace Ember
@@ -14622,7 +15645,7 @@ define("ember-metal/map",
         @param {*} [options.defaultValue]
     */
     function MapWithDefault(options) {
-      Map.call(this);
+      this._super$constructor();
       this.defaultValue = options.defaultValue;
     }
 
@@ -14643,6 +15666,9 @@ define("ember-metal/map",
     };
 
     MapWithDefault.prototype = create(Map.prototype);
+    MapWithDefault.prototype.constructor = MapWithDefault;
+    MapWithDefault.prototype._super$constructor = Map;
+    MapWithDefault.prototype._super$get = Map.prototype.get;
 
     /**
       Retrieve the value associated with a given key.
@@ -14655,7 +15681,7 @@ define("ember-metal/map",
       var hasValue = this.has(key);
 
       if (hasValue) {
-        return Map.prototype.get.call(this, key);
+        return this._super$get(key);
       } else {
         var defaultValue = this.defaultValue(key);
         this.set(key, defaultValue);
@@ -14668,19 +15694,24 @@ define("ember-metal/map",
       @return {Ember.MapWithDefault}
     */
     MapWithDefault.prototype.copy = function() {
-      return copyMap(this, new MapWithDefault({
+      var Constructor = this.constructor;
+      return copyMap(this, new Constructor({
         defaultValue: this.defaultValue
       }));
     };
 
+    __exports__["default"] = Map;
+
     __exports__.OrderedSet = OrderedSet;
     __exports__.Map = Map;
     __exports__.MapWithDefault = MapWithDefault;
   });
-define("ember-metal/merge",
-  ["exports"],
-  function(__exports__) {
+enifed("ember-metal/merge",
+  ["ember-metal/keys","exports"],
+  function(__dependency1__, __exports__) {
     "use strict";
+    var keys = __dependency1__["default"];
+
     /**
       Merge the contents of two objects together into the first object.
 
@@ -14697,14 +15728,23 @@ define("ember-metal/merge",
       @return {Object}
     */
     __exports__["default"] = function merge(original, updates) {
-      for (var prop in updates) {
-        if (!updates.hasOwnProperty(prop)) { continue; }
+      if (!updates || typeof updates !== 'object') { 
+        return original;
+      }
+
+      var props = keys(updates);
+      var prop;
+      var length = props.length;
+
+      for (var i = 0; i < length; i++) {
+        prop = props[i];
         original[prop] = updates[prop];
       }
+
       return original;
     }
   });
-define("ember-metal/mixin",
+enifed("ember-metal/mixin",
   ["ember-metal/core","ember-metal/merge","ember-metal/array","ember-metal/platform","ember-metal/utils","ember-metal/expand_properties","ember-metal/properties","ember-metal/computed","ember-metal/binding","ember-metal/observer","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -14726,10 +15766,10 @@ define("ember-metal/mixin",
     var create = __dependency4__.create;
     var guidFor = __dependency5__.guidFor;
     var meta = __dependency5__.meta;
-    var META_KEY = __dependency5__.META_KEY;
     var wrap = __dependency5__.wrap;
     var makeArray = __dependency5__.makeArray;
     var apply = __dependency5__.apply;
+    var isArray = __dependency5__.isArray;
     var expandProperties = __dependency6__["default"];
     var Descriptor = __dependency7__.Descriptor;
     var defineProperty = __dependency7__.defineProperty;
@@ -14742,26 +15782,32 @@ define("ember-metal/mixin",
     var addListener = __dependency11__.addListener;
     var removeListener = __dependency11__.removeListener;
 
-    var REQUIRED,
-        a_map = map,
-        a_indexOf = indexOf,
-        a_forEach = forEach,
-        a_slice = [].slice,
-        o_create = create,
-        metaFor = meta;
+    var REQUIRED;
+    var a_map = map;
+    var a_indexOf = indexOf;
+    var a_forEach = forEach;
+    var a_slice = [].slice;
+    var o_create = create;
+    var metaFor = meta;
 
     function superFunction(){
-      var ret, func = this.__nextSuper;
+      var func = this.__nextSuper;
+      var ret;
       if (func) {
+        var args = new Array(arguments.length);
+        for (var i = 0, l = args.length; i < l; i++) {
+          args[i] = arguments[i];
+        }
         this.__nextSuper = null;
-        ret = apply(this, func, arguments);
+        ret = apply(this, func, args);
         this.__nextSuper = func;
       }
       return ret;
     }
 
     function mixinsMeta(obj) {
-      var m = metaFor(obj, true), ret = m.mixins;
+      var m = metaFor(obj, true);
+      var ret = m.mixins;
       if (!ret) {
         ret = m.mixins = {};
       } else if (!m.hasOwnProperty('mixins')) {
@@ -14832,7 +15878,7 @@ define("ember-metal/mixin",
       // it on the original object.
       superProperty = superProperty || meta.descs[key];
 
-      if (!superProperty || !(superProperty instanceof ComputedProperty)) {
+      if (superProperty === undefined || !(superProperty instanceof ComputedProperty)) {
         return property;
       }
 
@@ -14859,7 +15905,7 @@ define("ember-metal/mixin",
       superMethod = superMethod || obj[key];
 
       // Only wrap the new method if the original method was a function
-      if ('function' !== typeof superMethod) {
+      if (superMethod === undefined || 'function' !== typeof superMethod) {
         return method;
       }
 
@@ -14883,10 +15929,11 @@ define("ember-metal/mixin",
     function applyMergedProperties(obj, key, value, values) {
       var baseValue = values[key] || obj[key];
 
+      
       if (!baseValue) { return value; }
 
-      var newBase = merge({}, baseValue),
-          hasFunction = false;
+      var newBase = merge({}, baseValue);
+      var hasFunction = false;
 
       for (var prop in value) {
         if (!value.hasOwnProperty(prop)) { continue; }
@@ -14987,7 +16034,8 @@ define("ember-metal/mixin",
 
     function connectBindings(obj, m) {
       // TODO Mixin.apply(instance) should disconnect binding if exists
-      var bindings = m.bindings, key, binding, to;
+      var bindings = m.bindings;
+      var key, binding, to;
       if (bindings) {
         for (key in bindings) {
           binding = bindings[key];
@@ -15014,7 +16062,8 @@ define("ember-metal/mixin",
     }
 
     function followAlias(obj, desc, m, descs, values) {
-      var altKey = desc.methodName, value;
+      var altKey = desc.methodName;
+      var value;
       if (descs[altKey] || values[altKey]) {
         value = values[altKey];
         desc  = descs[altKey];
@@ -15056,8 +16105,11 @@ define("ember-metal/mixin",
     }
 
     function applyMixin(obj, mixins, partial) {
-      var descs = {}, values = {}, m = metaFor(obj),
-          key, value, desc, keys = [];
+      var descs = {};
+      var values = {};
+      var m = metaFor(obj);
+      var keys = [];
+      var key, value, desc;
 
       obj._super = superFunction;
 
@@ -15216,7 +16268,9 @@ define("ember-metal/mixin",
         this.mixins = [];
       }
 
-      var len = arguments.length, mixins = this.mixins, idx;
+      var len = arguments.length;
+      var mixins = this.mixins;
+      var idx;
 
       for(idx=0; idx < len; idx++) {
         mixin = arguments[idx];
@@ -15253,7 +16307,8 @@ define("ember-metal/mixin",
       seen[guid] = true;
 
       if (curMixin === targetMixin) { return true; }
-      var mixins = curMixin.mixins, loc = mixins ? mixins.length : 0;
+      var mixins = curMixin.mixins;
+      var loc = mixins ? mixins.length : 0;
       while (--loc >= 0) {
         if (_detect(mixins[loc], targetMixin, seen)) { return true; }
       }
@@ -15268,8 +16323,8 @@ define("ember-metal/mixin",
     MixinPrototype.detect = function(obj) {
       if (!obj) { return false; }
       if (obj instanceof Mixin) { return _detect(obj, this, {}); }
-      var m = obj[META_KEY],
-          mixins = m && m.mixins;
+      var m = obj['__ember_meta__'];
+      var mixins = m && m.mixins;
       if (mixins) {
         return !!mixins[guidFor(this)];
       }
@@ -15297,7 +16352,9 @@ define("ember-metal/mixin",
     }
 
     MixinPrototype.keys = function() {
-      var keys = {}, seen = {}, ret = [];
+      var keys = {};
+      var seen = {};
+      var ret = [];
       _keys(keys, this, seen);
       for(var key in keys) {
         if (keys.hasOwnProperty(key)) { ret.push(key); }
@@ -15308,8 +16365,9 @@ define("ember-metal/mixin",
     // returns the mixins currently applied to the specified object
     // TODO: Make Ember.mixin
     Mixin.mixins = function(obj) {
-      var m = obj[META_KEY],
-          mixins = m && m.mixins, ret = [];
+      var m = obj['__ember_meta__'];
+      var mixins = m && m.mixins;
+      var ret = [];
 
       if (!mixins) { return ret; }
 
@@ -15354,7 +16412,7 @@ define("ember-metal/mixin",
       });
 
       var goodGuy = App.Person.create();
-      
+
       goodGuy.name();    // 'Tomhuda Katzdale'
       goodGuy.moniker(); // 'Tomhuda Katzdale'
       ```
@@ -15528,7 +16586,7 @@ define("ember-metal/mixin",
     __exports__.beforeObserver = beforeObserver;__exports__.IS_BINDING = IS_BINDING;
     __exports__.Mixin = Mixin;
   });
-define("ember-metal/observer",
+enifed("ember-metal/observer",
   ["ember-metal/watching","ember-metal/array","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -15647,7 +16705,7 @@ define("ember-metal/observer",
 
     __exports__.removeBeforeObserver = removeBeforeObserver;
   });
-define("ember-metal/observer_set",
+enifed("ember-metal/observer_set",
   ["ember-metal/utils","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -15679,11 +16737,11 @@ define("ember-metal/observer_set",
 
 
     ObserverSet.prototype.add = function(sender, keyName, eventName) {
-      var observerSet = this.observerSet,
-          observers = this.observers,
-          senderGuid = guidFor(sender),
-          keySet = observerSet[senderGuid],
-          index;
+      var observerSet = this.observerSet;
+      var observers = this.observers;
+      var senderGuid = guidFor(sender);
+      var keySet = observerSet[senderGuid];
+      var index;
 
       if (!keySet) {
         observerSet[senderGuid] = keySet = {};
@@ -15702,7 +16760,8 @@ define("ember-metal/observer_set",
     };
 
     ObserverSet.prototype.flush = function() {
-      var observers = this.observers, i, len, observer, sender;
+      var observers = this.observers;
+      var i, len, observer, sender;
       this.clear();
       for (i=0, len=observers.length; i < len; ++i) {
         observer = observers[i];
@@ -15717,22 +16776,62 @@ define("ember-metal/observer_set",
       this.observers = [];
     };
   });
-define("ember-metal/platform",
-  ["ember-metal/core","exports"],
+enifed("ember-metal/path_cache",
+  ["ember-metal/cache","exports"],
   function(__dependency1__, __exports__) {
-        // Remove "use strict"; from transpiled module (in browser builds only) until
-    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
-    //
-    // REMOVE_USE_STRICT: true
+    "use strict";
+    var Cache = __dependency1__["default"];
 
-    /*globals Node */
+    var IS_GLOBAL      = /^([A-Z$]|([0-9][A-Z$]))/;
+    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
+    var HAS_THIS       = 'this.';
 
-    var Ember = __dependency1__["default"];
+    var isGlobalCache     = new Cache(1000, function(key) { return IS_GLOBAL.test(key);          });
+    var isGlobalPathCache = new Cache(1000, function(key) { return IS_GLOBAL_PATH.test(key);     });
+    var hasThisCache      = new Cache(1000, function(key) { return key.indexOf(HAS_THIS) !== -1; });
+    var isPathCache       = new Cache(1000, function(key) { return key.indexOf('.')      !== -1; });
+
+    var caches = {
+      isGlobalCache:     isGlobalCache,
+      isGlobalPathCache: isGlobalPathCache,
+      hasThisCache:      hasThisCache,
+      isPathCache:       isPathCache
+    };
+    __exports__.caches = caches;
+    function isGlobal(path) {
+      return isGlobalCache.get(path);
+    }
+
+    __exports__.isGlobal = isGlobal;function isGlobalPath(path) {
+      return isGlobalPathCache.get(path);
+    }
+
+    __exports__.isGlobalPath = isGlobalPath;function hasThis(path) {
+      return hasThisCache.get(path);
+    }
+
+    __exports__.hasThis = hasThis;function isPath(path) {
+      return isPathCache.get(path);
+    }
+
+    __exports__.isPath = isPath;
+  });
+enifed("ember-metal/platform",
+  ["ember-metal/platform/define_property","ember-metal/platform/define_properties","ember-metal/platform/create","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+    "use strict";
+    var hasES5CompliantDefineProperty = __dependency1__.hasES5CompliantDefineProperty;
+    var defineProperty = __dependency1__.defineProperty;
+    var defineProperties = __dependency2__["default"];
+    var create = __dependency3__["default"];
 
     /**
     @module ember-metal
     */
 
+    var hasPropertyAccessors = hasES5CompliantDefineProperty;
+    var canDefineNonEnumerableProperties = hasES5CompliantDefineProperty;
+
     /**
       Platform specific methods and feature detectors needed by the framework.
 
@@ -15740,8 +16839,26 @@ define("ember-metal/platform",
       @namespace Ember
       @static
     */
-    // TODO remove this
-    var platform = {};
+
+    __exports__.create = create;
+    __exports__.defineProperty = defineProperty;
+    __exports__.defineProperties = defineProperties;
+    __exports__.hasPropertyAccessors = hasPropertyAccessors;
+    __exports__.canDefineNonEnumerableProperties = canDefineNonEnumerableProperties;
+  });
+enifed("ember-metal/platform/create",
+  ["exports"],
+  function(__exports__) {
+        // Remove "use strict"; from transpiled module until
+    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
+    //
+    // REMOVE_USE_STRICT: true
+
+    /**
+    @class platform
+    @namespace Ember
+    @static
+    */
 
     /**
       Identical to `Object.create()`. Implements if not available natively.
@@ -15749,76 +16866,190 @@ define("ember-metal/platform",
       @method create
       @for Ember
     */
-    var create = Object.create;
+    var create;
+    // ES5 15.2.3.5
+    // http://es5.github.com/#x15.2.3.5
+    if (!(Object.create && !Object.create(null).hasOwnProperty)) {
+      /* jshint scripturl:true, proto:true */
+      // Contributed by Brandon Benvie, October, 2012
+      var createEmpty;
+      var supportsProto = !({'__proto__':null} instanceof Object);
+      // the following produces false positives
+      // in Opera Mini => not a reliable check
+      // Object.prototype.__proto__ === null
+      if (supportsProto || typeof document === 'undefined') {
+        createEmpty = function () {
+          return { "__proto__": null };
+        };
+      } else {
+        // In old IE __proto__ can't be used to manually set `null`, nor does
+        // any other method exist to make an object that inherits from nothing,
+        // aside from Object.prototype itself. Instead, create a new global
+        // object and *steal* its Object.prototype and strip it bare. This is
+        // used as the prototype to create nullary objects.
+        createEmpty = function () {
+          var iframe = document.createElement('iframe');
+          var parent = document.body || document.documentElement;
+          iframe.style.display = 'none';
+          parent.appendChild(iframe);
+          iframe.src = 'javascript:';
+          var empty = iframe.contentWindow.Object.prototype;
+          parent.removeChild(iframe);
+          iframe = null;
+          delete empty.constructor;
+          delete empty.hasOwnProperty;
+          delete empty.propertyIsEnumerable;
+          delete empty.isPrototypeOf;
+          delete empty.toLocaleString;
+          delete empty.toString;
+          delete empty.valueOf;
 
-    // IE8 has Object.create but it couldn't treat property descriptors.
-    if (create) {
-      if (create({a: 1}, {a: {value: 2}}).a !== 2) {
-        create = null;
+          function Empty() {}
+          Empty.prototype = empty;
+          // short-circuit future calls
+          createEmpty = function () {
+            return new Empty();
+          };
+          return new Empty();
+        };
       }
+
+      create = Object.create = function create(prototype, properties) {
+
+        var object;
+        function Type() {}  // An empty constructor.
+
+        if (prototype === null) {
+          object = createEmpty();
+        } else {
+          if (typeof prototype !== "object" && typeof prototype !== "function") {
+            // In the native implementation `parent` can be `null`
+            // OR *any* `instanceof Object`  (Object|Function|Array|RegExp|etc)
+            // Use `typeof` tho, b/c in old IE, DOM elements are not `instanceof Object`
+            // like they are in modern browsers. Using `Object.create` on DOM elements
+            // is...err...probably inappropriate, but the native version allows for it.
+            throw new TypeError("Object prototype may only be an Object or null"); // same msg as Chrome
+          }
+
+          Type.prototype = prototype;
+
+          object = new Type();
+        }
+
+        if (properties !== undefined) {
+          Object.defineProperties(object, properties);
+        }
+
+        return object;
+      };
+    } else {
+      create = Object.create;
     }
 
-    // STUB_OBJECT_CREATE allows us to override other libraries that stub
-    // Object.create different than we would prefer
-    if (!create || Ember.ENV.STUB_OBJECT_CREATE) {
-      var K = function() {};
+    __exports__["default"] = create;
+  });
+enifed("ember-metal/platform/define_properties",
+  ["ember-metal/platform/define_property","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var defineProperty = __dependency1__.defineProperty;
 
-      create = function(obj, props) {
-        K.prototype = obj;
-        obj = new K();
-        if (props) {
-          K.prototype = obj;
-          for (var prop in props) {
-            K.prototype[prop] = props[prop].value;
+    var defineProperties = Object.defineProperties;
+
+    // ES5 15.2.3.7
+    // http://es5.github.com/#x15.2.3.7
+    if (!defineProperties) {
+      defineProperties = function defineProperties(object, properties) {
+        for (var property in properties) {
+          if (properties.hasOwnProperty(property) && property !== "__proto__") {
+            defineProperty(object, property, properties[property]);
           }
-          obj = new K();
         }
-        K.prototype = null;
-
-        return obj;
+        return object;
       };
 
-      create.isSimulated = true;
+      Object.defineProperties = defineProperties;
     }
 
-    var defineProperty = Object.defineProperty;
-    var canRedefineProperties, canDefinePropertyOnDOM;
+    __exports__["default"] = defineProperties;
+  });
+enifed("ember-metal/platform/define_property",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /*globals Node */
 
-    // Catch IE8 where Object.defineProperty exists but only works on DOM elements
-    if (defineProperty) {
+    /**
+    @class platform
+    @namespace Ember
+    @static
+    */
+
+    /**
+      Set to true if the platform supports native getters and setters.
+
+      @property hasPropertyAccessors
+      @final
+    */
+
+    /**
+      Identical to `Object.defineProperty()`. Implements as much functionality
+      as possible if not available natively.
+
+      @method defineProperty
+      @param {Object} obj The object to modify
+      @param {String} keyName property name to modify
+      @param {Object} desc descriptor hash
+      @return {void}
+    */
+    var defineProperty = (function checkCompliance(defineProperty) {
+      if (!defineProperty) return;
       try {
-        defineProperty({}, 'a',{get:function() {}});
-      } catch (e) {
-        defineProperty = null;
-      }
-    }
-
-    if (defineProperty) {
-      // Detects a bug in Android <3.2 where you cannot redefine a property using
-      // Object.defineProperty once accessors have already been set.
-      canRedefineProperties = (function() {
+        var a = 5;
         var obj = {};
-
         defineProperty(obj, 'a', {
           configurable: true,
           enumerable: true,
-          get: function() { },
-          set: function() { }
+          get: function () {
+            return a;
+          },
+          set: function (v) {
+            a = v;
+          }
         });
+        if (obj.a !== 5) return;
+        obj.a = 10;
+        if (a !== 10) return;
 
+        // check non-enumerability
         defineProperty(obj, 'a', {
           configurable: true,
-          enumerable: true,
+          enumerable: false,
           writable: true,
           value: true
         });
+        for (var key in obj) {
+          if (key === 'a') return;
+        }
 
-        return obj.a === true;
-      })();
+        // Detects a bug in Android <3.2 where you cannot redefine a property using
+        // Object.defineProperty once accessors have already been set.
+        if (obj.a !== true) return;
 
+        // defineProperty is compliant
+        return defineProperty;
+      } catch (e) {
+        // IE8 defines Object.defineProperty but calling it on an Object throws
+        return;
+      }
+    })(Object.defineProperty);
+
+    var hasES5CompliantDefineProperty = !!defineProperty;
+
+    if (hasES5CompliantDefineProperty && typeof document !== 'undefined') {
       // This is for Safari 5.0, which supports Object.defineProperty, but not
       // on DOM nodes.
-      canDefinePropertyOnDOM = (function() {
+      var canDefinePropertyOnDOM = (function() {
         try {
           defineProperty(document.createElement('div'), 'definePropertyOnDOM', {});
           return true;
@@ -15827,9 +17058,7 @@ define("ember-metal/platform",
         return false;
       })();
 
-      if (!canRedefineProperties) {
-        defineProperty = null;
-      } else if (!canDefinePropertyOnDOM) {
+      if (!canDefinePropertyOnDOM) {
         defineProperty = function(obj, keyName, desc) {
           var isNode;
 
@@ -15849,69 +17078,28 @@ define("ember-metal/platform",
       }
     }
 
-    /**
-    @class platform
-    @namespace Ember
-    */
-
-    /**
-      Identical to `Object.defineProperty()`. Implements as much functionality
-      as possible if not available natively.
-
-      @method defineProperty
-      @param {Object} obj The object to modify
-      @param {String} keyName property name to modify
-      @param {Object} desc descriptor hash
-      @return {void}
-    */
-    platform.defineProperty = defineProperty;
-
-    /**
-      Set to true if the platform supports native getters and setters.
-
-      @property hasPropertyAccessors
-      @final
-    */
-    platform.hasPropertyAccessors = true;
-
-    if (!platform.defineProperty) {
-      platform.hasPropertyAccessors = false;
-
-      platform.defineProperty = function(obj, keyName, desc) {
+    if (!hasES5CompliantDefineProperty) {
+      defineProperty = function defineProperty(obj, keyName, desc) {
         if (!desc.get) { obj[keyName] = desc.value; }
       };
-
-      platform.defineProperty.isSimulated = true;
     }
 
-    if (Ember.ENV.MANDATORY_SETTER && !platform.hasPropertyAccessors) {
-      Ember.ENV.MANDATORY_SETTER = false;
-    }
-
-    __exports__.create = create;
-    __exports__.platform = platform;
+    __exports__.hasES5CompliantDefineProperty = hasES5CompliantDefineProperty;
+    __exports__.defineProperty = defineProperty;
   });
-define("ember-metal/properties",
-  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","ember-metal/property_get","ember-metal/property_set","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+enifed("ember-metal/properties",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/property_events","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var Ember = __dependency1__["default"];
-    var META_KEY = __dependency2__.META_KEY;
-    var meta = __dependency2__.meta;
-    var platform = __dependency3__.platform;
+    var metaFor = __dependency2__.meta;
+    var objectDefineProperty = __dependency3__.defineProperty;
+    var hasPropertyAccessors = __dependency3__.hasPropertyAccessors;
     var overrideChains = __dependency4__.overrideChains;
-    var get = __dependency5__.get;
-    var set = __dependency6__.set;
-
-    var metaFor = meta,
-        objectDefineProperty = platform.defineProperty;
-
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
-
     // ..........................................................
     // DESCRIPTOR
     //
@@ -15933,17 +17121,19 @@ define("ember-metal/properties",
     // DEFINING PROPERTIES API
     //
 
-    var MANDATORY_SETTER_FUNCTION = Ember.MANDATORY_SETTER_FUNCTION = function(value) {
-          };
+    function MANDATORY_SETTER_FUNCTION(name) {
+      return function SETTER_FUNCTION(value) {
+              };
+    }
 
-    var DEFAULT_GETTER_FUNCTION = Ember.DEFAULT_GETTER_FUNCTION = function DEFAULT_GETTER_FUNCTION(name) {
-      return function() {
-        var meta = this[META_KEY];
+    __exports__.MANDATORY_SETTER_FUNCTION = MANDATORY_SETTER_FUNCTION;function DEFAULT_GETTER_FUNCTION(name) {
+      return function GETTER_FUNCTION() {
+        var meta = this['__ember_meta__'];
         return meta && meta.values[name];
       };
-    };
+    }
 
-    /**
+    __exports__.DEFAULT_GETTER_FUNCTION = DEFAULT_GETTER_FUNCTION;/**
       NOTE: This is a low-level method used by other parts of the API. You almost
       never want to call this method directly. Instead you should use
       `Ember.mixin()` to define new properties.
@@ -15994,7 +17184,9 @@ define("ember-metal/properties",
       if (!meta) meta = metaFor(obj);
       descs = meta.descs;
       existingDesc = meta.descs[keyName];
-      watching = meta.watching[keyName] > 0;
+      var watchEntry = meta.watching[keyName];
+
+      watching = watchEntry !== undefined && watchEntry > 0;
 
       if (existingDesc instanceof Descriptor) {
         existingDesc.teardown(obj, keyName);
@@ -16004,33 +17196,18 @@ define("ember-metal/properties",
         value = desc;
 
         descs[keyName] = desc;
-        if (MANDATORY_SETTER && watching) {
-          objectDefineProperty(obj, keyName, {
-            configurable: true,
-            enumerable: true,
-            writable: true,
-            value: undefined // make enumerable
-          });
-        } else {
+        
           obj[keyName] = undefined; // make enumerable
-        }
+        
         if (desc.setup) { desc.setup(obj, keyName); }
       } else {
         descs[keyName] = undefined; // shadow descriptor in proto
         if (desc == null) {
           value = data;
 
-          if (MANDATORY_SETTER && watching) {
-            meta.values[keyName] = data;
-            objectDefineProperty(obj, keyName, {
-              configurable: true,
-              enumerable: true,
-              set: MANDATORY_SETTER_FUNCTION,
-              get: DEFAULT_GETTER_FUNCTION(keyName)
-            });
-          } else {
+          
             obj[keyName] = data;
-          }
+          
         } else {
           value = desc;
 
@@ -16049,40 +17226,12 @@ define("ember-metal/properties",
 
       return this;
     }
-
-    __exports__.defineProperty = defineProperty;/**
-      Used internally to allow changing properties in a backwards compatible way, and print a helpful
-      deprecation warning.
-
-      @method deprecateProperty
-      @param {Object} object The object to add the deprecated property to.
-      @param {String} deprecatedKey The property to add (and print deprecation warnings upon accessing).
-      @param {String} newKey The property that will be aliased.
-      @private
-      @since 1.7.0
-    */
-
-    function deprecateProperty(object, deprecatedKey, newKey) {
-      function deprecate() {
-              }
-
-      if (platform.hasPropertyAccessors) {
-        defineProperty(object, deprecatedKey, {
-            configurable: true,
-            enumerable: false,
-            set: function(value) { deprecate(); set(this, newKey, value); },
-            get: function() { deprecate(); return get(this, newKey); }
-        });
-      }
-    }
-
-    __exports__.deprecateProperty = deprecateProperty;
+    __exports__.defineProperty = defineProperty;
   });
-define("ember-metal/property_events",
+enifed("ember-metal/property_events",
   ["ember-metal/utils","ember-metal/events","ember-metal/observer_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
-    var META_KEY = __dependency1__.META_KEY;
     var guidFor = __dependency1__.guidFor;
     var tryFinally = __dependency1__.tryFinally;
     var sendEvent = __dependency2__.sendEvent;
@@ -16114,10 +17263,10 @@ define("ember-metal/property_events",
       @return {void}
     */
     function propertyWillChange(obj, keyName) {
-      var m = obj[META_KEY],
-          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
-          proto = m && m.proto,
-          desc = m && m.descs[keyName];
+      var m = obj['__ember_meta__'];
+      var watching = (m && m.watching[keyName] > 0) || keyName === 'length';
+      var proto = m && m.proto;
+      var desc = m && m.descs[keyName];
 
       if (!watching) { return; }
       if (proto === obj) { return; }
@@ -16143,10 +17292,10 @@ define("ember-metal/property_events",
       @return {void}
     */
     function propertyDidChange(obj, keyName) {
-      var m = obj[META_KEY],
-          watching = (m && m.watching[keyName] > 0) || keyName === 'length',
-          proto = m && m.proto,
-          desc = m && m.descs[keyName];
+      var m = obj['__ember_meta__'];
+      var watching = (m && m.watching[keyName] > 0) || keyName === 'length';
+      var proto = m && m.proto;
+      var desc = m && m.descs[keyName];
 
       if (proto === obj) { return; }
 
@@ -16154,44 +17303,63 @@ define("ember-metal/property_events",
       if (desc && desc.didChange) { desc.didChange(obj, keyName); }
       if (!watching && keyName !== 'length') { return; }
 
-      dependentKeysDidChange(obj, keyName, m);
+      if (m && m.deps && m.deps[keyName]) {
+        dependentKeysDidChange(obj, keyName, m);
+      }
+
       chainsDidChange(obj, keyName, m, false);
       notifyObservers(obj, keyName);
     }
 
     var WILL_SEEN, DID_SEEN;
-
     // called whenever a property is about to change to clear the cache of any dependent keys (and notify those properties of changes, etc...)
     function dependentKeysWillChange(obj, depKey, meta) {
       if (obj.isDestroying) { return; }
 
-      var seen = WILL_SEEN, top = !seen;
-      if (top) { seen = WILL_SEEN = {}; }
-      iterDeps(propertyWillChange, obj, depKey, seen, meta);
-      if (top) { WILL_SEEN = null; }
+      var deps;
+      if (meta && meta.deps && (deps = meta.deps[depKey])) {
+        var seen = WILL_SEEN;
+        var top = !seen;
+        if (top) { seen = WILL_SEEN = {}; }
+        iterDeps(propertyWillChange, obj, deps, depKey, seen, meta);
+        if (top) { WILL_SEEN = null; }
+      }
     }
 
     // called whenever a property has just changed to update dependent keys
     function dependentKeysDidChange(obj, depKey, meta) {
       if (obj.isDestroying) { return; }
 
-      var seen = DID_SEEN, top = !seen;
-      if (top) { seen = DID_SEEN = {}; }
-      iterDeps(propertyDidChange, obj, depKey, seen, meta);
-      if (top) { DID_SEEN = null; }
+      var deps;
+      if (meta && meta.deps && (deps = meta.deps[depKey])) {
+        var seen = DID_SEEN;
+        var top = !seen;
+        if (top) { seen = DID_SEEN = {}; }
+        iterDeps(propertyDidChange, obj, deps, depKey, seen, meta);
+        if (top) { DID_SEEN = null; }
+      }
     }
 
-    function iterDeps(method, obj, depKey, seen, meta) {
-      var guid = guidFor(obj);
-      if (!seen[guid]) seen[guid] = {};
-      if (seen[guid][depKey]) return;
-      seen[guid][depKey] = true;
+    function keysOf(obj) {
+      var keys = [];
+      for (var key in obj) keys.push(key);
+      return keys;
+    }
+
+    function iterDeps(method, obj, deps, depKey, seen, meta) {
+      var keys, key, i, desc;
+      var guid = guidFor(obj);
+      var current = seen[guid];
+      if (!current) current = seen[guid] = {};
+      if (current[depKey]) return;
+      current[depKey] = true;
 
-      var deps = meta.deps;
-      deps = deps && deps[depKey];
       if (deps) {
-        for(var key in deps) {
-          var desc = meta.descs[key];
+        keys = keysOf(deps);
+        var descs = meta.descs;
+        for (i=0; i<keys.length; i++) {
+          key = keys[i];
+          desc = descs[key];
           if (desc && desc._suspended === obj) continue;
           method(obj, key);
         }
@@ -16204,9 +17372,9 @@ define("ember-metal/property_events",
         return;
       }
 
-      var nodes = m.chainWatchers[keyName],
-          events = [],
-          i, l;
+      var nodes = m.chainWatchers[keyName];
+      var events = [];
+      var i, l;
 
       for(i = 0, l = nodes.length; i < l; i++) {
         nodes[i].willChange(events);
@@ -16223,9 +17391,9 @@ define("ember-metal/property_events",
         return;
       }
 
-      var nodes = m.chainWatchers[keyName],
-          events = suppressEvents ? null : [],
-          i, l;
+      var nodes = m.chainWatchers[keyName];
+      var events = suppressEvents ? null : [];
+      var i, l;
 
       for(i = 0, l = nodes.length; i < l; i++) {
         nodes[i].didChange(events);
@@ -16288,7 +17456,8 @@ define("ember-metal/property_events",
     function notifyBeforeObservers(obj, keyName) {
       if (obj.isDestroying) { return; }
 
-      var eventName = keyName + ':before', listeners, diff;
+      var eventName = keyName + ':before';
+      var listeners, diff;
       if (deferred) {
         listeners = beforeObserverSet.add(obj, keyName, eventName);
         diff = listenersDiff(obj, eventName, listeners);
@@ -16301,7 +17470,8 @@ define("ember-metal/property_events",
     function notifyObservers(obj, keyName) {
       if (obj.isDestroying) { return; }
 
-      var eventName = keyName + ':change', listeners;
+      var eventName = keyName + ':change';
+      var listeners;
       if (deferred) {
         listeners = observerSet.add(obj, keyName, eventName);
         listenersUnion(obj, eventName, listeners);
@@ -16317,24 +17487,21 @@ define("ember-metal/property_events",
     __exports__.endPropertyChanges = endPropertyChanges;
     __exports__.changeProperties = changeProperties;
   });
-define("ember-metal/property_get",
-  ["ember-metal/core","ember-metal/utils","ember-metal/error","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+enifed("ember-metal/property_get",
+  ["ember-metal/core","ember-metal/error","ember-metal/path_cache","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var Ember = __dependency1__["default"];
-    var META_KEY = __dependency2__.META_KEY;
-    var EmberError = __dependency3__["default"];
+    var EmberError = __dependency2__["default"];
+    var isGlobalPath = __dependency3__.isGlobalPath;
+    var isPath = __dependency3__.isPath;
+    var pathHasThis = __dependency3__.hasThis;
+    var hasPropertyAccessors = __dependency4__.hasPropertyAccessors;
 
-    var get;
-
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
-
-    var IS_GLOBAL_PATH = /^([A-Z$]|([0-9][A-Z$])).*[\.]/;
-    var HAS_THIS  = 'this.';
     var FIRST_KEY = /^([^\.]+)/;
 
     // ..........................................................
@@ -16374,28 +17541,31 @@ define("ember-metal/property_get",
         return obj;
       }
 
-      if (!keyName && 'string'===typeof obj) {
+      if (!keyName && 'string' === typeof obj) {
         keyName = obj;
         obj = null;
       }
 
             
-      if (obj === null) { return _getPath(obj, keyName);  }
+      if (obj === null) {
+        var value = _getPath(obj, keyName);
+                return value;
+      }
 
-      var meta = obj[META_KEY], desc = meta && meta.descs[keyName], ret;
+      var meta = obj['__ember_meta__'];
+      var desc = meta && meta.descs[keyName];
+      var ret;
 
-      if (desc === undefined && keyName.indexOf('.') !== -1) {
+      if (desc === undefined && isPath(keyName)) {
         return _getPath(obj, keyName);
       }
 
       if (desc) {
         return desc.get(obj, keyName);
       } else {
-        if (MANDATORY_SETTER && meta && meta.watching[keyName] > 0) {
-          ret = meta.values[keyName];
-        } else {
+        
           ret = obj[keyName];
-        }
+        
 
         if (ret === undefined &&
             'object' === typeof obj && !(keyName in obj) && 'function' === typeof obj.unknownProperty) {
@@ -16427,13 +17597,14 @@ define("ember-metal/property_get",
       @return {Array} a temporary array with the normalized target/path pair.
     */
     function normalizeTuple(target, path) {
-      var hasThis  = path.indexOf(HAS_THIS) === 0,
-          isGlobal = !hasThis && IS_GLOBAL_PATH.test(path),
-          key;
+      var hasThis  = pathHasThis(path);
+      var isGlobal = !hasThis && isGlobalPath(path);
+      var key;
 
       if (!target || isGlobal) target = Ember.lookup;
       if (hasThis) path = path.slice(5);
 
+      
       if (target === Ember.lookup) {
         key = path.match(FIRST_KEY)[0];
         target = get(target, key);
@@ -16452,10 +17623,12 @@ define("ember-metal/property_get",
       // If there is no root and path is a key name, return that
       // property from the global object.
       // E.g. get('Ember') -> Ember
-      if (root === null && path.indexOf('.') === -1) { return get(Ember.lookup, path); }
+      if (root === null && !isPath(path)) {
+        return get(Ember.lookup, path);
+      }
 
       // detect complicated paths and normalize them
-      hasThis = path.indexOf(HAS_THIS) === 0;
+      hasThis = pathHasThis(path);
 
       if (!root || hasThis) {
         tuple = normalizeTuple(root, path);
@@ -16485,19 +17658,19 @@ define("ember-metal/property_get",
     __exports__.normalizeTuple = normalizeTuple;
     __exports__._getPath = _getPath;
   });
-define("ember-metal/property_set",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/utils","ember-metal/property_events","ember-metal/properties","ember-metal/error","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+enifed("ember-metal/property_set",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_events","ember-metal/properties","ember-metal/error","ember-metal/path_cache","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var getPath = __dependency2__._getPath;
-    var META_KEY = __dependency3__.META_KEY;
-    var propertyWillChange = __dependency4__.propertyWillChange;
-    var propertyDidChange = __dependency4__.propertyDidChange;
-    var defineProperty = __dependency5__.defineProperty;
-    var EmberError = __dependency6__["default"];
+    var propertyWillChange = __dependency3__.propertyWillChange;
+    var propertyDidChange = __dependency3__.propertyDidChange;
+    var defineProperty = __dependency4__.defineProperty;
+    var EmberError = __dependency5__["default"];
+    var isPath = __dependency6__.isPath;
+    var hasPropertyAccessors = __dependency7__.hasPropertyAccessors;
 
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
     var IS_GLOBAL = /^([A-Z$]|([0-9][A-Z$]))/;
 
     /**
@@ -16525,10 +17698,11 @@ define("ember-metal/property_set",
         return setPath(obj, keyName, value, tolerant);
       }
 
-      var meta = obj[META_KEY], desc = meta && meta.descs[keyName],
-          isUnknown, currentValue;
+      var meta = obj['__ember_meta__'];
+      var desc = meta && meta.descs[keyName];
+      var isUnknown, currentValue;
 
-      if (desc === undefined && keyName.indexOf('.') !== -1) {
+      if (desc === undefined && isPath(keyName)) {
         return setPath(obj, keyName, value, tolerant);
       }
 
@@ -16549,23 +17723,15 @@ define("ember-metal/property_set",
         if (isUnknown && 'function' === typeof obj.setUnknownProperty) {
           obj.setUnknownProperty(keyName, value);
         } else if (meta && meta.watching[keyName] > 0) {
-          if (MANDATORY_SETTER) {
-            currentValue = meta.values[keyName];
-          } else {
+          
             currentValue = obj[keyName];
-          }
+          
           // only trigger a change if the value has changed
           if (value !== currentValue) {
             propertyWillChange(obj, keyName);
-            if (MANDATORY_SETTER) {
-              if ((currentValue === undefined && !(keyName in obj)) || !obj.propertyIsEnumerable(keyName)) {
-                defineProperty(obj, keyName, null, value); // setup mandatory setter
-              } else {
-                meta.values[keyName] = value;
-              }
-            } else {
+            
               obj[keyName] = value;
-            }
+            
             propertyDidChange(obj, keyName);
           }
         } else {
@@ -16629,15 +17795,17 @@ define("ember-metal/property_set",
 
     __exports__.trySet = trySet;__exports__.set = set;
   });
-define("ember-metal/run_loop",
-  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+enifed("ember-metal/run_loop",
+  ["ember-metal/core","ember-metal/utils","ember-metal/array","ember-metal/property_events","backburner","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var apply = __dependency2__.apply;
+    var GUID_KEY = __dependency2__.GUID_KEY;
     var indexOf = __dependency3__.indexOf;
     var beginPropertyChanges = __dependency4__.beginPropertyChanges;
     var endPropertyChanges = __dependency4__.endPropertyChanges;
+    var Backburner = __dependency5__["default"];
 
     function onBegin(current) {
       run.currentRunLoop = current;
@@ -16648,8 +17816,8 @@ define("ember-metal/run_loop",
     }
 
     // ES6TODO: should Backburner become es6?
-    var Backburner = requireModule('backburner').Backburner;
     var backburner = new Backburner(['sync', 'actions', 'destroy'], {
+      GUID_KEY: GUID_KEY,
       sync: {
         before: beginPropertyChanges,
         after: endPropertyChanges
@@ -16696,7 +17864,7 @@ define("ember-metal/run_loop",
     */
     __exports__["default"] = run;
     function run() {
-      return apply(backburner, backburner.run, arguments);
+      return backburner.run.apply(backburner, arguments);
     }
 
     /**
@@ -16738,12 +17906,12 @@ define("ember-metal/run_loop",
     */
     run.join = function(target, method /* args */) {
       if (!run.currentRunLoop) {
-        return apply(Ember, run, arguments);
+        return Ember.run.apply(Ember, arguments);
       }
 
       var args = slice.call(arguments);
       args.unshift('actions');
-      apply(run, run.schedule, args);
+      run.schedule.apply(run, args);
     };
 
     /**
@@ -16790,7 +17958,7 @@ define("ember-metal/run_loop",
     run.bind = function(target, method /* args*/) {
       var args = slice.call(arguments);
       return function() {
-        return apply(run, run.join, args.concat(slice.call(arguments)));
+        return run.join.apply(run, args.concat(slice.call(arguments)));
       };
     };
 
@@ -16884,7 +18052,7 @@ define("ember-metal/run_loop",
     */
     run.schedule = function(queue, target, method) {
       checkAutoRun();
-      apply(backburner, backburner.schedule, arguments);
+      backburner.schedule.apply(backburner, arguments);
     };
 
     // Used by global test teardown
@@ -16921,7 +18089,7 @@ define("ember-metal/run_loop",
 
     /**
       Invokes the passed target/method and optional arguments after a specified
-      period if time. The last parameter of this method must always be a number
+      period of time. The last parameter of this method must always be a number
       of milliseconds.
 
       You should use this method whenever you need to run some action after a
@@ -16942,11 +18110,10 @@ define("ember-metal/run_loop",
         target at the time the method is invoked.
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @param {Number} wait Number of milliseconds to wait.
-      @return {String} a string you can use to cancel the timer in
-        `run.cancel` later.
+      @return {Object} Timer information for use in cancelling, see `run.cancel`.
     */
-    run.later = function(target, method) {
-      return apply(backburner, backburner.later, arguments);
+    run.later = function(/*target, method*/) {
+      return backburner.later.apply(backburner, arguments);
     };
 
     /**
@@ -17012,9 +18179,9 @@ define("ember-metal/run_loop",
       @param {Object} [args*] Optional arguments to pass to the timeout.
       @return {Object} Timer information for use in cancelling, see `run.cancel`.
     */
-    run.scheduleOnce = function(queue, target, method) {
+    run.scheduleOnce = function(/*queue, target, method*/) {
       checkAutoRun();
-      return apply(backburner, backburner.scheduleOnce, arguments);
+      return backburner.scheduleOnce.apply(backburner, arguments);
     };
 
     /**
@@ -17193,7 +18360,7 @@ define("ember-metal/run_loop",
       @return {Array} Timer information for use in cancelling, see `run.cancel`.
     */
     run.debounce = function() {
-      return apply(backburner, backburner.debounce, arguments);
+      return backburner.debounce.apply(backburner, arguments);
     };
 
     /**
@@ -17232,7 +18399,7 @@ define("ember-metal/run_loop",
       @return {Array} Timer information for use in cancelling, see `run.cancel`.
     */
     run.throttle = function() {
-      return apply(backburner, backburner.throttle, arguments);
+      return backburner.throttle.apply(backburner, arguments);
     };
 
     // Make sure it's not an autorun during testing
@@ -17257,12 +18424,13 @@ define("ember-metal/run_loop",
       }
     };
   });
-define("ember-metal/set_properties",
-  ["ember-metal/property_events","ember-metal/property_set","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-metal/set_properties",
+  ["ember-metal/property_events","ember-metal/property_set","ember-metal/keys","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     var changeProperties = __dependency1__.changeProperties;
     var set = __dependency2__.set;
+    var keys = __dependency3__["default"];
 
     /**
       Set a list of properties on an object. These properties are set inside
@@ -17280,20 +18448,26 @@ define("ember-metal/set_properties",
       ```
 
       @method setProperties
-      @param self
-      @param {Object} hash
-      @return self
+      @param obj
+      @param {Object} properties
+      @return obj
     */
-    __exports__["default"] = function setProperties(self, hash) {
+    __exports__["default"] = function setProperties(obj, properties) {
+      if (!properties || typeof properties !== "object") { return obj; }
       changeProperties(function() {
-        for(var prop in hash) {
-          if (hash.hasOwnProperty(prop)) { set(self, prop, hash[prop]); }
+        var props = keys(properties);
+        var propertyName;
+
+        for (var i = 0, l = props.length; i < l; i++) {
+          propertyName = props[i];
+
+          set(obj, propertyName, properties[propertyName]);
         }
       });
-      return self;
+      return obj;
     }
   });
-define("ember-metal/utils",
+enifed("ember-metal/utils",
   ["ember-metal/core","ember-metal/platform","ember-metal/array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
         // Remove "use strict"; from transpiled module until
@@ -17302,7 +18476,9 @@ define("ember-metal/utils",
     // REMOVE_USE_STRICT: true
 
     var Ember = __dependency1__["default"];
-    var platform = __dependency2__.platform;
+    var o_defineProperty = __dependency2__.defineProperty;
+    var canDefineNonEnumerableProperties = __dependency2__.canDefineNonEnumerableProperties;
+    var hasPropertyAccessors = __dependency2__.hasPropertyAccessors;
     var create = __dependency2__.create;
 
     var forEach = __dependency3__.forEach;
@@ -17343,12 +18519,58 @@ define("ember-metal/utils",
     */
     var GUID_PREFIX = 'ember';
 
-    var o_defineProperty = platform.defineProperty;
     var o_create = create;
     // Used for guid generation...
     var numberCache  = [];
     var stringCache  = {};
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
+
+    /**
+      Strongly hint runtimes to intern the provided string.
+
+      When do I need to use this function?
+
+      For the most part, never. Pre-mature optimization is bad, and often the
+      runtime does exactly what you need it to, and more often the trade-off isn't
+      worth it.
+
+      Why?
+
+      Runtimes store strings in at least 2 different representations:
+      Ropes and Symbols (interned strings). The Rope provides a memory efficient
+      data-structure for strings created from concatenation or some other string
+      manipulation like splitting.
+
+      Unfortunately checking equality of different ropes can be quite costly as
+      runtimes must resort to clever string comparison algorithims. These
+      algorithims typically cost in proportion to the length of the string.
+      Luckily, this is where the Symbols (interned strings) shine. As Symbols are
+      unique by their string content, equality checks can be done by pointer
+      comparision.
+
+      How do I know if my string is a rope or symbol?
+
+      Typically (warning general sweeping statement, but truthy in runtimes at
+      present) static strings created as part of the JS source are interned.
+      Strings often used for comparisions can be interned at runtime if some
+      criteria are met.  One of these criteria can be the size of the entire rope.
+      For example, in chrome 38 a rope longer then 12 characters will not
+      intern, nor will segments of that rope.
+
+      Some numbers: http://jsperf.com/eval-vs-keys/8
+
+      Known Trick™
+
+      @private
+      @return {String} interned version of the provided string
+    */
+    function intern(str) {
+      var obj = {};
+      obj[str] = 1;
+      for (var key in obj) {
+        if (key === str) return key;
+      }
+      return str;
+    }
 
     /**
       A unique key used to assign guids and other private metadata to objects.
@@ -17364,7 +18586,7 @@ define("ember-metal/utils",
       @type String
       @final
     */
-    var GUID_KEY = '__ember' + (+ new Date());
+    var GUID_KEY = intern('__ember' + (+ new Date()));
 
     var GUID_DESC = {
       writable:    false,
@@ -17446,7 +18668,7 @@ define("ember-metal/utils",
           if (obj[GUID_KEY]) return obj[GUID_KEY];
           if (obj === Object) return '(Object)';
           if (obj === Array)  return '(Array)';
-          ret = 'ember' + uuid();
+          ret = GUID_PREFIX + uuid();
 
           if (obj[GUID_KEY] === null) {
             obj[GUID_KEY] = ret;
@@ -17469,19 +18691,6 @@ define("ember-metal/utils",
       value: null
     };
 
-    /**
-      The key used to store meta information on object for property observing.
-
-      @property META_KEY
-      @for Ember
-      @private
-      @final
-      @type String
-    */
-    var META_KEY = '__ember_meta__';
-
-    var isDefinePropertySimulated = platform.defineProperty.isSimulated;
-
     function Meta(obj) {
       this.descs = {};
       this.watching = {};
@@ -17506,7 +18715,7 @@ define("ember-metal/utils",
       proto: null
     };
 
-    if (isDefinePropertySimulated) {
+    if (!canDefineNonEnumerableProperties) {
       // on platforms that don't support enumerable false
       // make meta fail jQuery.isPlainObject() to hide from
       // jQuery.extend() by having a property that fails
@@ -17521,8 +18730,7 @@ define("ember-metal/utils",
     // Placeholder for non-writable metas.
     var EMPTY_META = new Meta(null);
 
-    if (MANDATORY_SETTER) { EMPTY_META.values = {}; }
-
+    
     /**
       Retrieves the meta hash for an object. If `writable` is true ensures the
       hash is writable for this object as well.
@@ -17543,23 +18751,22 @@ define("ember-metal/utils",
     */
     function meta(obj, writable) {
 
-      var ret = obj[META_KEY];
+      var ret = obj['__ember_meta__'];
       if (writable===false) return ret || EMPTY_META;
 
       if (!ret) {
-        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
+        if (canDefineNonEnumerableProperties) o_defineProperty(obj, '__ember_meta__', META_DESC);
 
         ret = new Meta(obj);
 
-        if (MANDATORY_SETTER) { ret.values = {}; }
-
-        obj[META_KEY] = ret;
+        
+        obj['__ember_meta__'] = ret;
 
         // make sure we don't accidentally try to create constructor like desc
         ret.descs.constructor = null;
 
       } else if (ret.source !== obj) {
-        if (!isDefinePropertySimulated) o_defineProperty(obj, META_KEY, META_DESC);
+        if (canDefineNonEnumerableProperties) o_defineProperty(obj, '__ember_meta__', META_DESC);
 
         ret = o_create(ret);
         ret.descs     = o_create(ret.descs);
@@ -17568,9 +18775,8 @@ define("ember-metal/utils",
         ret.cacheMeta = {};
         ret.source    = obj;
 
-        if (MANDATORY_SETTER) { ret.values = o_create(ret.values); }
-
-        obj[META_KEY] = ret;
+        
+        obj['__ember_meta__'] = ret;
       }
       return ret;
     }
@@ -17620,7 +18826,8 @@ define("ember-metal/utils",
         shared with its constructor
     */
     function metaPath(obj, path, writable) {
-            var _meta = meta(obj, writable), keyName, value;
+            var _meta = meta(obj, writable);
+      var keyName, value;
 
       for (var i=0, l=path.length; i<l; i++) {
         keyName = path[i];
@@ -17655,9 +18862,14 @@ define("ember-metal/utils",
     */
     function wrap(func, superFunc) {
       function superWrapper() {
-        var ret, sup = this && this.__nextSuper;
+        var ret;
+        var sup  = this && this.__nextSuper;
+        var args = new Array(arguments.length);
+        for (var i = 0, l = args.length; i < l; i++) {
+          args[i] = arguments[i];
+        }
         if(this) { this.__nextSuper = superFunc; }
-        ret = apply(this, func, arguments);
+        ret = apply(this, func, args);
         if(this) { this.__nextSuper = sup; }
         return ret;
       }
@@ -18060,13 +19272,19 @@ define("ember-metal/utils",
         return obj + '';
       }
 
-      var v, ret = [];
+      var v;
+      var ret = [];
       for(var key in obj) {
         if (obj.hasOwnProperty(key)) {
           v = obj[key];
           if (v === 'toString') { continue; } // ignore useless items
           if (typeOf(v) === 'function') { v = "function() { ... }"; }
-          ret.push(key + ": " + v);
+
+          if (v && typeof v.toString !== 'function') {
+            ret.push(key + ": " + toString.call(v));
+          } else {
+            ret.push(key + ": " + v);
+          }
         }
       }
       return "{" + ret.join(", ") + "}";
@@ -18102,10 +19320,8 @@ define("ember-metal/utils",
     }
 
     __exports__.applyStr = applyStr;__exports__.GUID_KEY = GUID_KEY;
-    __exports__.GUID_PREFIX = GUID_PREFIX;
     __exports__.META_DESC = META_DESC;
     __exports__.EMPTY_META = EMPTY_META;
-    __exports__.META_KEY = META_KEY;
     __exports__.meta = meta;
     __exports__.typeOf = typeOf;
     __exports__.tryCatchFinally = tryCatchFinally;
@@ -18113,18 +19329,20 @@ define("ember-metal/utils",
     __exports__.canInvoke = canInvoke;
     __exports__.tryFinally = tryFinally;
   });
-define("ember-metal/watch_key",
-  ["ember-metal/core","ember-metal/utils","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+enifed("ember-metal/watch_key",
+  ["ember-metal/core","ember-metal/utils","ember-metal/platform","ember-metal/properties","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     var meta = __dependency2__.meta;
     var typeOf = __dependency2__.typeOf;
-    var platform = __dependency3__.platform;
+    var o_defineProperty = __dependency3__.defineProperty;
+    var hasPropertyAccessors = __dependency3__.hasPropertyAccessors;
+    var MANDATORY_SETTER_FUNCTION = __dependency4__.MANDATORY_SETTER_FUNCTION;
+    var DEFAULT_GETTER_FUNCTION = __dependency4__.DEFAULT_GETTER_FUNCTION;
 
     var metaFor = meta; // utils.js
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
-    var o_defineProperty = platform.defineProperty;
+
 
     function watchKey(obj, keyName, meta) {
       // can't watch length on Array - it is special...
@@ -18143,21 +19361,14 @@ define("ember-metal/watch_key",
           obj.willWatchProperty(keyName);
         }
 
-        if (MANDATORY_SETTER && keyName in obj) {
-          m.values[keyName] = obj[keyName];
-          o_defineProperty(obj, keyName, {
-            configurable: true,
-            enumerable: obj.propertyIsEnumerable(keyName),
-            set: Ember.MANDATORY_SETTER_FUNCTION,
-            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
-          });
-        }
-      } else {
+              } else {
         watching[keyName] = (watching[keyName] || 0) + 1;
       }
     }
 
-    __exports__.watchKey = watchKey;function unwatchKey(obj, keyName, meta) {
+    __exports__.watchKey = watchKey;
+    
+    function unwatchKey(obj, keyName, meta) {
       var m = meta || metaFor(obj), watching = m.watching;
 
       if (watching[keyName] === 1) {
@@ -18170,31 +19381,14 @@ define("ember-metal/watch_key",
           obj.didUnwatchProperty(keyName);
         }
 
-        if (MANDATORY_SETTER && keyName in obj) {
-          o_defineProperty(obj, keyName, {
-            configurable: true,
-            enumerable: obj.propertyIsEnumerable(keyName),
-            set: function(val) {
-              // redefine to set as enumerable
-              o_defineProperty(obj, keyName, {
-                configurable: true,
-                writable: true,
-                enumerable: true,
-                value: val
-              });
-              delete m.values[keyName];
-            },
-            get: Ember.DEFAULT_GETTER_FUNCTION(keyName)
-          });
-        }
-      } else if (watching[keyName] > 1) {
+              } else if (watching[keyName] > 1) {
         watching[keyName]--;
       }
     }
 
     __exports__.unwatchKey = unwatchKey;
   });
-define("ember-metal/watch_path",
+enifed("ember-metal/watch_path",
   ["ember-metal/utils","ember-metal/chains","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -18208,7 +19402,8 @@ define("ember-metal/watch_path",
     // chains inherited from the proto they will be cloned and reconfigured for
     // the current object.
     function chainsFor(obj, meta) {
-      var m = meta || metaFor(obj), ret = m.chains;
+      var m = meta || metaFor(obj);
+      var ret = m.chains;
       if (!ret) {
         ret = m.chains = new ChainNode(null, null, obj);
       } else if (ret.value() !== obj) {
@@ -18221,7 +19416,8 @@ define("ember-metal/watch_path",
       // can't watch length on Array - it is special...
       if (keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      var m = meta || metaFor(obj), watching = m.watching;
+      var m = meta || metaFor(obj);
+      var watching = m.watching;
 
       if (!watching[keyPath]) { // activate watching first time
         watching[keyPath] = 1;
@@ -18232,7 +19428,8 @@ define("ember-metal/watch_path",
     }
 
     __exports__.watchPath = watchPath;function unwatchPath(obj, keyPath, meta) {
-      var m = meta || metaFor(obj), watching = m.watching;
+      var m = meta || metaFor(obj);
+      var watching = m.watching;
 
       if (watching[keyPath] === 1) {
         watching[keyPath] = 0;
@@ -18244,16 +19441,15 @@ define("ember-metal/watch_path",
 
     __exports__.unwatchPath = unwatchPath;
   });
-define("ember-metal/watching",
-  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
+enifed("ember-metal/watching",
+  ["ember-metal/utils","ember-metal/chains","ember-metal/watch_key","ember-metal/watch_path","ember-metal/path_cache","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     /**
     @module ember-metal
     */
 
     var meta = __dependency1__.meta;
-    var META_KEY = __dependency1__.META_KEY;
     var GUID_KEY = __dependency1__.GUID_KEY;
     var typeOf = __dependency1__.typeOf;
     var generateGuid = __dependency1__.generateGuid;
@@ -18265,11 +19461,7 @@ define("ember-metal/watching",
     var unwatchPath = __dependency4__.unwatchPath;
 
     var metaFor = meta; // utils.js
-
-    // returns true if the passed path is just a keyName
-    function isKeyName(path) {
-      return path.indexOf('.') === -1;
-    }
+    var isPath = __dependency5__.isPath;
 
     /**
       Starts watching a property on an object. Whenever the property changes,
@@ -18288,7 +19480,7 @@ define("ember-metal/watching",
       // can't watch length on Array - it is special...
       if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      if (isKeyName(_keyPath)) {
+      if (!isPath(_keyPath)) {
         watchKey(obj, _keyPath, m);
       } else {
         watchPath(obj, _keyPath, m);
@@ -18298,7 +19490,7 @@ define("ember-metal/watching",
     __exports__.watch = watch;
 
     function isWatching(obj, key) {
-      var meta = obj[META_KEY];
+      var meta = obj['__ember_meta__'];
       return (meta && meta.watching[key]) > 0;
     }
 
@@ -18308,7 +19500,7 @@ define("ember-metal/watching",
       // can't watch length on Array - it is special...
       if (_keyPath === 'length' && typeOf(obj) === 'array') { return; }
 
-      if (isKeyName(_keyPath)) {
+      if (!isPath(_keyPath)) {
         unwatchKey(obj, _keyPath, m);
       } else {
         unwatchPath(obj, _keyPath, m);
@@ -18326,7 +19518,7 @@ define("ember-metal/watching",
       @param obj
     */
     function rewatch(obj) {
-      var m = obj[META_KEY], chains = m && m.chains;
+      var m = obj['__ember_meta__'], chains = m && m.chains;
 
       // make sure the object has its own guid.
       if (GUID_KEY in obj && !obj.hasOwnProperty(GUID_KEY)) {
@@ -18351,9 +19543,9 @@ define("ember-metal/watching",
       @return {void}
     */
     function destroy(obj) {
-      var meta = obj[META_KEY], node, nodes, key, nodeObject;
+      var meta = obj['__ember_meta__'], node, nodes, key, nodeObject;
       if (meta) {
-        obj[META_KEY] = null;
+        obj['__ember_meta__'] = null;
         // remove chainWatchers to remove circular references that would prevent GC
         node = meta.chains;
         if (node) {
@@ -18384,7 +19576,7 @@ define("ember-metal/watching",
 
     __exports__.destroy = destroy;
   });
-define("ember-routing-handlebars",
+enifed("ember-routing-handlebars",
   ["ember-metal/core","ember-handlebars","ember-routing/system/router","ember-routing-handlebars/helpers/shared","ember-routing-handlebars/helpers/link_to","ember-routing-handlebars/helpers/outlet","ember-routing-handlebars/helpers/render","ember-routing-handlebars/helpers/action","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -18406,6 +19598,7 @@ define("ember-routing-handlebars",
     var deprecatedLinkToHelper = __dependency5__.deprecatedLinkToHelper;
     var linkToHelper = __dependency5__.linkToHelper;
     var LinkView = __dependency5__.LinkView;
+    var queryParamsHelper = __dependency5__.queryParamsHelper;
 
     var outletHelper = __dependency6__.outletHelper;
     var OutletView = __dependency6__.OutletView;
@@ -18427,12 +19620,13 @@ define("ember-routing-handlebars",
     EmberHandlebars.registerHelper('outlet', outletHelper);
     EmberHandlebars.registerHelper('link-to', linkToHelper);
     EmberHandlebars.registerHelper('linkTo', deprecatedLinkToHelper);
+    EmberHandlebars.registerHelper('query-params', queryParamsHelper);
 
     __exports__["default"] = Ember;
   });
-define("ember-routing-handlebars/helpers/action",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/system/utils","ember-routing/system/router","ember-handlebars","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing-handlebars/helpers/shared","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+enifed("ember-routing-handlebars/helpers/action",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/run_loop","ember-views/system/utils","ember-views/system/action_manager","ember-routing/system/router","ember-handlebars","ember-handlebars/ext","ember-handlebars/helpers/view","ember-routing-handlebars/helpers/shared","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Handlebars, uuid, FEATURES, assert, deprecate
@@ -18442,13 +19636,14 @@ define("ember-routing-handlebars/helpers/action",
     var run = __dependency5__["default"];
 
     var isSimpleClick = __dependency6__.isSimpleClick;
-    var EmberRouter = __dependency7__["default"];
+    var ActionManager = __dependency7__["default"];
+    var EmberRouter = __dependency8__["default"];
 
-    var EmberHandlebars = __dependency8__["default"];
-    var handlebarsGet = __dependency9__.handlebarsGet;
-    var viewHelper = __dependency10__.viewHelper;
-    var resolveParams = __dependency11__.resolveParams;
-    var resolvePath = __dependency11__.resolvePath;
+    var EmberHandlebars = __dependency9__["default"];
+    var handlebarsGet = __dependency10__.handlebarsGet;
+    var viewHelper = __dependency11__.viewHelper;
+    var resolveParams = __dependency12__.resolveParams;
+    var resolvePath = __dependency12__.resolvePath;
 
     /**
     @module ember
@@ -18462,15 +19657,17 @@ define("ember-routing-handlebars/helpers/action",
       var ret = [];
       if (actionName) { ret.push(actionName); }
 
-      var types = options.options.types.slice(1),
-          data = options.options.data;
+      var types = options.options.types.slice(1);
+      var data = options.options.data;
 
       return ret.concat(resolveParams(options.context, options.params, { types: types, data: data }));
     }
 
-    var ActionHelper = {
-      registeredActions: {}
-    };
+    var ActionHelper = {};
+
+    // registeredActions is re-exported for compatibility with older plugins
+    // that were using this undocumented API.
+    ActionHelper.registeredActions = ActionManager.registeredActions;
 
     __exports__.ActionHelper = ActionHelper;
 
@@ -18502,10 +19699,20 @@ define("ember-routing-handlebars/helpers/action",
       return allowed;
     };
 
+    function isKeyEvent(eventName) {
+      return ['keyUp', 'keyPress', 'keyDown'].indexOf(eventName) !== -1;
+    }
+
+    function ignoreKeyEvent(eventName, event, keyCode) {
+      var any = 'any';
+      keyCode = keyCode || any;
+      return isKeyEvent(eventName) && keyCode !== any && keyCode !== event.which.toString();
+    }
+
     ActionHelper.registerAction = function(actionNameOrPath, options, allowedKeys) {
       var actionId = uuid();
 
-      ActionHelper.registeredActions[actionId] = {
+      ActionManager.registeredActions[actionId] = {
         eventName: options.eventName,
         handler: function handleRegisteredAction(event) {
           if (!isAllowedEvent(event, allowedKeys)) { return true; }
@@ -18518,10 +19725,12 @@ define("ember-routing-handlebars/helpers/action",
             event.stopPropagation();
           }
 
-          var target = options.target,
-              parameters = options.parameters,
-              actionName;
+          var target = options.target;
+          var parameters = options.parameters;
+          var eventName = options.eventName;
+          var actionName;
 
+          
           if (target.target) {
             target = handlebarsGet(target.root, target.target, target.options);
           } else {
@@ -18551,24 +19760,25 @@ define("ember-routing-handlebars/helpers/action",
       };
 
       options.view.on('willClearRender', function() {
-        delete ActionHelper.registeredActions[actionId];
+        delete ActionManager.registeredActions[actionId];
       });
 
       return actionId;
     };
 
     /**
-      The `{{action}}` helper registers an HTML element within a template for DOM
-      event handling and forwards that interaction to the templates's controller
-      or supplied `target` option (see 'Specifying a Target').
 
-      If the controller does not implement the event, the event is sent
+      The `{{action}}` helper provides a useful shortcut for registering an HTML
+      element within a template for a single DOM event and forwarding that
+      interaction to the template's controller or specified `target` option.
+
+      If the controller does not implement the specified action, the event is sent
       to the current route, and it bubbles up the route hierarchy from there.
 
-      User interaction with that element will invoke the supplied action name on
-      the appropriate target. Specifying a non-quoted action name will result in
-      a bound property lookup at the time the event will be triggered.
+      For more advanced event handling see [Ember.Component](/api/classes/Ember.Component.html)
 
+
+      ### Use
       Given the following application Handlebars template on the page
 
       ```handlebars
@@ -18648,12 +19858,6 @@ define("ember-routing-handlebars/helpers/action",
       See `Ember.View` 'Responding to Browser Events' for a list of
       acceptable DOM event names.
 
-      NOTE: Because `{{action}}` depends on Ember's event dispatch system it will
-      only function if an `Ember.EventDispatcher` instance is available. An
-      `Ember.EventDispatcher` instance will be created when a new `Ember.Application`
-      is created. Having an instance of `Ember.Application` will satisfy this
-      requirement.
-
       ### Specifying whitelisted modifier keys
 
       By default the `{{action}}` helper will ignore click event with pressed modifier
@@ -18679,7 +19883,7 @@ define("ember-routing-handlebars/helpers/action",
 
       There are several possible target objects for `{{action}}` helpers:
 
-      In a typical Ember application, where views are managed through use of the
+      In a typical Ember application, where templates are managed through use of the
       `{{outlet}}` helper, actions will bubble to the current controller, then
       to the current route, and then up the route hierarchy.
 
@@ -18727,11 +19931,10 @@ define("ember-routing-handlebars/helpers/action",
       @param {Hash} options
     */
     function actionHelper(actionName) {
-      var options = arguments[arguments.length - 1],
-          contexts = a_slice.call(arguments, 1, -1);
-
-      var hash = options.hash,
-          controller = options.data.keywords.controller;
+      var options = arguments[arguments.length - 1];
+      var contexts = a_slice.call(arguments, 1, -1);
+      var hash = options.hash;
+      var controller = options.data.keywords.controller;
 
       // create a hash to pass along to registerAction
       var action = {
@@ -18745,6 +19948,7 @@ define("ember-routing-handlebars/helpers/action",
         bubbles: hash.bubbles,
         preventDefault: hash.preventDefault,
         target: { options: options },
+        withKeyCode: hash.withKeyCode,
         boundProperty: options.types[0] === "ID"
       };
 
@@ -18761,8 +19965,8 @@ define("ember-routing-handlebars/helpers/action",
 
     __exports__.actionHelper = actionHelper;
   });
-define("ember-routing-handlebars/helpers/link_to",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing-handlebars/helpers/shared","exports"],
+enifed("ember-routing-handlebars/helpers/link_to",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/merge","ember-metal/run_loop","ember-metal/computed","ember-runtime/system/lazy_load","ember-runtime/system/string","ember-runtime/system/object","ember-metal/keys","ember-views/system/utils","ember-views/views/component","ember-handlebars","ember-handlebars/helpers/view","ember-routing/system/router","ember-routing-handlebars/helpers/shared","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -18812,8 +20016,8 @@ define("ember-routing-handlebars/helpers/link_to",
 
     function getResolvedPaths(options) {
 
-      var types = options.options.types,
-          data = options.options.data;
+      var types = options.options.types;
+      var data = options.options.data;
 
       return resolvePaths(options.context, options.params, { types: types, data: data });
     }
@@ -18834,8 +20038,20 @@ define("ember-routing-handlebars/helpers/link_to",
     **/
     var LinkView = Ember.LinkView = EmberComponent.extend({
       tagName: 'a',
+
+      /**
+        @deprecated Use current-when instead.
+        @property currentWhen
+      */
       currentWhen: null,
 
+      /**
+        Used to determine when this LinkView is active.
+
+        @property currentWhen
+      */
+      'current-when': null,
+
       /**
         Sets the `title` attribute of the `LinkView`'s HTML element.
 
@@ -18965,6 +20181,7 @@ define("ember-routing-handlebars/helpers/link_to",
       init: function() {
         this._super.apply(this, arguments);
 
+        
         // Map desired event name to invoke function
         var eventName = get(this, 'eventName');
         this.on(eventName, this, this._invoke);
@@ -18990,11 +20207,11 @@ define("ember-routing-handlebars/helpers/link_to",
        @since 1.3.0
       **/
       _setupPathObservers: function(){
-        var helperParameters = this.parameters,
-            linkTextPath     = helperParameters.options.linkTextPath,
-            paths = getResolvedPaths(helperParameters),
-            length = paths.length,
-            path, i, normalizedPath;
+        var helperParameters = this.parameters;
+        var linkTextPath = helperParameters.options.linkTextPath;
+        var paths = getResolvedPaths(helperParameters);
+        var length = paths.length;
+        var path, i, normalizedPath;
 
         if (linkTextPath) {
           normalizedPath = getNormalizedPath(linkTextPath, helperParameters);
@@ -19056,6 +20273,9 @@ define("ember-routing-handlebars/helpers/link_to",
         or the application's current route is the route the `LinkView` would trigger
         transitions into.
 
+        The `currentWhen` property can match against multiple routes by separating
+        route names using the ` ` (space) character.
+
         @property active
       **/
       active: computed('loadedParams', function computeLinkViewActive() {
@@ -19064,33 +20284,33 @@ define("ember-routing-handlebars/helpers/link_to",
         var router = get(this, 'router');
         var loadedParams = get(this, 'loadedParams');
         var contexts = loadedParams.models;
-        var currentWhen = this.currentWhen;
+        var currentWhen = this['current-when'] || this.currentWhen;
         var isCurrentWhenSpecified = Boolean(currentWhen);
         currentWhen = currentWhen || loadedParams.targetRouteName;
 
-        var handlers = router.router.recognizer.handlersFor(currentWhen);
-        var leafName = handlers[handlers.length-1].handler;
-        var maximumContexts = numberOfContextsAcceptedByHandler(currentWhen, handlers);
+        function isActiveForRoute(routeName) {
+          var handlers = router.router.recognizer.handlersFor(routeName);
+          var leafName = handlers[handlers.length-1].handler;
+          var maximumContexts = numberOfContextsAcceptedByHandler(routeName, handlers);
 
-        // NOTE: any ugliness in the calculation of activeness is largely
-        // due to the fact that we support automatic normalizing of
-        // `resource` -> `resource.index`, even though there might be
-        // dynamic segments / query params defined on `resource.index`
-        // which complicates (and makes somewhat ambiguous) the calculation
-        // of activeness for links that link to `resource` instead of
-        // directly to `resource.index`.
+          // NOTE: any ugliness in the calculation of activeness is largely
+          // due to the fact that we support automatic normalizing of
+          // `resource` -> `resource.index`, even though there might be
+          // dynamic segments / query params defined on `resource.index`
+          // which complicates (and makes somewhat ambiguous) the calculation
+          // of activeness for links that link to `resource` instead of
+          // directly to `resource.index`.
 
-        // if we don't have enough contexts revert back to full route name
-        // this is because the leaf route will use one of the contexts
-        if (contexts.length > maximumContexts) {
-          currentWhen = leafName;
-        }
+          // if we don't have enough contexts revert back to full route name
+          // this is because the leaf route will use one of the contexts
+          if (contexts.length > maximumContexts) {
+            routeName = leafName;
+          }
 
-        var args = routeArgs(currentWhen, contexts, null);
-        var isActive = router.isActive.apply(router, args);
-        if (!isActive) { return false; }
+          var args = routeArgs(routeName, contexts, null);
+          var isActive = router.isActive.apply(router, args);
+          if (!isActive) { return false; }
 
-        
           var emptyQueryParams = Ember.isEmpty(Ember.keys(loadedParams.queryParams));
 
           if (!isCurrentWhenSpecified && !emptyQueryParams && isActive) {
@@ -19099,10 +20319,18 @@ define("ember-routing-handlebars/helpers/link_to",
             router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
             isActive = shallowEqual(visibleQueryParams, router.router.state.queryParams);
           }
-        
 
-        if (isActive) { return get(this, 'activeClass'); }
-      }),
+          return isActive;
+        }
+
+        
+          currentWhen = currentWhen.split(' ');
+          for (var i = 0, len = currentWhen.length; i < len; i++) {
+            if (isActiveForRoute(currentWhen[i])) {
+              return get(this, 'activeClass');
+            }
+          }
+              }),
 
       /**
         Accessed as a classname binding to apply the `LinkView`'s `loadingClass`
@@ -19144,9 +20372,11 @@ define("ember-routing-handlebars/helpers/link_to",
 
         if (this.preventDefault !== false) {
           
-            event.preventDefault();
-          
-        }
+            var targetAttribute = get(this, 'target');
+            if (!targetAttribute || targetAttribute === '_self') {
+              event.preventDefault();
+            }
+                  }
 
         if (this.bubbles === false) { event.stopPropagation(); }
 
@@ -19157,8 +20387,15 @@ define("ember-routing-handlebars/helpers/link_to",
           return false;
         }
 
-        var router = get(this, 'router'),
-            loadedParams = get(this, 'loadedParams');
+        
+          var targetAttribute2 = get(this, 'target');
+          if (targetAttribute2 && targetAttribute2 !== '_self') {
+            return false;
+          }
+        
+
+        var router = get(this, 'router');
+        var loadedParams = get(this, 'loadedParams');
 
         var transition = router._doTransition(loadedParams.targetRouteName, loadedParams.models, loadedParams.queryParams);
         if (get(this, 'replace')) {
@@ -19226,13 +20463,13 @@ define("ember-routing-handlebars/helpers/link_to",
         @return {Array}
        */
       resolvedParams: computed('router.url', function() {
-        var parameters = this.parameters,
-            options = parameters.options,
-            types = options.types,
-            data = options.data,
-            targetRouteName, models;
-
+        var parameters = this.parameters;
+        var options = parameters.options;
+        var types = options.types;
+        var data = options.data;
+        var targetRouteName, models;
         var onlyQueryParamsSupplied = (parameters.params.length === 0);
+
         if (onlyQueryParamsSupplied) {
           var appController = this.container.lookup('controller:application');
           targetRouteName = get(appController, 'currentRouteName');
@@ -19265,8 +20502,8 @@ define("ember-routing-handlebars/helpers/link_to",
         var router = get(this, 'router');
         if (!router) { return; }
 
-        var resolvedParams = get(this, 'resolvedParams'),
-            namedRoute = resolvedParams.targetRouteName;
+        var resolvedParams = get(this, 'resolvedParams');
+        var namedRoute = resolvedParams.targetRouteName;
 
         if (!namedRoute) { return; }
 
@@ -19290,18 +20527,16 @@ define("ember-routing-handlebars/helpers/link_to",
       href: computed('loadedParams', function computeLinkViewHref() {
         if (get(this, 'tagName') !== 'a') { return; }
 
-        var router = get(this, 'router'),
-            loadedParams = get(this, 'loadedParams');
+        var router = get(this, 'router');
+        var loadedParams = get(this, 'loadedParams');
 
         if (!loadedParams) {
           return get(this, 'loadingHref');
         }
 
         var visibleQueryParams = {};
-        
-          merge(visibleQueryParams, loadedParams.queryParams);
-          router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
-        
+        merge(visibleQueryParams, loadedParams.queryParams);
+        router._prepareQueryParams(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
 
         var args = routeArgs(loadedParams.targetRouteName, loadedParams.models, visibleQueryParams);
         var result = router.generate.apply(router, args);
@@ -19322,6 +20557,19 @@ define("ember-routing-handlebars/helpers/link_to",
     LinkView.toString = function() { return "LinkView"; };
 
     
+      LinkView.reopen({
+        attributeBindings: ['target'],
+
+        /**
+          Sets the `target` attribute of the `LinkView`'s anchor element.
+
+          @property target
+          @default null
+        **/
+        target: null
+      });
+    
+
     /**
       The `{{link-to}}` helper renders a link to the supplied
       `routeName` passing an optionally supplied model to the
@@ -19585,9 +20833,9 @@ define("ember-routing-handlebars/helpers/link_to",
       @see {Ember.LinkView}
     */
     function linkToHelper(name) {
-      var options = slice.call(arguments, -1)[0],
-          params = slice.call(arguments, 0, -1),
-          hash = options.hash;
+      var options = slice.call(arguments, -1)[0];
+      var params = slice.call(arguments, 0, -1);
+      var hash = options.hash;
 
       
       if (params[params.length - 1] instanceof QueryParams) {
@@ -19623,18 +20871,21 @@ define("ember-routing-handlebars/helpers/link_to",
       return viewHelper.call(this, LinkView, options);
     }
 
-
-    
-      EmberHandlebars.registerHelper('query-params', function queryParamsHelper(options) {
-        
-        return QueryParams.create({
-          values: options.hash,
-          types: options.hashTypes
-        });
-      });
-    
-
     /**
+      @method query-params
+      @for Ember.Handlebars.helpers
+      @param {Object} hash takes a hash of query parameters
+      @return {String} HTML string
+    */
+    function queryParamsHelper(options) {
+      
+      return QueryParams.create({
+        values: options.hash,
+        types: options.hashTypes
+      });
+    }
+
+    __exports__.queryParamsHelper = queryParamsHelper;/**
       See [link-to](/api/classes/Ember.Handlebars.helpers.html#method_link-to)
 
       @method linkTo
@@ -19649,9 +20900,9 @@ define("ember-routing-handlebars/helpers/link_to",
     }
 
     function getResolvedQueryParams(linkView, targetRouteName) {
-      var helperParameters = linkView.parameters,
-          queryParamsObject = linkView.queryParamsObject,
-          resolvedQueryParams = {};
+      var helperParameters = linkView.parameters;
+      var queryParamsObject = linkView.queryParamsObject;
+      var resolvedQueryParams = {};
 
       if (!queryParamsObject) { return resolvedQueryParams; }
       var rawParams = queryParamsObject.values;
@@ -19659,8 +20910,8 @@ define("ember-routing-handlebars/helpers/link_to",
       for (var key in rawParams) {
         if (!rawParams.hasOwnProperty(key)) { continue; }
 
-        var value = rawParams[key],
-            type = queryParamsObject.types[key];
+        var value = rawParams[key];
+        var type = queryParamsObject.types[key];
 
         if (type === 'ID') {
           var normalizedPath = getNormalizedPath(value, helperParameters);
@@ -19700,7 +20951,7 @@ define("ember-routing-handlebars/helpers/link_to",
     __exports__.deprecatedLinkToHelper = deprecatedLinkToHelper;
     __exports__.linkToHelper = linkToHelper;
   });
-define("ember-routing-handlebars/helpers/outlet",
+enifed("ember-routing-handlebars/helpers/outlet",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/lazy_load","ember-views/views/container_view","ember-handlebars/views/metamorph_view","ember-handlebars/helpers/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -19826,7 +21077,7 @@ define("ember-routing-handlebars/helpers/outlet",
 
     __exports__.outletHelper = outletHelper;
   });
-define("ember-routing-handlebars/helpers/render",
+enifed("ember-routing-handlebars/helpers/render",
   ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-routing/system/generate_controller","ember-handlebars/ext","ember-handlebars/helpers/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -19839,7 +21090,7 @@ define("ember-routing-handlebars/helpers/render",
     var generateControllerFactory = __dependency6__.generateControllerFactory;
     var generateController = __dependency6__["default"];
     var handlebarsGet = __dependency7__.handlebarsGet;
-    var viewHelper = __dependency8__.viewHelper;
+    var ViewHelper = __dependency8__.ViewHelper;
 
 
     /**
@@ -19919,9 +21170,8 @@ define("ember-routing-handlebars/helpers/render",
     */
     __exports__["default"] = function renderHelper(name, contextString, options) {
       var length = arguments.length;
-
-      var contextProvided = length === 3,
-          container, router, controller, view, context, lookupOptions;
+      var contextProvided = length === 3;
+      var container, router, controller, view, context, lookupOptions;
 
       container = (options || contextString).data.keywords.controller.container;
       router = container.lookup('router:main');
@@ -19999,10 +21249,10 @@ define("ember-routing-handlebars/helpers/render",
 
       options.helperName = options.helperName || ('render "' + name + '"');
 
-      viewHelper.call(this, view, options);
+      ViewHelper.instanceHelper(this, view, options);
     }
   });
-define("ember-routing-handlebars/helpers/shared",
+enifed("ember-routing-handlebars/helpers/shared",
   ["ember-metal/property_get","ember-metal/array","ember-runtime/mixins/controller","ember-handlebars/ext","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -20071,8 +21321,8 @@ define("ember-routing-handlebars/helpers/shared",
     }
 
     __exports__.stashParamNames = stashParamNames;function resolvePaths(context, params, options) {
-      var resolved = handlebarsResolve(context, params, options),
-          types = options.types;
+      var resolved = handlebarsResolve(context, params, options);
+      var types = options.types;
 
       return map.call(resolved, function(object, i) {
         if (types[i] === 'ID') {
@@ -20095,7 +21345,7 @@ define("ember-routing-handlebars/helpers/shared",
 
     __exports__.resolvePaths = resolvePaths;
   });
-define("ember-routing",
+enifed("ember-routing",
   ["ember-handlebars","ember-metal/core","ember-routing/ext/run_loop","ember-routing/ext/controller","ember-routing/ext/view","ember-routing/location/api","ember-routing/location/none_location","ember-routing/location/hash_location","ember-routing/location/history_location","ember-routing/location/auto_location","ember-routing/system/generate_controller","ember-routing/system/controller_for","ember-routing/system/dsl","ember-routing/system/router","ember-routing/system/route","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
@@ -20140,7 +21390,7 @@ define("ember-routing",
 
     __exports__["default"] = Ember;
   });
-define("ember-routing/ext/controller",
+enifed("ember-routing/ext/controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/merge","ember-metal/enumerable_utils","ember-runtime/mixins/controller","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -20162,6 +21412,143 @@ define("ember-routing/ext/controller",
     */
 
     ControllerMixin.reopen({
+      concatenatedProperties: ['queryParams', '_pCacheMeta'],
+
+      init: function() {
+        this._super.apply(this, arguments);
+        listenForQueryParamChanges(this);
+      },
+
+      /**
+        @property queryParams
+        @public
+      */
+      queryParams: null,
+
+      /**
+        @property _qpDelegate
+        @private
+      */
+      _qpDelegate: null,
+
+      /**
+        @property _normalizedQueryParams
+        @private
+      */
+      _normalizedQueryParams: computed(function() {
+        var m = meta(this);
+        if (m.proto !== this) {
+          return get(m.proto, '_normalizedQueryParams');
+        }
+
+        var queryParams = get(this, 'queryParams');
+        if (queryParams._qpMap) {
+          return queryParams._qpMap;
+        }
+
+        var qpMap = queryParams._qpMap = {};
+
+        for (var i = 0, len = queryParams.length; i < len; ++i) {
+          accumulateQueryParamDescriptors(queryParams[i], qpMap);
+        }
+
+        return qpMap;
+      }),
+
+      /**
+        @property _cacheMeta
+        @private
+      */
+      _cacheMeta: computed(function() {
+        var m = meta(this);
+        if (m.proto !== this) {
+          return get(m.proto, '_cacheMeta');
+        }
+
+        var cacheMeta = {};
+        var qpMap = get(this, '_normalizedQueryParams');
+        for (var prop in qpMap) {
+          if (!qpMap.hasOwnProperty(prop)) { continue; }
+
+          var qp = qpMap[prop];
+          var scope = qp.scope;
+          var parts;
+
+          if (scope === 'controller') {
+            parts = [];
+          }
+
+          cacheMeta[prop] = {
+            parts: parts, // provided by route if 'model' scope
+            values: null, // provided by route
+            scope: scope,
+            prefix: "",
+            def: get(this, prop)
+          };
+        }
+
+        return cacheMeta;
+      }),
+
+      /**
+        @method _updateCacheParams
+        @private
+      */
+      _updateCacheParams: function(params) {
+        var cacheMeta = get(this, '_cacheMeta');
+        for (var prop in cacheMeta) {
+          if (!cacheMeta.hasOwnProperty(prop)) { continue; }
+          var propMeta = cacheMeta[prop];
+          propMeta.values = params;
+
+          var cacheKey = this._calculateCacheKey(propMeta.prefix, propMeta.parts, propMeta.values);
+          var cache = this._bucketCache;
+
+          if (cache) {
+            var value = cache.lookup(cacheKey, prop, propMeta.def);
+            set(this, prop, value);
+          }
+        }
+      },
+
+      /**
+        @method _qpChanged
+        @private
+      */
+      _qpChanged: function(controller, _prop) {
+        var prop = _prop.substr(0, _prop.length-3);
+        var cacheMeta = get(controller, '_cacheMeta');
+        var propCache = cacheMeta[prop];
+        var cacheKey = controller._calculateCacheKey(propCache.prefix || "", propCache.parts, propCache.values);
+        var value = get(controller, prop);
+
+        // 1. Update model-dep cache
+        var cache = this._bucketCache;
+        if (cache) {
+          controller._bucketCache.stash(cacheKey, prop, value);
+        }
+
+        // 2. Notify a delegate (e.g. to fire a qp transition)
+        var delegate = controller._qpDelegate;
+        if (delegate) {
+          delegate(controller, prop);
+        }
+      },
+
+      /**
+        @method _calculateCacheKey
+        @private
+      */
+      _calculateCacheKey: function(prefix, _parts, values) {
+        var parts = _parts || [], suffixes = "";
+        for (var i = 0, len = parts.length; i < len; ++i) {
+          var part = parts[i];
+          var value = get(values, part);
+          suffixes += "::" + part + ":" + value;
+        }
+        return prefix + suffixes.replace(ALL_PERIODS_REGEX, '-');
+      },
+
       /**
         Transition the application into another route. The route may
         be either a single route or route path:
@@ -20308,117 +21695,6 @@ define("ember-routing/ext/controller",
 
     var ALL_PERIODS_REGEX = /\./g;
 
-    
-      ControllerMixin.reopen({
-        init: function() {
-          this._super.apply(this, arguments);
-          listenForQueryParamChanges(this);
-        },
-
-        concatenatedProperties: ['queryParams', '_pCacheMeta'],
-        queryParams: null,
-
-        _qpDelegate: null,
-        _normalizedQueryParams: computed(function() {
-          var m = meta(this);
-          if (m.proto !== this) {
-            return get(m.proto, '_normalizedQueryParams');
-          }
-
-          var queryParams = get(this, 'queryParams');
-          if (queryParams._qpMap) {
-            return queryParams._qpMap;
-          }
-
-          var qpMap = queryParams._qpMap = {};
-
-          for (var i = 0, len = queryParams.length; i < len; ++i) {
-            accumulateQueryParamDescriptors(queryParams[i], qpMap);
-          }
-
-          return qpMap;
-        }),
-
-        _cacheMeta: computed(function() {
-          var m = meta(this);
-          if (m.proto !== this) {
-            return get(m.proto, '_cacheMeta');
-          }
-
-          var cacheMeta = {};
-          var qpMap = get(this, '_normalizedQueryParams');
-          for (var prop in qpMap) {
-            if (!qpMap.hasOwnProperty(prop)) { continue; }
-
-            var qp = qpMap[prop];
-            var scope = qp.scope;
-            var parts;
-
-            if (scope === 'controller') {
-              parts = [];
-            }
-
-            cacheMeta[prop] = {
-              parts: parts, // provided by route if 'model' scope
-              values: null, // provided by route
-              scope: scope,
-              prefix: "",
-              def: get(this, prop)
-            };
-          }
-
-          return cacheMeta;
-        }),
-
-        _updateCacheParams: function(params) {
-          var cacheMeta = get(this, '_cacheMeta');
-          for (var prop in cacheMeta) {
-            if (!cacheMeta.hasOwnProperty(prop)) { continue; }
-            var propMeta = cacheMeta[prop];
-            propMeta.values = params;
-
-            var cacheKey = this._calculateCacheKey(propMeta.prefix, propMeta.parts, propMeta.values);
-            var cache = this._bucketCache;
-
-            if (cache) {
-              var value = cache.lookup(cacheKey, prop, propMeta.def);
-              set(this, prop, value);
-            }
-          }
-        },
-
-        _qpChanged: function(controller, _prop) {
-          var prop = _prop.substr(0, _prop.length-3);
-          var cacheMeta = get(controller, '_cacheMeta');
-          var propCache = cacheMeta[prop];
-          var cacheKey = controller._calculateCacheKey(propCache.prefix || "", propCache.parts, propCache.values);
-          var value = get(controller, prop);
-
-          // 1. Update model-dep cache
-          var cache = this._bucketCache;
-          if (cache) {
-            controller._bucketCache.stash(cacheKey, prop, value);
-          }
-
-          // 2. Notify a delegate (e.g. to fire a qp transition)
-          var delegate = controller._qpDelegate;
-          if (delegate) {
-            delegate(controller, prop);
-          }
-        },
-
-        _calculateCacheKey: function(prefix, _parts, values) {
-          var parts = _parts || [], suffixes = "";
-          for (var i = 0, len = parts.length; i < len; ++i) {
-            var part = parts[i];
-            var value = get(values, part);
-            suffixes += "::" + part + ":" + value;
-          }
-          return prefix + suffixes.replace(ALL_PERIODS_REGEX, '-');
-        }
-      });
-    
-
     function accumulateQueryParamDescriptors(_desc, accum) {
       var desc = _desc, tmp;
       if (typeOf(desc) === 'string') {
@@ -20453,7 +21729,7 @@ define("ember-routing/ext/controller",
 
     __exports__["default"] = ControllerMixin;
   });
-define("ember-routing/ext/run_loop",
+enifed("ember-routing/ext/run_loop",
   ["ember-metal/run_loop"],
   function(__dependency1__) {
     "use strict";
@@ -20472,7 +21748,7 @@ define("ember-routing/ext/run_loop",
     var queues = run.queues;
     run._addQueue('routerTransitions', 'actions');
   });
-define("ember-routing/ext/view",
+enifed("ember-routing/ext/view",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-views/views/view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -20629,7 +21905,7 @@ define("ember-routing/ext/view",
 
     __exports__["default"] = EmberView;
   });
-define("ember-routing/location/api",
+enifed("ember-routing/location/api",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -20838,7 +22114,7 @@ define("ember-routing/location/api",
       }
     };
   });
-define("ember-routing/location/auto_location",
+enifed("ember-routing/location/auto_location",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-routing/location/api","ember-routing/location/history_location","ember-routing/location/hash_location","ember-routing/location/none_location","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -21194,9 +22470,15 @@ define("ember-routing/location/auto_location",
           if (currentPath === historyPath) {
             implementationClass = this._HistoryLocation;
           } else {
-            cancelRouterSetup = true;
-            this._replacePath(historyPath);
-          }
+            
+              if (currentPath.substr(0, 2) === '/#') {
+                this._history.replaceState({ path: historyPath }, null, historyPath);
+                implementationClass = this._HistoryLocation;
+              } else {
+                cancelRouterSetup = true;
+                this._replacePath(historyPath);
+              }
+                      }
 
         } else if (this._getSupportsHashChange()) {
           hashPath = this._getHashPath();
@@ -21224,18 +22506,18 @@ define("ember-routing/location/auto_location",
       }
     };
   });
-define("ember-routing/location/hash_location",
-  ["ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","ember-views/system/jquery","exports"],
+enifed("ember-routing/location/hash_location",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/object","ember-routing/location/api","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
-    var get = __dependency1__.get;
-    var set = __dependency2__.set;
-    var run = __dependency3__["default"];
-    var guidFor = __dependency4__.guidFor;
+    var Ember = __dependency1__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var run = __dependency4__["default"];
+    var guidFor = __dependency5__.guidFor;
 
-    var EmberObject = __dependency5__["default"];
-    var EmberLocation = __dependency6__["default"];
-    var jQuery = __dependency7__["default"];
+    var EmberObject = __dependency6__["default"];
+    var EmberLocation = __dependency7__["default"];
 
     /**
     @module ember
@@ -21275,7 +22557,8 @@ define("ember-routing/location/hash_location",
         @method getURL
       */
       getURL: function() {
-        return this.getHash().substr(1);
+        var path = this.getHash().substr(1);
+                return path;
       },
 
       /**
@@ -21318,7 +22601,7 @@ define("ember-routing/location/hash_location",
         var self = this;
         var guid = guidFor(this);
 
-        jQuery(window).on('hashchange.ember-location-'+guid, function() {
+        Ember.$(window).on('hashchange.ember-location-'+guid, function() {
           run(function() {
             var path = self.getURL();
             if (get(self, 'lastSetURL') === path) { return; }
@@ -21354,11 +22637,11 @@ define("ember-routing/location/hash_location",
       willDestroy: function() {
         var guid = guidFor(this);
 
-        jQuery(window).off('hashchange.ember-location-'+guid);
+        Ember.$(window).off('hashchange.ember-location-'+guid);
       }
     });
   });
-define("ember-routing/location/history_location",
+enifed("ember-routing/location/history_location",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-runtime/system/object","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -21431,11 +22714,9 @@ define("ember-routing/location/history_location",
         baseURL = baseURL.replace(/\/$/, '');
 
         var url = path.replace(baseURL, '').replace(rootURL, '');
+        var search = location.search || '';
 
-        
-          var search = location.search || '';
-          url += search;
-        
+        url += search;
 
         return url;
       },
@@ -21586,7 +22867,7 @@ define("ember-routing/location/history_location",
       }
     });
   });
-define("ember-routing/location/none_location",
+enifed("ember-routing/location/none_location",
   ["ember-metal/property_get","ember-metal/property_set","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -21681,7 +22962,7 @@ define("ember-routing/location/none_location",
       }
     });
   });
-define("ember-routing/system/cache",
+enifed("ember-routing/system/cache",
   ["ember-runtime/system/object","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -21716,7 +22997,7 @@ define("ember-routing/system/cache",
       cache: null
     });
   });
-define("ember-routing/system/controller_for",
+enifed("ember-routing/system/controller_for",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -21737,7 +23018,7 @@ define("ember-routing/system/controller_for",
       return container.lookup('controller:' + controllerName, lookupOptions);
     }
   });
-define("ember-routing/system/dsl",
+enifed("ember-routing/system/dsl",
   ["ember-metal/core","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -21853,7 +23134,7 @@ define("ember-routing/system/dsl",
       return dsl;
     };
   });
-define("ember-routing/system/generate_controller",
+enifed("ember-routing/system/generate_controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -21934,8 +23215,8 @@ define("ember-routing/system/generate_controller",
       return instance;
     }
   });
-define("ember-routing/system/route",
-  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/merge","ember-metal/utils","ember-metal/run_loop","ember-runtime/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing-handlebars/helpers/shared","exports"],
+enifed("ember-routing/system/route",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/get_properties","ember-metal/enumerable_utils","ember-metal/is_none","ember-metal/computed","ember-metal/merge","ember-metal/utils","ember-metal/run_loop","ember-metal/keys","ember-runtime/copy","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/action_handler","ember-routing/system/generate_controller","ember-routing-handlebars/helpers/shared","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
@@ -21976,6 +23257,280 @@ define("ember-routing/system/route",
       @uses Ember.ActionHandler
     */
     var Route = EmberObject.extend(ActionHandler, {
+      /**
+        Configuration hash for this route's queryParams. The possible
+        configuration options and their defaults are as follows
+        (assuming a query param whose URL key is `page`):
+
+        ```js
+        queryParams: {
+          page: {
+            // By default, controller query param properties don't
+            // cause a full transition when they are changed, but
+            // rather only cause the URL to update. Setting
+            // `refreshModel` to true will cause an "in-place"
+            // transition to occur, whereby the model hooks for
+            // this route (and any child routes) will re-fire, allowing
+            // you to reload models (e.g., from the server) using the
+            // updated query param values.
+            refreshModel: false,
+
+            // By default, changes to controller query param properties
+            // cause the URL to update via `pushState`, which means an
+            // item will be added to the browser's history, allowing
+            // you to use the back button to restore the app to the
+            // previous state before the query param property was changed.
+            // Setting `replace` to true will use `replaceState` (or its
+            // hash location equivalent), which causes no browser history
+            // item to be added. This options name and default value are
+            // the same as the `link-to` helper's `replace` option.
+            replace: false
+          }
+        }
+        ```
+
+        @property queryParams
+        @for Ember.Route
+        @type Hash
+      */
+      queryParams: {},
+
+      /**
+        @private
+
+        @property _qp
+      */
+      _qp: computed(function() {
+        var controllerName = this.controllerName || this.routeName;
+        var controllerClass = this.container.lookupFactory('controller:' + controllerName);
+
+        if (!controllerClass) {
+          return defaultQPMeta;
+        }
+
+        var controllerProto = controllerClass.proto();
+        var qpProps = get(controllerProto, '_normalizedQueryParams');
+        var cacheMeta = get(controllerProto, '_cacheMeta');
+
+        var qps = [], map = {}, self = this;
+        for (var propName in qpProps) {
+          if (!qpProps.hasOwnProperty(propName)) { continue; }
+
+          var desc = qpProps[propName];
+          var urlKey = desc.as || this.serializeQueryParamKey(propName);
+          var defaultValue = get(controllerProto, propName);
+
+          if (isArray(defaultValue)) {
+            defaultValue = Ember.A(defaultValue.slice());
+          }
+
+          var type = typeOf(defaultValue);
+          var defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type);
+          var fprop = controllerName + ':' + propName;
+          var qp = {
+            def: defaultValue,
+            sdef: defaultValueSerialized,
+            type: type,
+            urlKey: urlKey,
+            prop: propName,
+            fprop: fprop,
+            ctrl: controllerName,
+            cProto: controllerProto,
+            svalue: defaultValueSerialized,
+            cacheType: desc.scope,
+            route: this,
+            cacheMeta: cacheMeta[propName]
+          };
+
+          map[propName] = map[urlKey] = map[fprop] = qp;
+          qps.push(qp);
+        }
+
+        return {
+          qps: qps,
+          map: map,
+          states: {
+            active: function(controller, prop) {
+              return self._activeQPChanged(controller, map[prop]);
+            },
+            allowOverrides: function(controller, prop) {
+              return self._updatingQPChanged(controller, map[prop]);
+            },
+            changingKeys: function(controller, prop) {
+              return self._updateSerializedQPValue(controller, map[prop]);
+            }
+          }
+        };
+      }),
+
+      /**
+        @private
+
+        @property _names
+      */
+      _names: null,
+
+      /**
+        @private
+
+        @method _stashNames
+      */
+      _stashNames: function(_handlerInfo, dynamicParent) {
+        var handlerInfo = _handlerInfo;
+        if (this._names) { return; }
+        var names = this._names = handlerInfo._names;
+
+        if (!names.length) {
+          handlerInfo = dynamicParent;
+          names = handlerInfo && handlerInfo._names || [];
+        }
+
+        var qps = get(this, '_qp.qps');
+        var len = qps.length;
+
+        var namePaths = new Array(names.length);
+        for (var a = 0, nlen = names.length; a < nlen; ++a) {
+          namePaths[a] = handlerInfo.name + '.' + names[a];
+        }
+
+        for (var i = 0; i < len; ++i) {
+          var qp = qps[i];
+          var cacheMeta = qp.cacheMeta;
+          if (cacheMeta.scope === 'model') {
+            cacheMeta.parts = namePaths;
+          }
+          cacheMeta.prefix = qp.ctrl;
+        }
+      },
+
+      /**
+        @private
+
+        @property _updateSerializedQPValue
+      */
+      _updateSerializedQPValue: function(controller, qp) {
+        var value = get(controller, qp.prop);
+        qp.svalue = this.serializeQueryParam(value, qp.urlKey, qp.type);
+      },
+
+      /**
+        @private
+
+        @property _activeQPChanged
+      */
+      _activeQPChanged: function(controller, qp) {
+        var value = get(controller, qp.prop);
+        this.router._queuedQPChanges[qp.fprop] = value;
+        run.once(this, this._fireQueryParamTransition);
+      },
+
+      /**
+        @private
+        @method _updatingQPChanged
+      */
+      _updatingQPChanged: function(controller, qp) {
+        var router = this.router;
+        if (!router._qpUpdates) {
+          router._qpUpdates = {};
+        }
+        router._qpUpdates[qp.urlKey] = true;
+      },
+
+      mergedProperties: ['events', 'queryParams'],
+
+      /**
+        @method paramsFor
+      */
+      paramsFor: function(name) {
+        var route = this.container.lookup('route:' + name);
+
+        if (!route) {
+          return {};
+        }
+
+        var transition = this.router.router.activeTransition;
+        var state = transition ? transition.state : this.router.router.state;
+
+        var params = {};
+        merge(params, state.params[name]);
+        merge(params, getQueryParamsFor(route, state));
+
+        return params;
+      },
+
+      /**
+        @method serializeQueryParamKey
+      */
+      serializeQueryParamKey: function(controllerPropertyName) {
+        return controllerPropertyName;
+      },
+
+      /**
+        @method serializeQueryParam
+      */
+      serializeQueryParam: function(value, urlKey, defaultValueType) {
+        // urlKey isn't used here, but anyone overriding
+        // can use it to provide serialization specific
+        // to a certain query param.
+        if (defaultValueType === 'array') {
+          return JSON.stringify(value);
+        }
+        return '' + value;
+      },
+
+      /**
+        @method deserializeQueryParam
+      */
+      deserializeQueryParam: function(value, urlKey, defaultValueType) {
+        // urlKey isn't used here, but anyone overriding
+        // can use it to provide deserialization specific
+        // to a certain query param.
+
+        // Use the defaultValueType of the default value (the initial value assigned to a
+        // controller query param property), to intelligently deserialize and cast.
+        if (defaultValueType === 'boolean') {
+          return (value === 'true') ? true : false;
+        } else if (defaultValueType === 'number') {
+          return (Number(value)).valueOf();
+        } else if (defaultValueType === 'array') {
+          return Ember.A(JSON.parse(value));
+        }
+        return value;
+      },
+
+
+      /**
+        @private
+        @property _fireQueryParamTransition
+      */
+      _fireQueryParamTransition: function() {
+        this.transitionTo({ queryParams: this.router._queuedQPChanges });
+        this.router._queuedQPChanges = {};
+      },
+
+      /**
+        A hook you can use to reset controller values either when the model
+        changes or the route is exiting.
+
+        ```js
+        App.ArticlesRoute = Ember.Route.extend({
+          // ...
+
+          resetController: function (controller, isExiting, transition) {
+            if (isExiting) {
+              controller.set('page', 1);
+            }
+          }
+        });
+        ```
+
+        @method resetController
+        @param {Controller} controller instance
+        @param {Boolean} isExiting
+        @param {Object} transition
+        @since 1.7.0
+      */
+      resetController: Ember.K,
 
       /**
         @private
@@ -21994,11 +23549,11 @@ define("ember-routing/system/route",
         @since 1.7.0
       */
       _reset: function(isExiting, transition) {
-        
-          var controller = this.controller;
-          controller._qpDelegate = get(this, '_qp.states.inactive');
-          this.resetController(this.controller, isExiting, transition);
-        
+        var controller = this.controller;
+
+        controller._qpDelegate = get(this, '_qp.states.inactive');
+
+        this.resetController(controller, isExiting, transition);
       },
 
       /**
@@ -22253,102 +23808,100 @@ define("ember-routing/system/route",
       _actions: {
 
         queryParamsDidChange: function(changed, totalPresent, removed) {
-          
-            var totalChanged = keys(changed).concat(keys(removed));
-            for (var i = 0, len = totalChanged.length; i < len; ++i) {
-              var urlKey = totalChanged[i],
-                  options = get(this.queryParams, urlKey) || {};
-              if (get(options, 'refreshModel')) {
-                this.refresh();
-              }
+          var totalChanged = keys(changed).concat(keys(removed));
+          for (var i = 0, len = totalChanged.length; i < len; ++i) {
+            var urlKey = totalChanged[i];
+            var options = get(this.queryParams, urlKey) || {};
+            if (get(options, 'refreshModel')) {
+              this.refresh();
             }
-            return true;
-          
+          }
+
+          return true;
         },
 
         finalizeQueryParamChange: function(params, finalParams, transition) {
-          
-            if (this.routeName !== 'application') { return true; }
+          if (this.routeName !== 'application') { return true; }
 
-            // Transition object is absent for intermediate transitions.
-            if (!transition) { return; }
+          // Transition object is absent for intermediate transitions.
+          if (!transition) { return; }
 
-            var handlerInfos = transition.state.handlerInfos;
-            var router = this.router;
-            var qpMeta = router._queryParamsFor(handlerInfos[handlerInfos.length-1].name);
-            var changes = router._qpUpdates;
-            var replaceUrl;
+          var handlerInfos = transition.state.handlerInfos;
+          var router = this.router;
+          var qpMeta = router._queryParamsFor(handlerInfos[handlerInfos.length-1].name);
+          var changes = router._qpUpdates;
+          var replaceUrl;
 
-            stashParamNames(router, handlerInfos);
+          stashParamNames(router, handlerInfos);
 
-            for (var i = 0, len = qpMeta.qps.length; i < len; ++i) {
-              var qp = qpMeta.qps[i];
-              var route = qp.route;
-              var controller = route.controller;
-              var presentKey = qp.urlKey in params && qp.urlKey;
+          for (var i = 0, len = qpMeta.qps.length; i < len; ++i) {
+            var qp = qpMeta.qps[i];
+            var route = qp.route;
+            var controller = route.controller;
+            var presentKey = qp.urlKey in params && qp.urlKey;
 
-              // Do a reverse lookup to see if the changed query
-              // param URL key corresponds to a QP property on
-              // this controller.
-              var value, svalue;
-              if (changes && qp.urlKey in changes) {
-                // Value updated in/before setupController
-                value = get(controller, qp.prop);
-                svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
+            // Do a reverse lookup to see if the changed query
+            // param URL key corresponds to a QP property on
+            // this controller.
+            var value, svalue;
+            if (changes && qp.urlKey in changes) {
+              // Value updated in/before setupController
+              value = get(controller, qp.prop);
+              svalue = route.serializeQueryParam(value, qp.urlKey, qp.type);
+            } else {
+              if (presentKey) {
+                svalue = params[presentKey];
+                value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
               } else {
-                if (presentKey) {
-                  svalue = params[presentKey];
-                  value = route.deserializeQueryParam(svalue, qp.urlKey, qp.type);
-                } else {
-                  // No QP provided; use default value.
-                  svalue = qp.sdef;
-                  value = copyDefaultValue(qp.def);
-                }
-              }
-
-              controller._qpDelegate = get(this, '_qp.states.inactive');
-
-              var thisQueryParamChanged = (svalue !== qp.svalue);
-              if (thisQueryParamChanged) {
-                var options = get(route, 'queryParams.' + qp.urlKey) || {};
-
-                if (transition.queryParamsOnly && replaceUrl !== false) {
-                  var replaceConfigValue = get(options, 'replace');
-                  if (replaceConfigValue) {
-                    replaceUrl = true;
-                  } else if (replaceConfigValue === false) {
-                    // Explicit pushState wins over any other replaceStates.
-                    replaceUrl = false;
-                  }
-                }
-
-                set(controller, qp.prop, value);
-              }
-
-              // Stash current serialized value of controller.
-              qp.svalue = svalue;
-
-              var thisQueryParamHasDefaultValue = (qp.sdef === svalue);
-              if (!thisQueryParamHasDefaultValue) {
-                finalParams.push({
-                  value: svalue,
-                  visible: true,
-                  key: presentKey || qp.urlKey
-                });
+                // No QP provided; use default value.
+                svalue = qp.sdef;
+                value = copyDefaultValue(qp.def);
               }
             }
 
-            if (replaceUrl) {
-              transition.method('replace');
+            controller._qpDelegate = get(this, '_qp.states.inactive');
+
+            var thisQueryParamChanged = (svalue !== qp.svalue);
+            if (thisQueryParamChanged) {
+              var options = get(route, 'queryParams.' + qp.urlKey) || {};
+
+              if (transition.queryParamsOnly && replaceUrl !== false) {
+                var replaceConfigValue = get(options, 'replace');
+                if (replaceConfigValue) {
+                  replaceUrl = true;
+                } else if (replaceConfigValue === false) {
+                  // Explicit pushState wins over any other replaceStates.
+                  replaceUrl = false;
+                }
+              }
+
+              set(controller, qp.prop, value);
             }
 
-            forEach(qpMeta.qps, function(qp) {
-              var routeQpMeta = get(qp.route, '_qp');
-              var finalizedController = qp.route.controller;
-              finalizedController._qpDelegate = get(routeQpMeta, 'states.active');
-            });
-            router._qpUpdates = null;
-          
+            // Stash current serialized value of controller.
+            qp.svalue = svalue;
+
+            var thisQueryParamHasDefaultValue = (qp.sdef === svalue);
+            if (!thisQueryParamHasDefaultValue) {
+              finalParams.push({
+                value: svalue,
+                visible: true,
+                key: presentKey || qp.urlKey
+              });
+            }
+          }
+
+          if (replaceUrl) {
+            transition.method('replace');
+          }
+
+          forEach(qpMeta.qps, function(qp) {
+            var routeQpMeta = get(qp.route, '_qp');
+            var finalizedController = qp.route.controller;
+            finalizedController._qpDelegate = get(routeQpMeta, 'states.active');
+          });
+
+          router._qpUpdates = null;
         }
       },
 
@@ -22360,8 +23913,6 @@ define("ember-routing/system/route",
       */
       events: null,
 
-      mergedProperties: ['events'],
-
       /**
         This hook is executed when the router completely exits this route. It is
         not executed when the model for the route changes.
@@ -22641,23 +24192,22 @@ define("ember-routing/system/route",
         if (this.setupControllers) {
                     this.setupControllers(controller, context);
         } else {
-          
-            var states = get(this, '_qp.states');
-            if (transition) {
-              // Update the model dep values used to calculate cache keys.
-              stashParamNames(this.router, transition.state.handlerInfos);
-              controller._qpDelegate = states.changingKeys;
-              controller._updateCacheParams(transition.params);
-            }
-            controller._qpDelegate = states.allowOverrides;
+          var states = get(this, '_qp.states');
+          if (transition) {
+            // Update the model dep values used to calculate cache keys.
+            stashParamNames(this.router, transition.state.handlerInfos);
+            controller._qpDelegate = states.changingKeys;
+            controller._updateCacheParams(transition.params);
+          }
+          controller._qpDelegate = states.allowOverrides;
 
-            if (transition) {
-              var qpValues = getQueryParamsFor(this, transition.state);
-              controller.setProperties(qpValues);
-            }
+          if (transition) {
+            var qpValues = getQueryParamsFor(this, transition.state);
+            controller.setProperties(qpValues);
+          }
 
-            this.setupController(controller, context, transition);
-                  }
+          this.setupController(controller, context, transition);
+        }
 
         if (this.renderTemplates) {
                     this.renderTemplates(context);
@@ -22823,7 +24373,7 @@ define("ember-routing/system/route",
         });
         ```
 
-        The model for the `post` route is `App.Post.find(params.post_id)`.
+        The model for the `post` route is `store.find('post', params.post_id)`.
 
         By default, if your route has a dynamic segment ending in `_id`:
 
@@ -22866,7 +24416,7 @@ define("ember-routing/system/route",
         ```js
         App.PostRoute = Ember.Route.extend({
           model: function(params) {
-            return App.Post.find(params.post_id);
+            return this.store.find('post', params.post_id);
           }
         });
         ```
@@ -22883,10 +24433,7 @@ define("ember-routing/system/route",
       model: function(params, transition) {
         var match, name, sawParams, value;
 
-        var queryParams;
-        
-          queryParams = get(this, '_qp.map');
-        
+        var queryParams = get(this, '_qp.map');
 
         for (var prop in params) {
           if (prop === 'queryParams' || (queryParams && prop in queryParams)) {
@@ -22902,7 +24449,7 @@ define("ember-routing/system/route",
 
         if (!name && sawParams) { return copy(params); }
         else if (!name) {
-          if (transition.resolveIndex !== transition.state.handlerInfos.length-1) { return; }
+          if (transition.resolveIndex < 1) { return; }
 
           var parentModel = transition.state.handlerInfos[transition.resolveIndex-1].context;
 
@@ -22922,9 +24469,8 @@ define("ember-routing/system/route",
         Router.js hook.
        */
       deserialize: function(params, transition) {
-        
-          return this.model(this.paramsFor(this.routeName), transition);
-              },
+        return this.model(this.paramsFor(this.routeName), transition);
+      },
 
       /**
 
@@ -23036,7 +24582,7 @@ define("ember-routing/system/route",
         ```js
         App.PhotosRoute = Ember.Route.extend({
           model: function() {
-            return App.Photo.find();
+            return this.store.find('photo');
           },
 
           setupController: function (controller, model) {
@@ -23271,7 +24817,7 @@ define("ember-routing/system/route",
         // posts route
         Ember.Route.extend({
           renderTemplate: function(){
-            this.render('posts', {
+            this.render('photos', {
               into: 'application',
               outlet: 'anOutletName'
             })
@@ -23489,240 +25035,6 @@ define("ember-routing/system/route",
       states: {}
     };
 
-    
-      Route.reopen({
-        /**
-          Configuration hash for this route's queryParams. The possible
-          configuration options and their defaults are as follows
-          (assuming a query param whose URL key is `page`):
-
-          ```js
-          queryParams: {
-            page: {
-              // By default, controller query param properties don't
-              // cause a full transition when they are changed, but
-              // rather only cause the URL to update. Setting
-              // `refreshModel` to true will cause an "in-place"
-              // transition to occur, whereby the model hooks for
-              // this route (and any child routes) will re-fire, allowing
-              // you to reload models (e.g., from the server) using the
-              // updated query param values.
-              refreshModel: false,
-
-              // By default, changes to controller query param properties
-              // cause the URL to update via `pushState`, which means an
-              // item will be added to the browser's history, allowing
-              // you to use the back button to restore the app to the
-              // previous state before the query param property was changed.
-              // Setting `replace` to true will use `replaceState` (or its
-              // hash location equivalent), which causes no browser history
-              // item to be added. This options name and default value are
-              // the same as the `link-to` helper's `replace` option.
-              replace: false
-            }
-          }
-          ```
-
-          @property queryParams
-          @for Ember.Route
-          @type Hash
-        */
-        queryParams: {},
-
-        _qp: computed(function() {
-          var controllerName = this.controllerName || this.routeName;
-          var fullName = this.container.normalize('controller:' + controllerName);
-          var controllerClass = this.container.lookupFactory(fullName);
-
-          if (!controllerClass) {
-            return defaultQPMeta;
-          }
-
-          var controllerProto = controllerClass.proto();
-          var qpProps = get(controllerProto, '_normalizedQueryParams');
-          var cacheMeta = get(controllerProto, '_cacheMeta');
-
-          var qps = [], map = {}, self = this;
-          for (var propName in qpProps) {
-            if (!qpProps.hasOwnProperty(propName)) { continue; }
-
-            var desc = qpProps[propName],
-                urlKey = desc.as || this.serializeQueryParamKey(propName),
-                defaultValue = get(controllerProto, propName);
-
-            if (isArray(defaultValue)) {
-              defaultValue = Ember.A(defaultValue.slice());
-            }
-
-            var type = typeOf(defaultValue),
-                defaultValueSerialized = this.serializeQueryParam(defaultValue, urlKey, type),
-                fprop = controllerName + ':' + propName,
-                qp = {
-                  def: defaultValue,
-                  sdef: defaultValueSerialized,
-                  type: type,
-                  urlKey: urlKey,
-                  prop: propName,
-                  fprop: fprop,
-                  ctrl: controllerName,
-                  cProto: controllerProto,
-                  svalue: defaultValueSerialized,
-                  cacheType: desc.scope,
-                  route: this,
-                  cacheMeta: cacheMeta[propName]
-                };
-
-            map[propName] = map[urlKey] = map[fprop] = qp;
-            qps.push(qp);
-          }
-
-          return {
-            qps: qps,
-            map: map,
-            states: {
-              active: function(controller, prop) {
-                return self._activeQPChanged(controller, map[prop]);
-              },
-              allowOverrides: function(controller, prop) {
-                return self._updatingQPChanged(controller, map[prop]);
-              },
-              changingKeys: function(controller, prop) {
-                return self._updateSerializedQPValue(controller, map[prop]);
-              }
-            }
-          };
-        }),
-
-        _names: null,
-        _stashNames: function(_handlerInfo, dynamicParent) {
-          var handlerInfo = _handlerInfo;
-          if (this._names) { return; }
-          var names = this._names = handlerInfo._names;
-
-          if (!names.length) {
-            handlerInfo = dynamicParent;
-            names = handlerInfo && handlerInfo._names || [];
-          }
-
-          var qps = get(this, '_qp.qps');
-          var len = qps.length;
-
-          var namePaths = new Array(names.length);
-          for (var a = 0, nlen = names.length; a < nlen; ++a) {
-            namePaths[a] = handlerInfo.name + '.' + names[a];
-          }
-
-          for (var i = 0; i < len; ++i) {
-            var qp = qps[i];
-            var cacheMeta = qp.cacheMeta;
-            if (cacheMeta.scope === 'model') {
-              cacheMeta.parts = namePaths;
-            }
-            cacheMeta.prefix = qp.ctrl;
-          }
-        },
-
-        _updateSerializedQPValue: function(controller, qp) {
-          var value = get(controller, qp.prop);
-          qp.svalue = this.serializeQueryParam(value, qp.urlKey, qp.type);
-        },
-
-        _activeQPChanged: function(controller, qp) {
-          var value = get(controller, qp.prop);
-          this.router._queuedQPChanges[qp.fprop] = value;
-          run.once(this, this._fireQueryParamTransition);
-        },
-
-        _updatingQPChanged: function(controller, qp) {
-          var router = this.router;
-          if (!router._qpUpdates) {
-            router._qpUpdates = {};
-          }
-          router._qpUpdates[qp.urlKey] = true;
-        },
-
-        mergedProperties: ['queryParams'],
-
-        paramsFor: function(name) {
-          var route = this.container.lookup('route:' + name);
-
-          if (!route) {
-            return {};
-          }
-
-          var transition = this.router.router.activeTransition;
-          var state = transition ? transition.state : this.router.router.state;
-
-          var params = {};
-          merge(params, state.params[name]);
-          merge(params, getQueryParamsFor(route, state));
-
-          return params;
-        },
-
-        serializeQueryParamKey: function(controllerPropertyName) {
-          return controllerPropertyName;
-        },
-
-        serializeQueryParam: function(value, urlKey, defaultValueType) {
-          // urlKey isn't used here, but anyone overriding
-          // can use it to provide serialization specific
-          // to a certain query param.
-          if (defaultValueType === 'array') {
-            return JSON.stringify(value);
-          }
-          return '' + value;
-        },
-
-        deserializeQueryParam: function(value, urlKey, defaultValueType) {
-          // urlKey isn't used here, but anyone overriding
-          // can use it to provide deserialization specific
-          // to a certain query param.
-
-          // Use the defaultValueType of the default value (the initial value assigned to a
-          // controller query param property), to intelligently deserialize and cast.
-          if (defaultValueType === 'boolean') {
-            return (value === 'true') ? true : false;
-          } else if (defaultValueType === 'number') {
-            return (Number(value)).valueOf();
-          } else if (defaultValueType === 'array') {
-            return Ember.A(JSON.parse(value));
-          }
-          return value;
-        },
-
-
-        _fireQueryParamTransition: function() {
-          this.transitionTo({ queryParams: this.router._queuedQPChanges });
-          this.router._queuedQPChanges = {};
-        },
-
-        /**
-          A hook you can use to reset controller values either when the model
-          changes or the route is exiting.
-
-          ```js
-          App.ArticlesRoute = Ember.Route.extend({
-            // ...
-
-            resetController: function (controller, isExiting, transition) {
-              if (isExiting) {
-                controller.set('page', 1);
-              }
-            }
-          });
-          ```
-
-          @method resetController
-          @param {Controller} controller instance
-          @param {Boolean} isExiting
-          @param {Object} transition
-          @since 1.7.0
-        */
-        resetController: Ember.K
-      });
-    
-
     function parentRoute(route) {
       var handlerInfo = handlerInfoFor(route, route.router.router.state.handlerInfos, -1);
       return handlerInfo && handlerInfo.handler;
@@ -23759,9 +25071,9 @@ define("ember-routing/system/route",
       options.LOG_VIEW_LOOKUPS = get(route.router, 'namespace.LOG_VIEW_LOOKUPS');
 
       
-      var controller = options.controller,
-          model = options.model,
-          namedController;
+      var controller = options.controller;
+      var model = options.model;
+      var namedController;
 
       if (options.controller) {
         controller = options.controller;
@@ -23884,9 +25196,9 @@ define("ember-routing/system/route",
 
     __exports__["default"] = Route;
   });
-define("ember-routing/system/router",
-  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","ember-routing-handlebars/helpers/shared","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
+enifed("ember-routing/system/router",
+  ["ember-metal/core","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/properties","ember-metal/computed","ember-metal/merge","ember-metal/run_loop","ember-metal/enumerable_utils","ember-runtime/system/string","ember-runtime/system/object","ember-runtime/mixins/evented","ember-routing/system/dsl","ember-views/views/view","ember-routing/location/api","ember-handlebars/views/metamorph_view","ember-routing-handlebars/helpers/shared","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // FEATURES, Logger, K, assert
@@ -23909,10 +25221,7 @@ define("ember-routing/system/router",
     var routeArgs = __dependency17__.routeArgs;
     var getActiveTargetName = __dependency17__.getActiveTargetName;
     var stashParamNames = __dependency17__.stashParamNames;
-
-    // requireModule("ember-handlebars");
-    // requireModule("ember-runtime");
-    // requireModule("ember-views");
+    var create = __dependency18__.create;
 
     /**
     @module ember
@@ -24197,13 +25506,17 @@ define("ember-routing/system/router",
           }
         }
 
-        if (rootURL && typeof rootURL === 'string') {
-          location.rootURL = rootURL;
-        }
+        if (location !== null && typeof location === 'object') {
+          if (rootURL && typeof rootURL === 'string') {
+            location.rootURL = rootURL;
+          }
 
-        // ensure that initState is called AFTER the rootURL is set on
-        // the location instance
-        if (typeof location.initState === 'function') { location.initState(); }
+          // ensure that initState is called AFTER the rootURL is set on
+          // the location instance
+          if (typeof location.initState === 'function') {
+            location.initState();
+          }
+        }
       },
 
       _getHandlerFunction: function() {
@@ -24308,10 +25621,8 @@ define("ember-routing/system/router",
         var targetRouteName = _targetRouteName || getActiveTargetName(this.router);
         
         var queryParams = {};
-        
-          merge(queryParams, _queryParams);
-          this._prepareQueryParams(targetRouteName, models, queryParams);
-        
+        merge(queryParams, _queryParams);
+        this._prepareQueryParams(targetRouteName, models, queryParams);
 
         var transitionArgs = routeArgs(targetRouteName, models, queryParams);
         var transitionPromise = this.router.transitionTo.apply(this.router, transitionArgs);
@@ -24341,8 +25652,8 @@ define("ember-routing/system/router",
           qps: qps
         };
 
-        var routerjs = this.router,
-            recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
+        var routerjs = this.router;
+        var recogHandlerInfos = routerjs.recognizer.handlersFor(leafRouteName);
 
         for (var i = 0, len = recogHandlerInfos.length; i < len; ++i) {
           var recogHandler = recogHandlerInfos[i];
@@ -24622,8 +25933,8 @@ define("ember-routing/system/router",
         return;
       }
 
-      var infos = router.router.currentHandlerInfos,
-          path = EmberRouter._routePath(infos);
+      var infos = router.router.currentHandlerInfos;
+      var path = EmberRouter._routePath(infos);
 
       if (!('currentPath' in appController)) {
         defineProperty(appController, 'currentPath');
@@ -24739,25 +26050,24 @@ define("ember-routing/system/router",
     }
 
     function forEachQueryParam(router, targetRouteName, queryParams, callback) {
-      
-        var qpCache = router._queryParamsFor(targetRouteName),
-        qps = qpCache.qps;
+      var qpCache = router._queryParamsFor(targetRouteName);
+      var qps = qpCache.qps;
 
-        for (var key in queryParams) {
-          if (!queryParams.hasOwnProperty(key)) { continue; }
-          var value = queryParams[key],
-          qp = qpCache.map[key];
+      for (var key in queryParams) {
+        if (!queryParams.hasOwnProperty(key)) { continue; }
+        var value = queryParams[key];
+        var qp = qpCache.map[key];
 
-          if (qp) {
-            callback(key, value, qp);
-          }
+        if (qp) {
+          callback(key, value, qp);
         }
-          }
+      }
+    }
 
     __exports__["default"] = EmberRouter;
   });
-define("ember-runtime",
-  ["ember-metal","ember-runtime/core","ember-runtime/keys","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/mixins/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
+enifed("ember-runtime",
+  ["ember-metal","ember-runtime/core","ember-runtime/compare","ember-runtime/copy","ember-runtime/system/namespace","ember-runtime/system/object","ember-runtime/system/tracked_array","ember-runtime/system/subarray","ember-runtime/system/container","ember-runtime/system/application","ember-runtime/system/array_proxy","ember-runtime/system/object_proxy","ember-runtime/system/core_object","ember-runtime/system/each_proxy","ember-runtime/system/native_array","ember-runtime/system/set","ember-runtime/system/string","ember-runtime/system/deferred","ember-runtime/system/lazy_load","ember-runtime/mixins/array","ember-runtime/mixins/comparable","ember-runtime/mixins/copyable","ember-runtime/mixins/enumerable","ember-runtime/mixins/freezable","ember-runtime/mixins/-proxy","ember-runtime/mixins/observable","ember-runtime/mixins/action_handler","ember-runtime/mixins/deferred","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/mutable_array","ember-runtime/mixins/target_action_support","ember-runtime/mixins/evented","ember-runtime/mixins/promise_proxy","ember-runtime/mixins/sortable","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/computed/reduce_computed_macros","ember-runtime/controllers/array_controller","ember-runtime/controllers/object_controller","ember-runtime/controllers/controller","ember-runtime/mixins/controller","ember-runtime/ext/rsvp","ember-runtime/ext/string","ember-runtime/ext/function","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __dependency25__, __dependency26__, __dependency27__, __dependency28__, __dependency29__, __dependency30__, __dependency31__, __dependency32__, __dependency33__, __dependency34__, __dependency35__, __dependency36__, __dependency37__, __dependency38__, __dependency39__, __dependency40__, __dependency41__, __dependency42__, __dependency43__, __dependency44__, __exports__) {
     "use strict";
     /**
@@ -24771,35 +26081,35 @@ define("ember-runtime",
     // BEGIN IMPORTS
     var Ember = __dependency1__["default"];
     var isEqual = __dependency2__.isEqual;
-    var keys = __dependency3__["default"];
-    var compare = __dependency4__["default"];
-    var copy = __dependency5__["default"];
+    var compare = __dependency3__["default"];
+    var copy = __dependency4__["default"];
 
-    var Namespace = __dependency6__["default"];
-    var EmberObject = __dependency7__["default"];
-    var TrackedArray = __dependency8__["default"];
-    var SubArray = __dependency9__["default"];
-    var Container = __dependency10__["default"];
-    var Application = __dependency11__["default"];
-    var ArrayProxy = __dependency12__["default"];
-    var ObjectProxy = __dependency13__["default"];
-    var CoreObject = __dependency14__["default"];
-    var EachArray = __dependency15__.EachArray;
-    var EachProxy = __dependency15__.EachProxy;
+    var Namespace = __dependency5__["default"];
+    var EmberObject = __dependency6__["default"];
+    var TrackedArray = __dependency7__["default"];
+    var SubArray = __dependency8__["default"];
+    var Container = __dependency9__["default"];
+    var Application = __dependency10__["default"];
+    var ArrayProxy = __dependency11__["default"];
+    var ObjectProxy = __dependency12__["default"];
+    var CoreObject = __dependency13__["default"];
+    var EachArray = __dependency14__.EachArray;
+    var EachProxy = __dependency14__.EachProxy;
 
-    var NativeArray = __dependency16__["default"];
-    var Set = __dependency17__["default"];
-    var EmberStringUtils = __dependency18__["default"];
-    var Deferred = __dependency19__["default"];
-    var onLoad = __dependency20__.onLoad;
-    var runLoadHooks = __dependency20__.runLoadHooks;
+    var NativeArray = __dependency15__["default"];
+    var Set = __dependency16__["default"];
+    var EmberStringUtils = __dependency17__["default"];
+    var Deferred = __dependency18__["default"];
+    var onLoad = __dependency19__.onLoad;
+    var runLoadHooks = __dependency19__.runLoadHooks;
 
-    var EmberArray = __dependency21__["default"];
-    var Comparable = __dependency22__["default"];
-    var Copyable = __dependency23__["default"];
-    var Enumerable = __dependency24__["default"];
-    var Freezable = __dependency25__.Freezable;
-    var FROZEN_ERROR = __dependency25__.FROZEN_ERROR;
+    var EmberArray = __dependency20__["default"];
+    var Comparable = __dependency21__["default"];
+    var Copyable = __dependency22__["default"];
+    var Enumerable = __dependency23__["default"];
+    var Freezable = __dependency24__.Freezable;
+    var FROZEN_ERROR = __dependency24__.FROZEN_ERROR;
+    var _ProxyMixin = __dependency25__["default"];
 
     var Observable = __dependency26__["default"];
     var ActionHandler = __dependency27__["default"];
@@ -24846,7 +26156,6 @@ define("ember-runtime",
     Ember.compare = compare;
     Ember.copy = copy;
     Ember.isEqual = isEqual;
-    Ember.keys = keys;
 
     Ember.Array = EmberArray;
 
@@ -24919,34 +26228,41 @@ define("ember-runtime",
     Ember.Controller = Controller;
     Ember.ControllerMixin = ControllerMixin;
 
+    Ember._ProxyMixin = _ProxyMixin;
+
     Ember.RSVP = RSVP;
     // END EXPORTS
 
     __exports__["default"] = Ember;
   });
-define("ember-runtime/compare",
-  ["ember-metal/core","ember-metal/utils","ember-runtime/mixins/comparable","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
+enifed("ember-runtime/compare",
+  ["ember-metal/utils","ember-runtime/mixins/comparable","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    var Ember = __dependency1__["default"];
-     // for Ember.ORDER_DEFINITION
-    var typeOf = __dependency2__.typeOf;
-    var Comparable = __dependency3__["default"];
+    var typeOf = __dependency1__.typeOf;
+    var Comparable = __dependency2__["default"];
 
-    // Used by Ember.compare
-    Ember.ORDER_DEFINITION = Ember.ENV.ORDER_DEFINITION || [
-      'undefined',
-      'null',
-      'boolean',
-      'number',
-      'string',
-      'array',
-      'object',
-      'instance',
-      'function',
-      'class',
-      'date'
-    ];
+    var TYPE_ORDER = {
+      'undefined': 0,
+      'null': 1,
+      'boolean': 2,
+      'number': 3,
+      'string': 4,
+      'array': 5,
+      'object': 6,
+      'instance': 7,
+      'function': 8,
+      'class': 9,
+      'date': 10
+    };
+
+    //
+    // the spaceship operator
+    //
+    function spaceship(a, b) {
+      var diff = a - b;
+      return (diff > 0) - (diff < 0);
+    }
 
     /**
      This will compare two javascript values of possibly different types.
@@ -24972,74 +26288,52 @@ define("ember-runtime/compare",
      @return {Number} -1 if v < w, 0 if v = w and 1 if v > w.
     */
     __exports__["default"] = function compare(v, w) {
-      if (v === w) { return 0; }
+      if (v === w) {
+        return 0;
+      }
 
       var type1 = typeOf(v);
       var type2 = typeOf(w);
 
       if (Comparable) {
-        if (type1==='instance' && Comparable.detect(v.constructor)) {
+        if (type1 ==='instance' && Comparable.detect(v.constructor)) {
           return v.constructor.compare(v, w);
         }
 
         if (type2 === 'instance' && Comparable.detect(w.constructor)) {
-          return 1-w.constructor.compare(w, v);
+          return 1 - w.constructor.compare(w, v);
         }
       }
 
-      // If we haven't yet generated a reverse-mapping of Ember.ORDER_DEFINITION,
-      // do so now.
-      var mapping = Ember.ORDER_DEFINITION_MAPPING;
-      if (!mapping) {
-        var order = Ember.ORDER_DEFINITION;
-        mapping = Ember.ORDER_DEFINITION_MAPPING = {};
-        var idx, len;
-        for (idx = 0, len = order.length; idx < len;  ++idx) {
-          mapping[order[idx]] = idx;
-        }
-
-        // We no longer need Ember.ORDER_DEFINITION.
-        delete Ember.ORDER_DEFINITION;
+      var res = spaceship(TYPE_ORDER[type1], TYPE_ORDER[type2]);
+      if (res !== 0) {
+        return res;
       }
 
-      var type1Index = mapping[type1];
-      var type2Index = mapping[type2];
-
-      if (type1Index < type2Index) { return -1; }
-      if (type1Index > type2Index) { return 1; }
-
       // types are equal - so we have to check values now
       switch (type1) {
         case 'boolean':
         case 'number':
-          if (v < w) { return -1; }
-          if (v > w) { return 1; }
-          return 0;
+          return spaceship(v,w);
 
         case 'string':
-          var comp = v.localeCompare(w);
-          if (comp < 0) { return -1; }
-          if (comp > 0) { return 1; }
-          return 0;
+          return spaceship(v.localeCompare(w), 0);
 
         case 'array':
           var vLen = v.length;
           var wLen = w.length;
-          var l = Math.min(vLen, wLen);
-          var r = 0;
-          var i = 0;
-          while (r === 0 && i < l) {
-            r = compare(v[i],w[i]);
-            i++;
+          var len = Math.min(vLen, wLen);
+
+          for (var i = 0; i < len; i++) {
+            var r = compare(v[i], w[i]);
+            if (r !== 0) {
+              return r;
+            }
           }
-          if (r !== 0) { return r; }
 
           // all elements are equal now
           // shorter array should be ordered first
-          if (vLen < wLen) { return -1; }
-          if (vLen > wLen) { return 1; }
-          // arrays are equal now
-          return 0;
+          return spaceship(vLen, wLen);
 
         case 'instance':
           if (Comparable && Comparable.detect(v)) {
@@ -25048,18 +26342,14 @@ define("ember-runtime/compare",
           return 0;
 
         case 'date':
-          var vNum = v.getTime();
-          var wNum = w.getTime();
-          if (vNum < wNum) { return -1; }
-          if (vNum > wNum) { return 1; }
-          return 0;
+          return spaceship(v.getTime(), w.getTime());
 
         default:
           return 0;
       }
     }
   });
-define("ember-runtime/computed/array_computed",
+enifed("ember-runtime/computed/array_computed",
   ["ember-metal/core","ember-runtime/computed/reduce_computed","ember-metal/enumerable_utils","ember-metal/platform","ember-metal/observer","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -25099,9 +26389,11 @@ define("ember-runtime/computed/array_computed",
     }
 
     ArrayComputedProperty.prototype = o_create(ReduceComputedProperty.prototype);
+
     ArrayComputedProperty.prototype.initialValue = function () {
       return Ember.A();
     };
+
     ArrayComputedProperty.prototype.resetValue = function (array) {
       array.clear();
       return array;
@@ -25234,8 +26526,8 @@ define("ember-runtime/computed/array_computed",
         options = a_slice.call(arguments, -1)[0];
       }
 
-      if (typeof options !== "object") {
-        throw new EmberError("Array Computed Property declared without an options hash");
+      if (typeof options !== 'object') {
+        throw new EmberError('Array Computed Property declared without an options hash');
       }
 
       var cp = new ArrayComputedProperty(options);
@@ -25250,9 +26542,9 @@ define("ember-runtime/computed/array_computed",
     __exports__.arrayComputed = arrayComputed;
     __exports__.ArrayComputedProperty = ArrayComputedProperty;
   });
-define("ember-runtime/computed/reduce_computed",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","ember-runtime/system/set","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+enifed("ember-runtime/computed/reduce_computed",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/property_events","ember-metal/expand_properties","ember-metal/observer","ember-metal/computed","ember-metal/platform","ember-metal/enumerable_utils","ember-runtime/system/tracked_array","ember-runtime/mixins/array","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert
@@ -25276,7 +26568,6 @@ define("ember-runtime/computed/reduce_computed",
     var TrackedArray = __dependency12__["default"];
     var EmberArray = __dependency13__["default"];
     var run = __dependency14__["default"];
-    var Set = __dependency15__["default"];
     var isArray = __dependency4__.isArray;
 
     var cacheSet = cacheFor.set;
@@ -25346,7 +26637,6 @@ define("ember-runtime/computed/reduce_computed",
       this.trackedArray = trackedArray;
       this.beforeObserver = null;
       this.observer = null;
-
       this.destroyed = false;
     }
 
@@ -25354,6 +26644,7 @@ define("ember-runtime/computed/reduce_computed",
       setValue: function (newValue) {
         this.instanceMeta.setValue(newValue, true);
       },
+
       getValue: function () {
         return this.instanceMeta.getValue();
       },
@@ -25392,9 +26683,9 @@ define("ember-runtime/computed/reduce_computed",
       },
 
       setupPropertyObservers: function (dependentKey, itemPropertyKeys) {
-        var dependentArray = get(this.instanceMeta.context, dependentKey),
-            length = get(dependentArray, 'length'),
-            observerContexts = new Array(length);
+        var dependentArray = get(this.instanceMeta.context, dependentKey);
+        var length = get(dependentArray, 'length');
+        var observerContexts = new Array(length);
 
         this.resetTransformations(dependentKey, observerContexts);
 
@@ -25410,11 +26701,9 @@ define("ember-runtime/computed/reduce_computed",
       },
 
       teardownPropertyObservers: function (dependentKey, itemPropertyKeys) {
-        var dependentArrayObserver = this,
-            trackedArray = this.trackedArraysByGuid[dependentKey],
-            beforeObserver,
-            observer,
-            item;
+        var dependentArrayObserver = this;
+        var trackedArray = this.trackedArraysByGuid[dependentKey];
+        var beforeObserver, observer, item;
 
         if (!trackedArray) { return; }
 
@@ -25449,6 +26738,7 @@ define("ember-runtime/computed/reduce_computed",
         observerContext.beforeObserver = function (obj, keyName) {
           return dependentArrayObserver.itemPropertyWillChange(obj, keyName, observerContext.dependentArray, observerContext);
         };
+
         observerContext.observer = function (obj, keyName) {
           return dependentArrayObserver.itemPropertyDidChange(obj, keyName, observerContext.dependentArray, observerContext);
         };
@@ -25460,6 +26750,7 @@ define("ember-runtime/computed/reduce_computed",
 
       trackAdd: function (dependentKey, index, newItems) {
         var trackedArray = this.trackedArraysByGuid[dependentKey];
+
         if (trackedArray) {
           trackedArray.addItems(index, newItems);
         }
@@ -25525,9 +26816,10 @@ define("ember-runtime/computed/reduce_computed",
           forEach(itemPropertyKeys, removeObservers, this);
 
           changeMeta = new ChangeMeta(dependentArray, item, itemIndex, this.instanceMeta.propertyName, this.cp, normalizedRemoveCount);
-          this.setValue( removedItem.call(
+          this.setValue(removedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }
+        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       },
 
       dependentArrayDidChange: function (dependentArray, index, removedCount, addedCount) {
@@ -25540,13 +26832,15 @@ define("ember-runtime/computed/reduce_computed",
         var itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey];
         var length = get(dependentArray, 'length');
         var normalizedIndex = normalizeIndex(index, length, addedCount);
+        var endIndex = normalizedIndex + addedCount;
         var changeMeta, observerContext;
 
-        forEach(dependentArray.slice(normalizedIndex, normalizedIndex + addedCount), function (item, sliceIndex) {
+        forEach(dependentArray.slice(normalizedIndex, endIndex), function (item, sliceIndex) {
           if (itemPropertyKeys) {
-            observerContext =
-              observerContexts[sliceIndex] =
-              this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex, this.trackedArraysByGuid[dependentKey]);
+            observerContext = this.createPropertyObserverContext(dependentArray, normalizedIndex + sliceIndex,
+              this.trackedArraysByGuid[dependentKey]);
+            observerContexts[sliceIndex] = observerContext;
+
             forEach(itemPropertyKeys, function (propertyKey) {
               addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
               addObserver(item, propertyKey, this, observerContext.observer);
@@ -25554,10 +26848,10 @@ define("ember-runtime/computed/reduce_computed",
           }
 
           changeMeta = new ChangeMeta(dependentArray, item, normalizedIndex + sliceIndex, this.instanceMeta.propertyName, this.cp, addedCount);
-          this.setValue( addedItem.call(
+          this.setValue(addedItem.call(
             this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
         }, this);
-
+        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
         this.trackAdd(dependentKey, normalizedIndex, observerContexts);
       },
 
@@ -25566,25 +26860,26 @@ define("ember-runtime/computed/reduce_computed",
 
         if (!this.changedItems[guid]) {
           this.changedItems[guid] = {
-            array:            array,
-            observerContext:  observerContext,
-            obj:              obj,
-            previousValues:   {}
+            array: array,
+            observerContext: observerContext,
+            obj: obj,
+            previousValues: {}
           };
         }
-        ++this.changedItemCount;
 
+        ++this.changedItemCount;
         this.changedItems[guid].previousValues[keyName] = get(obj, keyName);
       },
 
-      itemPropertyDidChange: function(obj, keyName, array, observerContext) {
+      itemPropertyDidChange: function (obj, keyName, array, observerContext) {
         if (--this.changedItemCount === 0) {
           this.flushChanges();
         }
       },
 
-      flushChanges: function() {
-        var changedItems = this.changedItems, key, c, changeMeta;
+      flushChanges: function () {
+        var changedItems = this.changedItems;
+        var key, c, changeMeta;
 
         for (key in changedItems) {
           c = changedItems[key];
@@ -25598,7 +26893,9 @@ define("ember-runtime/computed/reduce_computed",
           this.setValue(
             this.callbacks.addedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
         }
+
         this.changedItems = {};
+        this.callbacks.flushedChanges.call(this.instanceMeta.context, this.getValue(), this.instanceMeta.sugarMeta);
       }
     };
 
@@ -25630,26 +26927,26 @@ define("ember-runtime/computed/reduce_computed",
       }
     }
 
-    function addItems (dependentArray, callbacks, cp, propertyName, meta) {
+    function addItems(dependentArray, callbacks, cp, propertyName, meta) {
       forEach(dependentArray, function (item, index) {
         meta.setValue( callbacks.addedItem.call(
           this, meta.getValue(), item, new ChangeMeta(dependentArray, item, index, propertyName, cp, dependentArray.length), meta.sugarMeta));
       }, this);
+      callbacks.flushedChanges.call(this, meta.getValue(), meta.sugarMeta);
     }
 
     function reset(cp, propertyName) {
-      var callbacks = cp._callbacks(),
-          meta;
+      var callbacks = cp._callbacks();
+      var hadMeta = cp._hasInstanceMeta(this, propertyName);
+      var meta = cp._instanceMeta(this, propertyName);
 
-      if (cp._hasInstanceMeta(this, propertyName)) {
-        meta = cp._instanceMeta(this, propertyName);
-        meta.setValue(cp.resetValue(meta.getValue()));
-      } else {
-        meta = cp._instanceMeta(this, propertyName);
-      }
+      if (hadMeta) { meta.setValue(cp.resetValue(meta.getValue())); }
 
       if (cp.options.initialize) {
-        cp.options.initialize.call(this, meta.getValue(), { property: cp, propertyName: propertyName }, meta.sugarMeta);
+        cp.options.initialize.call(this, meta.getValue(), {
+          property: cp,
+          propertyName: propertyName
+        }, meta.sugarMeta);
       }
     }
 
@@ -25666,16 +26963,15 @@ define("ember-runtime/computed/reduce_computed",
       this.context = context;
       this.propertyName = propertyName;
       this.cache = metaFor(context).cache;
-
       this.dependentArrays = {};
       this.sugarMeta = {};
-
       this.initialValue = initialValue;
     }
 
     ReduceComputedPropertyInstanceMeta.prototype = {
       getValue: function () {
         var value = cacheGet(this.cache, this.propertyName);
+
         if (value !== undefined) {
           return value;
         } else {
@@ -25718,11 +27014,11 @@ define("ember-runtime/computed/reduce_computed",
 
     __exports__.ReduceComputedProperty = ReduceComputedProperty;
     // TODO: default export
+
     function ReduceComputedProperty(options) {
       var cp = this;
 
       this.options = options;
-
       this._dependentKeys = null;
       // A map of dependentKey -> [itemProperty, ...] that tracks what properties of
       // items in the array we must track to update this property.
@@ -25738,10 +27034,11 @@ define("ember-runtime/computed/reduce_computed",
         // coalesce by, in addition to the target and method.
         run.once(this, recompute, propertyName);
       };
+
       var recompute = function(propertyName) {
-        var dependentKeys = cp._dependentKeys,
-            meta = cp._instanceMeta(this, propertyName),
-            callbacks = cp._callbacks();
+        var dependentKeys = cp._dependentKeys;
+        var meta = cp._instanceMeta(this, propertyName);
+        var callbacks = cp._callbacks();
 
         reset.call(this, cp, propertyName);
 
@@ -25750,8 +27047,8 @@ define("ember-runtime/computed/reduce_computed",
             
             if (!partiallyRecomputeFor(this, dependentKey)) { return; }
 
-            var dependentArray = get(this, dependentKey),
-                previousDependentArray = meta.dependentArrays[dependentKey];
+            var dependentArray = get(this, dependentKey);
+            var previousDependentArray = meta.dependentArrays[dependentKey];
 
             if (dependentArray === previousDependentArray) {
               // The array may be the same, but our item property keys may have
@@ -25780,6 +27077,7 @@ define("ember-runtime/computed/reduce_computed",
           if (!partiallyRecomputeFor(this, dependentKey)) { return; }
 
           var dependentArray = get(this, dependentKey);
+
           if (dependentArray) {
             addItems.call(this, dependentArray, callbacks, cp, propertyName, meta);
           }
@@ -25804,11 +27102,14 @@ define("ember-runtime/computed/reduce_computed",
     ReduceComputedProperty.prototype._callbacks = function () {
       if (!this.callbacks) {
         var options = this.options;
+
         this.callbacks = {
           removedItem: options.removedItem || defaultCallback,
-          addedItem: options.addedItem || defaultCallback
+          addedItem: options.addedItem || defaultCallback,
+          flushedChanges: options.flushedChanges || defaultCallback
         };
       }
+
       return this.callbacks;
     };
 
@@ -25817,8 +27118,8 @@ define("ember-runtime/computed/reduce_computed",
     };
 
     ReduceComputedProperty.prototype._instanceMeta = function (context, propertyName) {
-      var cacheMeta = metaFor(context).cacheMeta,
-          meta = cacheMeta[propertyName];
+      var cacheMeta = metaFor(context).cacheMeta;
+      var meta = cacheMeta[propertyName];
 
       if (!meta) {
         meta = cacheMeta[propertyName] = new ReduceComputedPropertyInstanceMeta(context, propertyName, this.initialValue());
@@ -25854,33 +27155,35 @@ define("ember-runtime/computed/reduce_computed",
     };
 
     ReduceComputedProperty.prototype.property = function () {
-      var cp = this,
-          args = a_slice.call(arguments),
-          propertyArgs = new Set(),
-          match,
-          dependentArrayKey,
-          itemPropertyKey;
+      var cp = this;
+      var args = a_slice.call(arguments);
+      var propertyArgs = {};
+      var match, dependentArrayKey, itemPropertyKey;
 
       forEach(args, function (dependentKey) {
         if (doubleEachPropertyPattern.test(dependentKey)) {
-          throw new EmberError("Nested @each properties not supported: " + dependentKey);
+          throw new EmberError('Nested @each properties not supported: ' + dependentKey);
         } else if (match = eachPropertyPattern.exec(dependentKey)) {
           dependentArrayKey = match[1];
 
-          var itemPropertyKeyPattern = match[2],
-              addItemPropertyKey = function (itemPropertyKey) {
-                cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
-              };
+          var itemPropertyKeyPattern = match[2];
+          var addItemPropertyKey = function (itemPropertyKey) {
+            cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
+          };
 
           expandProperties(itemPropertyKeyPattern, addItemPropertyKey);
-          propertyArgs.add(dependentArrayKey);
+          propertyArgs[guidFor(dependentArrayKey)] = dependentArrayKey;
         } else {
-          propertyArgs.add(dependentKey);
+          propertyArgs[guidFor(dependentKey)] = dependentKey;
         }
       });
 
-      return ComputedProperty.prototype.property.apply(this, propertyArgs.toArray());
+      var propertyArgsToArray = [];
+      for (var guid in propertyArgs) {
+        propertyArgsToArray.push(propertyArgs[guid]);
+      }
 
+      return ComputedProperty.prototype.property.apply(this, propertyArgsToArray);
     };
 
     /**
@@ -26016,8 +27319,8 @@ define("ember-runtime/computed/reduce_computed",
           // `content.@each.reversedName` above, we would be getting the objects
           // directly and not have access to `reversedName`.
           //
-          var reversedNameA = get(personA, 'reversedName'),
-              reversedNameB = get(personB, 'reversedName');
+          var reversedNameA = get(personA, 'reversedName');
+          var reversedNameB = get(personB, 'reversedName');
 
           return Ember.compare(reversedNameA, reversedNameB);
         })
@@ -26076,12 +27379,12 @@ define("ember-runtime/computed/reduce_computed",
         options = a_slice.call(arguments, -1)[0];
       }
 
-      if (typeof options !== "object") {
-        throw new EmberError("Reduce Computed Property declared without an options hash");
+      if (typeof options !== 'object') {
+        throw new EmberError('Reduce Computed Property declared without an options hash');
       }
 
       if (!('initialValue' in options)) {
-        throw new EmberError("Reduce Computed Property declared without an initial value");
+        throw new EmberError('Reduce Computed Property declared without an initial value');
       }
 
       var cp = new ReduceComputedProperty(options);
@@ -26095,9 +27398,9 @@ define("ember-runtime/computed/reduce_computed",
 
     __exports__.reduceComputed = reduceComputed;
   });
-define("ember-runtime/computed/reduce_computed_macros",
-  ["ember-metal/core","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/object_proxy","ember-runtime/system/subarray","ember-runtime/keys","ember-runtime/compare","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
+enifed("ember-runtime/computed/reduce_computed_macros",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/enumerable_utils","ember-metal/run_loop","ember-metal/observer","ember-runtime/computed/array_computed","ember-runtime/computed/reduce_computed","ember-runtime/system/subarray","ember-metal/keys","ember-runtime/compare","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -26106,21 +27409,19 @@ define("ember-runtime/computed/reduce_computed_macros",
 
     var Ember = __dependency1__["default"];
     // Ember.assert
-    var merge = __dependency2__["default"];
-    var get = __dependency3__.get;
-    var set = __dependency4__.set;
-    var isArray = __dependency5__.isArray;
-    var guidFor = __dependency5__.guidFor;
-    var EmberError = __dependency6__["default"];
-    var forEach = __dependency7__.forEach;
-    var run = __dependency8__["default"];
-    var addObserver = __dependency9__.addObserver;
-    var arrayComputed = __dependency10__.arrayComputed;
-    var reduceComputed = __dependency11__.reduceComputed;
-    var ObjectProxy = __dependency12__["default"];
-    var SubArray = __dependency13__["default"];
-    var keys = __dependency14__["default"];
-    var compare = __dependency15__["default"];
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var isArray = __dependency4__.isArray;
+    var guidFor = __dependency4__.guidFor;
+    var EmberError = __dependency5__["default"];
+    var forEach = __dependency6__.forEach;
+    var run = __dependency7__["default"];
+    var addObserver = __dependency8__.addObserver;
+    var arrayComputed = __dependency9__.arrayComputed;
+    var reduceComputed = __dependency10__.reduceComputed;
+    var SubArray = __dependency11__["default"];
+    var keys = __dependency12__["default"];
+    var compare = __dependency13__["default"];
 
     var a_slice = [].slice;
 
@@ -26182,7 +27483,7 @@ define("ember-runtime/computed/reduce_computed_macros",
       @param {String} dependentKey
       @return {Ember.ComputedProperty} computes the largest value in the dependentKey's array
     */
-    function max (dependentKey) {
+    function max(dependentKey) {
       return reduceComputed(dependentKey, {
         initialValue: -Infinity,
 
@@ -26252,16 +27553,17 @@ define("ember-runtime/computed/reduce_computed_macros",
 
       The callback method you provide should have the following signature.
       `item` is the current item in the iteration.
+      `index` is the integer index of the current item in the iteration.
 
       ```javascript
-      function(item);
+      function(item, index);
       ```
 
       Example
 
       ```javascript
       var Hamster = Ember.Object.extend({
-        excitingChores: Ember.computed.map('chores', function(chore) {
+        excitingChores: Ember.computed.map('chores', function(chore, index) {
           return chore.toUpperCase() + '!';
         })
       });
@@ -26282,7 +27584,7 @@ define("ember-runtime/computed/reduce_computed_macros",
     function map(dependentKey, callback) {
       var options = {
         addedItem: function(array, item, changeMeta, instanceMeta) {
-          var mapped = callback.call(this, item);
+          var mapped = callback.call(this, item, changeMeta.index);
           array.insertAt(changeMeta.index, mapped);
           return array;
         },
@@ -26343,24 +27645,25 @@ define("ember-runtime/computed/reduce_computed_macros",
 
       The callback method you provide should have the following signature.
       `item` is the current item in the iteration.
+      `index` is the integer index of the current item in the iteration.
 
       ```javascript
-      function(item);
+      function(item, index);
       ```
 
       ```javascript
       var Hamster = Ember.Object.extend({
-        remainingChores: Ember.computed.filter('chores', function(chore) {
+        remainingChores: Ember.computed.filter('chores', function(chore, index) {
           return !chore.done;
         })
       });
 
-      var hamster = Hamster.create({ 
+      var hamster = Hamster.create({
         chores: [
           { name: 'cook', done: true },
           { name: 'clean', done: true },
           { name: 'write more unit tests', done: false }
-        ] 
+        ]
       });
 
       hamster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
@@ -26378,9 +27681,9 @@ define("ember-runtime/computed/reduce_computed_macros",
           instanceMeta.filteredArrayIndexes = new SubArray();
         },
 
-        addedItem: function(array, item, changeMeta, instanceMeta) {
-          var match = !!callback.call(this, item),
-              filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
+        addedItem: function (array, item, changeMeta, instanceMeta) {
+          var match = !!callback.call(this, item, changeMeta.index);
+          var filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
 
           if (match) {
             array.insertAt(filterIndex, item);
@@ -26486,6 +27789,7 @@ define("ember-runtime/computed/reduce_computed_macros",
     */
     function uniq() {
       var args = a_slice.call(arguments);
+
       args.push({
         initialize: function(array, changeMeta, instanceMeta) {
           instanceMeta.itemCounts = {};
@@ -26496,22 +27800,25 @@ define("ember-runtime/computed/reduce_computed_macros",
 
           if (!instanceMeta.itemCounts[guid]) {
             instanceMeta.itemCounts[guid] = 1;
+            array.pushObject(item);
           } else {
             ++instanceMeta.itemCounts[guid];
           }
-          array.addObject(item);
           return array;
         },
+
         removedItem: function(array, item, _, instanceMeta) {
-          var guid = guidFor(item),
-              itemCounts = instanceMeta.itemCounts;
+          var guid = guidFor(item);
+          var itemCounts = instanceMeta.itemCounts;
 
           if (--itemCounts[guid] === 0) {
             array.removeObject(item);
           }
+
           return array;
         }
       });
+
       return arrayComputed.apply(null, args);
     }
 
@@ -26550,6 +27857,7 @@ define("ember-runtime/computed/reduce_computed_macros",
     */
     function intersect() {
       var args = a_slice.call(arguments);
+
       args.push({
         initialize: function (array, changeMeta, instanceMeta) {
           instanceMeta.itemCounts = {};
@@ -26561,16 +27869,22 @@ define("ember-runtime/computed/reduce_computed_macros",
           var numberOfDependentArrays = changeMeta.property._dependentKeys.length;
           var itemCounts = instanceMeta.itemCounts;
 
-          if (!itemCounts[itemGuid]) { itemCounts[itemGuid] = {}; }
-          if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
+          if (!itemCounts[itemGuid]) {
+            itemCounts[itemGuid] = {};
+          }
+
+          if (itemCounts[itemGuid][dependentGuid] === undefined) {
+            itemCounts[itemGuid][dependentGuid] = 0;
+          }
 
           if (++itemCounts[itemGuid][dependentGuid] === 1 &&
               numberOfDependentArrays === keys(itemCounts[itemGuid]).length) {
-
             array.addObject(item);
           }
+
           return array;
         },
+
         removedItem: function(array, item, changeMeta, instanceMeta) {
           var itemGuid = guidFor(item);
           var dependentGuid = guidFor(changeMeta.arrayChanged);
@@ -26589,11 +27903,14 @@ define("ember-runtime/computed/reduce_computed_macros",
             if (numberOfArraysItemAppearsIn === 0) {
               delete itemCounts[itemGuid];
             }
+
             array.removeObject(item);
           }
+
           return array;
         }
       });
+
       return arrayComputed.apply(null, args);
     }
 
@@ -26630,12 +27947,13 @@ define("ember-runtime/computed/reduce_computed_macros",
     */
     function setDiff(setAProperty, setBProperty) {
       if (arguments.length !== 2) {
-        throw new EmberError("setDiff requires exactly two dependent arrays.");
+        throw new EmberError('setDiff requires exactly two dependent arrays.');
       }
+
       return arrayComputed(setAProperty, setBProperty, {
         addedItem: function (array, item, changeMeta, instanceMeta) {
-          var setA = get(this, setAProperty),
-              setB = get(this, setBProperty);
+          var setA = get(this, setAProperty);
+          var setB = get(this, setBProperty);
 
           if (changeMeta.arrayChanged === setA) {
             if (!setB.contains(item)) {
@@ -26644,12 +27962,13 @@ define("ember-runtime/computed/reduce_computed_macros",
           } else {
             array.removeObject(item);
           }
+
           return array;
         },
 
         removedItem: function (array, item, changeMeta, instanceMeta) {
-          var setA = get(this, setAProperty),
-              setB = get(this, setBProperty);
+          var setA = get(this, setAProperty);
+          var setB = get(this, setBProperty);
 
           if (changeMeta.arrayChanged === setB) {
             if (setA.contains(item)) {
@@ -26658,6 +27977,7 @@ define("ember-runtime/computed/reduce_computed_macros",
           } else {
             array.removeObject(item);
           }
+
           return array;
         }
       });
@@ -26666,8 +27986,13 @@ define("ember-runtime/computed/reduce_computed_macros",
     __exports__.setDiff = setDiff;function binarySearch(array, item, low, high) {
       var mid, midItem, res, guidMid, guidItem;
 
-      if (arguments.length < 4) { high = get(array, 'length'); }
-      if (arguments.length < 3) { low = 0; }
+      if (arguments.length < 4) {
+        high = get(array, 'length');
+      }
+
+      if (arguments.length < 3) {
+        low = 0;
+      }
 
       if (low === high) {
         return low;
@@ -26676,14 +28001,15 @@ define("ember-runtime/computed/reduce_computed_macros",
       mid = low + Math.floor((high - low) / 2);
       midItem = array.objectAt(mid);
 
-      guidMid = _guidFor(midItem);
-      guidItem = _guidFor(item);
+      guidMid = guidFor(midItem);
+      guidItem = guidFor(item);
 
       if (guidMid === guidItem) {
         return mid;
       }
 
       res = this.order(midItem, item);
+
       if (res === 0) {
         res = guidMid < guidItem ? -1 : 1;
       }
@@ -26696,18 +28022,9 @@ define("ember-runtime/computed/reduce_computed_macros",
       }
 
       return mid;
-
-      function _guidFor(item) {
-        if (SearchProxy.detectInstance(item)) {
-          return guidFor(get(item, 'content'));
-        }
-        return guidFor(item);
-      }
     }
 
 
-    var SearchProxy = ObjectProxy.extend();
-
     /**
       A computed property which returns a new array with all the
       properties from the first dependent array sorted based on a property
@@ -26774,23 +28091,58 @@ define("ember-runtime/computed/reduce_computed_macros",
     */
     function sort(itemsKey, sortDefinition) {
       
-      var initFn, sortPropertiesKey;
-
       if (typeof sortDefinition === 'function') {
-        initFn = function (array, changeMeta, instanceMeta) {
-          instanceMeta.order = sortDefinition;
-          instanceMeta.binarySearch = binarySearch;
-        };
+        return customSort(itemsKey, sortDefinition);
       } else {
-        sortPropertiesKey = sortDefinition;
-        initFn = function (array, changeMeta, instanceMeta) {
+        return propertySort(itemsKey, sortDefinition);
+      }
+    }
+
+    __exports__.sort = sort;function customSort(itemsKey, comparator) {
+      return arrayComputed(itemsKey, {
+        initialize: function (array, changeMeta, instanceMeta) {
+          instanceMeta.order = comparator;
+          instanceMeta.binarySearch = binarySearch;
+          instanceMeta.waitingInsertions = [];
+          instanceMeta.insertWaiting = function() {
+            var index, item;
+            var waiting = instanceMeta.waitingInsertions;
+            instanceMeta.waitingInsertions = [];
+            for (var i=0; i<waiting.length; i++) {
+              item = waiting[i];
+              index = instanceMeta.binarySearch(array, item);
+              array.insertAt(index, item);
+            }
+          };
+          instanceMeta.insertLater = function(item) {
+            this.waitingInsertions.push(item);
+          };
+        },
+
+        addedItem: function (array, item, changeMeta, instanceMeta) {
+          instanceMeta.insertLater(item);
+          return array;
+        },
+
+        removedItem: function (array, item, changeMeta, instanceMeta) {
+          array.removeObject(item);
+          return array;
+        },
+
+        flushedChanges: function(array, instanceMeta) {
+          instanceMeta.insertWaiting();
+        }
+      });
+    }
+
+    function propertySort(itemsKey, sortPropertiesKey) {
+      return arrayComputed(itemsKey, {
+        initialize: function (array, changeMeta, instanceMeta) {
           function setupSortProperties() {
-            var sortPropertyDefinitions = get(this, sortPropertiesKey),
-                sortProperty,
-                sortProperties = instanceMeta.sortProperties = [],
-                sortPropertyAscending = instanceMeta.sortPropertyAscending = {},
-                idx,
-                asc;
+            var sortPropertyDefinitions = get(this, sortPropertiesKey);
+            var sortProperties = instanceMeta.sortProperties = [];
+            var sortPropertyAscending = instanceMeta.sortPropertyAscending = {};
+            var sortProperty, idx, asc;
 
             
             changeMeta.property.clearItemPropertyKeys(itemsKey);
@@ -26822,17 +28174,17 @@ define("ember-runtime/computed/reduce_computed_macros",
           }
 
           addObserver(this, sortPropertiesKey, updateSortPropertiesOnce);
-
           setupSortProperties.call(this);
 
-
           instanceMeta.order = function (itemA, itemB) {
-            var isProxy = itemB instanceof SearchProxy,
-                sortProperty, result, asc;
+            var sortProperty, result, asc;
+            var keyA = this.keyFor(itemA);
+            var keyB = this.keyFor(itemB);
 
             for (var i = 0; i < this.sortProperties.length; ++i) {
               sortProperty = this.sortProperties[i];
-              result = compare(get(itemA, sortProperty), isProxy ? itemB[sortProperty] : get(itemB, sortProperty));
+
+              result = compare(keyA[sortProperty], keyB[sortProperty]);
 
               if (result !== 0) {
                 asc = this.sortPropertyAscending[sortProperty];
@@ -26844,11 +28196,8 @@ define("ember-runtime/computed/reduce_computed_macros",
           };
 
           instanceMeta.binarySearch = binarySearch;
-        };
-      }
-
-      return arrayComputed(itemsKey, {
-        initialize: initFn,
+          setupKeyCache(instanceMeta);
+        },
 
         addedItem: function (array, item, changeMeta, instanceMeta) {
           var index = instanceMeta.binarySearch(array, item);
@@ -26857,26 +28206,38 @@ define("ember-runtime/computed/reduce_computed_macros",
         },
 
         removedItem: function (array, item, changeMeta, instanceMeta) {
-          var proxyProperties, index, searchItem;
-
-          if (changeMeta.previousValues) {
-            proxyProperties = merge({ content: item }, changeMeta.previousValues);
-
-            searchItem = SearchProxy.create(proxyProperties);
-          } else {
-            searchItem = item;
-          }
-
-          index = instanceMeta.binarySearch(array, searchItem);
+          var index = instanceMeta.binarySearch(array, item);
           array.removeAt(index);
+          instanceMeta.dropKeyFor(item);
           return array;
         }
       });
     }
 
-    __exports__.sort = sort;
+    function setupKeyCache(instanceMeta) {
+      instanceMeta.keyFor = function(item) {
+        var guid = guidFor(item);
+        if (this.keyCache[guid]) {
+          return this.keyCache[guid];
+        }
+        var sortProperty;
+        var key = {};
+        for (var i = 0; i < this.sortProperties.length; ++i) {
+          sortProperty = this.sortProperties[i];
+          key[sortProperty] = get(item, sortProperty);
+        }
+        return this.keyCache[guid] = key;
+      };
+
+      instanceMeta.dropKeyFor = function(item) {
+        var guid = guidFor(item);
+        this.keyCache[guid] = null;
+      };
+
+      instanceMeta.keyCache = {};
+    }
   });
-define("ember-runtime/controllers/array_controller",
+enifed("ember-runtime/controllers/array_controller",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-runtime/system/array_proxy","ember-runtime/mixins/sortable","ember-runtime/mixins/controller","ember-metal/computed","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -26937,9 +28298,9 @@ define("ember-runtime/controllers/array_controller",
       For example:
 
       ```handlebars
-        {{#each post in controller}}
-          <li>{{post.title}} ({{post.titleLength}} characters)</li>
-        {{/each}}
+      {{#each post in controller}}
+        <li>{{post.title}} ({{post.titleLength}} characters)</li>
+      {{/each}}
       ```
 
       ```javascript
@@ -26949,7 +28310,6 @@ define("ember-runtime/controllers/array_controller",
 
       App.PostController = Ember.ObjectController.extend({
         // the `title` property will be proxied to the underlying post.
-
         titleLength: function() {
           return this.get('title').length;
         }.property('title')
@@ -26987,10 +28347,22 @@ define("ember-runtime/controllers/array_controller",
     __exports__["default"] = ArrayProxy.extend(ControllerMixin, SortableMixin, {
 
       /**
-        The controller used to wrap items, if any.
+        The controller used to wrap items, if any. If the value is a string, it will
+        be used to lookup the container for the controller. As an alternative, you
+        can also provide a controller class as the value.
+
+        For example:
+
+        ```javascript
+        App.MyArrayController = Ember.ArrayController.extend({
+          itemController: Ember.ObjectController.extend({
+            //Item Controller Implementation
+          })
+        });
+        ```
 
         @property itemController
-        @type String
+        @type String | Ember.Controller
         @default null
       */
       itemController: null,
@@ -27031,6 +28403,7 @@ define("ember-runtime/controllers/array_controller",
 
         if (idx >= 0 && idx < length) {
           controllerClass = this.lookupItemController(object);
+
           if (controllerClass) {
             return this.controllerAt(idx, object, controllerClass);
           }
@@ -27091,10 +28464,9 @@ define("ember-runtime/controllers/array_controller",
       _isVirtual: false,
 
       controllerAt: function(idx, object, controllerClass) {
-        var fullName, subController, parentController;
-
         var container = get(this, 'container');
         var subControllers = this._subControllers;
+        var fullName, subController, subControllerFactory, parentController, options;
 
         if (subControllers.length > idx) {
           subController = subControllers[idx];
@@ -27104,23 +28476,25 @@ define("ember-runtime/controllers/array_controller",
           }
         }
 
-        fullName = 'controller:' + controllerClass;
-
-        if (!container.has(fullName)) {
-          throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
-        }
-
         if (this._isVirtual) {
           parentController = get(this, 'parentController');
         } else {
           parentController = this;
         }
 
-        subController = container.lookupFactory(fullName).create({
-          target: parentController,
-          parentController: parentController,
-          model: object
-        });
+        
+          fullName = 'controller:' + controllerClass;
+
+          if (!container.has(fullName)) {
+            throw new EmberError('Could not resolve itemController: "' + controllerClass + '"');
+          }
+
+          subController = container.lookupFactory(fullName).create({
+            target: parentController,
+            parentController: parentController,
+            model: object
+          });
+        
 
         subControllers[idx] = subController;
 
@@ -27136,6 +28510,7 @@ define("ember-runtime/controllers/array_controller",
         if (subControllers.length) {
           for (var i = 0, length = subControllers.length; length > i; i++) {
             controller = subControllers[i];
+
             if (controller) {
               controller.destroy();
             }
@@ -27151,7 +28526,7 @@ define("ember-runtime/controllers/array_controller",
       }
     });
   });
-define("ember-runtime/controllers/controller",
+enifed("ember-runtime/controllers/controller",
   ["ember-runtime/system/object","ember-runtime/mixins/controller","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -27171,7 +28546,7 @@ define("ember-runtime/controllers/controller",
     */
     __exports__["default"] = EmberObject.extend(Mixin);
   });
-define("ember-runtime/controllers/object_controller",
+enifed("ember-runtime/controllers/object_controller",
   ["ember-runtime/mixins/controller","ember-runtime/system/object_proxy","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -27198,33 +28573,40 @@ define("ember-runtime/controllers/object_controller",
     **/
     __exports__["default"] = ObjectProxy.extend(ControllerMixin);
   });
-define("ember-runtime/copy",
-  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+enifed("ember-runtime/copy",
+  ["ember-metal/enumerable_utils","ember-metal/utils","ember-runtime/system/object","ember-runtime/mixins/copyable","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     var indexOf = __dependency1__.indexOf;
     var typeOf = __dependency2__.typeOf;
     var EmberObject = __dependency3__["default"];
     var Copyable = __dependency4__["default"];
-    var create = __dependency5__.create;
 
     function _copy(obj, deep, seen, copies) {
       var ret, loc, key;
 
       // primitive data types are immutable, just return them.
-      if ('object' !== typeof obj || obj===null) return obj;
+      if (typeof obj !== 'object' || obj === null) {
+        return obj;
+      }
 
       // avoid cyclical loops
-      if (deep && (loc=indexOf(seen, obj))>=0) return copies[loc];
+      if (deep && (loc = indexOf(seen, obj)) >= 0) {
+        return copies[loc];
+      }
 
       
       // IMPORTANT: this specific test will detect a native array only. Any other
       // object will need to implement Copyable.
       if (typeOf(obj) === 'array') {
         ret = obj.slice();
+
         if (deep) {
           loc = ret.length;
-          while(--loc>=0) ret[loc] = _copy(ret[loc], deep, seen, copies);
+
+          while (--loc >= 0) {
+            ret[loc] = _copy(ret[loc], deep, seen, copies);
+          }
         }
       } else if (Copyable && Copyable.detect(obj)) {
         ret = obj.copy(deep, seen, copies);
@@ -27232,12 +28614,18 @@ define("ember-runtime/copy",
         ret = new Date(obj.getTime());
       } else {
         ret = {};
-        for(key in obj) {
-          if (!obj.hasOwnProperty(key)) continue;
+
+        for (key in obj) {
+          // support Null prototype
+          if (!Object.prototype.hasOwnProperty.call(obj, key)) {
+            continue;
+          }
 
           // Prevents browsers that don't respect non-enumerability from
           // copying internal Ember properties
-          if (key.substring(0,2) === '__') continue;
+          if (key.substring(0, 2) === '__') {
+            continue;
+          }
 
           ret[key] = deep ? _copy(obj[key], deep, seen, copies) : obj[key];
         }
@@ -27267,12 +28655,18 @@ define("ember-runtime/copy",
     */
     __exports__["default"] = function copy(obj, deep) {
       // fast paths
-      if ('object' !== typeof obj || obj === null) return obj; // can't copy primitives
-      if (Copyable && Copyable.detect(obj)) return obj.copy(deep);
+      if ('object' !== typeof obj || obj === null) {
+        return obj; // can't copy primitives
+      }
+
+      if (Copyable && Copyable.detect(obj)) {
+        return obj.copy(deep);
+      }
+
       return _copy(obj, deep, deep ? [] : null, deep ? [] : null);
     }
   });
-define("ember-runtime/core",
+enifed("ember-runtime/core",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -27300,17 +28694,21 @@ define("ember-runtime/core",
       @return {Boolean}
     */
     var isEqual = function isEqual(a, b) {
-      if (a && 'function'===typeof a.isEqual) return a.isEqual(b);
+      if (a && typeof a.isEqual === 'function') {
+        return a.isEqual(b);
+      }
+
       if (a instanceof Date && b instanceof Date) {
         return a.getTime() === b.getTime();
       }
+
       return a === b;
     };
     __exports__.isEqual = isEqual;
   });
-define("ember-runtime/ext/function",
-  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed"],
-  function(__dependency1__, __dependency2__, __dependency3__) {
+enifed("ember-runtime/ext/function",
+  ["ember-metal/core","ember-metal/expand_properties","ember-metal/computed","ember-metal/mixin"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
     "use strict";
     /**
     @module ember
@@ -27321,6 +28719,7 @@ define("ember-runtime/ext/function",
     // Ember.EXTEND_PROTOTYPES, Ember.assert
     var expandProperties = __dependency2__["default"];
     var computed = __dependency3__.computed;
+    var observer = __dependency4__.observer;
 
     var a_slice = Array.prototype.slice;
     var FunctionPrototype = Function.prototype;
@@ -27341,17 +28740,15 @@ define("ember-runtime/ext/function",
 
           fullName: function() {
             return this.get('firstName') + ' ' + this.get('lastName');
-
-            // Call this flag to mark the function as a property
-          }.property()
+          }.property() // Call this flag to mark the function as a property
         });
 
         var president = MyApp.President.create({
-          firstName: "Barack",
-          lastName: "Obama"
+          firstName: 'Barack',
+          lastName: 'Obama'
         });
 
-        president.get('fullName');    // "Barack Obama"
+        president.get('fullName'); // 'Barack Obama'
         ```
 
         Treating a function like a property is useful because they can work with
@@ -27387,7 +28784,7 @@ define("ember-runtime/ext/function",
         @method property
         @for Function
       */
-      FunctionPrototype.property = function() {
+      FunctionPrototype.property = function () {
         var ret = computed(this);
         // ComputedProperty.prototype.property expands properties; no need for us to
         // do so here.
@@ -27420,16 +28817,12 @@ define("ember-runtime/ext/function",
         @for Function
       */
       FunctionPrototype.observes = function() {
-        var addWatchedProperty = function (obs) { watched.push(obs); };
-        var watched = [];
-
-        for (var i=0; i<arguments.length; ++i) {
-          expandProperties(arguments[i], addWatchedProperty);
+        var length = arguments.length;
+        var args = new Array(length);
+        for (var x = 0; x < length; x++) {
+          args[x] = arguments[x];
         }
-
-        this.__ember_observes__ = watched;
-
-        return this;
+        return observer.apply(this, args.concat(this));
       };
 
       /**
@@ -27457,8 +28850,8 @@ define("ember-runtime/ext/function",
         @method observesImmediately
         @for Function
       */
-      FunctionPrototype.observesImmediately = function() {
-        for (var i=0, l=arguments.length; i<l; i++) {
+      FunctionPrototype.observesImmediately = function () {
+        for (var i = 0, l = arguments.length; i < l; i++) {
           var arg = arguments[i];
                   }
 
@@ -27488,11 +28881,13 @@ define("ember-runtime/ext/function",
         @method observesBefore
         @for Function
       */
-      FunctionPrototype.observesBefore = function() {
-        var addWatchedProperty = function (obs) { watched.push(obs); };
+      FunctionPrototype.observesBefore = function () {
         var watched = [];
+        var addWatchedProperty = function (obs) {
+          watched.push(obs);
+        };
 
-        for (var i=0; i<arguments.length; ++i) {
+        for (var i = 0, l = arguments.length; i < l; ++i) {
           expandProperties(arguments[i], addWatchedProperty);
         }
 
@@ -27522,26 +28917,56 @@ define("ember-runtime/ext/function",
         @method on
         @for Function
       */
-      FunctionPrototype.on = function() {
+      FunctionPrototype.on = function () {
         var events = a_slice.call(arguments);
         this.__ember_listens__ = events;
+
         return this;
       };
     }
   });
-define("ember-runtime/ext/rsvp",
-  ["ember-metal/core","ember-metal/logger","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-runtime/ext/rsvp",
+  ["ember-metal/core","ember-metal/logger","ember-metal/run_loop","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /* globals RSVP:true */
 
     var Ember = __dependency1__["default"];
     var Logger = __dependency2__["default"];
+    var run = __dependency3__["default"];
 
-    var RSVP = requireModule("rsvp");
-    var Test, testModuleName = 'ember-testing/test';
+    var RSVP = requireModule('rsvp');
+    var testModuleName = 'ember-testing/test';
+    var Test;
 
-    RSVP.onerrorDefault = function(error) {
+    var asyncStart = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncStart();
+      }
+    };
+
+    var asyncEnd = function() {
+      if (Ember.Test && Ember.Test.adapter) {
+        Ember.Test.adapter.asyncEnd();
+      }
+    };
+
+    RSVP.configure('async', function(callback, promise) {
+      var async = !run.currentRunLoop;
+
+      if (Ember.testing && async) { asyncStart(); }
+
+      run.backburner.schedule('actions', function(){
+        if (Ember.testing && async) { asyncEnd(); }
+        callback(promise);
+      });
+    });
+
+    RSVP.Promise.prototype.fail = function(callback, label){
+            return this['catch'](callback, label);
+    };
+
+    RSVP.onerrorDefault = function (error) {
       if (error instanceof Error) {
         if (Ember.testing) {
           // ES6TODO: remove when possible
@@ -27566,7 +28991,7 @@ define("ember-runtime/ext/rsvp",
 
     __exports__["default"] = RSVP;
   });
-define("ember-runtime/ext/string",
+enifed("ember-runtime/ext/string",
   ["ember-metal/core","ember-runtime/system/string"],
   function(__dependency1__, __dependency2__) {
     "use strict";
@@ -27597,7 +29022,7 @@ define("ember-runtime/ext/string",
         @method fmt
         @for String
       */
-      StringPrototype.fmt = function() {
+      StringPrototype.fmt = function () {
         return fmt(this, arguments);
       };
 
@@ -27607,7 +29032,7 @@ define("ember-runtime/ext/string",
         @method w
         @for String
       */
-      StringPrototype.w = function() {
+      StringPrototype.w = function () {
         return w(this);
       };
 
@@ -27617,7 +29042,7 @@ define("ember-runtime/ext/string",
         @method loc
         @for String
       */
-      StringPrototype.loc = function() {
+      StringPrototype.loc = function () {
         return loc(this, arguments);
       };
 
@@ -27627,7 +29052,7 @@ define("ember-runtime/ext/string",
         @method camelize
         @for String
       */
-      StringPrototype.camelize = function() {
+      StringPrototype.camelize = function () {
         return camelize(this);
       };
 
@@ -27637,7 +29062,7 @@ define("ember-runtime/ext/string",
         @method decamelize
         @for String
       */
-      StringPrototype.decamelize = function() {
+      StringPrototype.decamelize = function () {
         return decamelize(this);
       };
 
@@ -27647,7 +29072,7 @@ define("ember-runtime/ext/string",
         @method dasherize
         @for String
       */
-      StringPrototype.dasherize = function() {
+      StringPrototype.dasherize = function () {
         return dasherize(this);
       };
 
@@ -27657,7 +29082,7 @@ define("ember-runtime/ext/string",
         @method underscore
         @for String
       */
-      StringPrototype.underscore = function() {
+      StringPrototype.underscore = function () {
         return underscore(this);
       };
 
@@ -27667,7 +29092,7 @@ define("ember-runtime/ext/string",
         @method classify
         @for String
       */
-      StringPrototype.classify = function() {
+      StringPrototype.classify = function () {
         return classify(this);
       };
 
@@ -27677,70 +29102,108 @@ define("ember-runtime/ext/string",
         @method capitalize
         @for String
       */
-      StringPrototype.capitalize = function() {
+      StringPrototype.capitalize = function () {
         return capitalize(this);
       };
     }
   });
-define("ember-runtime/keys",
-  ["ember-metal/enumerable_utils","ember-metal/platform","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-runtime/mixins/-proxy",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
     "use strict";
-    var EnumerableUtils = __dependency1__["default"];
-    var create = __dependency2__.create;
-
     /**
-      Returns all of the keys defined on an object or hash. This is useful
-      when inspecting objects for debugging. On browsers that support it, this
-      uses the native `Object.keys` implementation.
-
-      @method keys
-      @for Ember
-      @param {Object} obj
-      @return {Array} Array containing keys of obj
+    @module ember
+    @submodule ember-runtime
     */
-    var keys = Object.keys;
-    if (!keys || create.isSimulated) {
-      var prototypeProperties = [
-        'constructor',
-        'hasOwnProperty',
-        'isPrototypeOf',
-        'propertyIsEnumerable',
-        'valueOf',
-        'toLocaleString',
-        'toString'
-      ],
-      pushPropertyName = function(obj, array, key) {
-        // Prevents browsers that don't respect non-enumerability from
-        // copying internal Ember properties
-        if (key.substring(0,2) === '__') return;
-        if (key === '_super') return;
-        if (EnumerableUtils.indexOf(array, key) >= 0) return;
-        if (!Object.prototype.hasOwnProperty.call(obj, key)) return;
 
-        array.push(key);
-      };
+    var Ember = __dependency1__["default"];
+    // Ember.assert
+    var get = __dependency2__.get;
+    var set = __dependency3__.set;
+    var meta = __dependency4__.meta;
+    var addObserver = __dependency5__.addObserver;
+    var removeObserver = __dependency5__.removeObserver;
+    var addBeforeObserver = __dependency5__.addBeforeObserver;
+    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
+    var propertyWillChange = __dependency6__.propertyWillChange;
+    var propertyDidChange = __dependency6__.propertyDidChange;
+    var computed = __dependency7__.computed;
+    var defineProperty = __dependency8__.defineProperty;
+    var Mixin = __dependency9__.Mixin;
+    var observer = __dependency9__.observer;
+    var fmt = __dependency10__.fmt;
+    var EmberObject = __dependency11__["default"];
 
-      keys = function keys(obj) {
-        var ret = [], key;
-        for (key in obj) {
-          pushPropertyName(obj, ret, key);
-        }
-
-        // IE8 doesn't enumerate property that named the same as prototype properties.
-        for (var i = 0, l = prototypeProperties.length; i < l; i++) {
-          key = prototypeProperties[i];
-
-          pushPropertyName(obj, ret, key);
-        }
-
-        return ret;
-      };
+    function contentPropertyWillChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; }  // if shadowed in proxy
+      propertyWillChange(this, key);
     }
 
-    __exports__["default"] = keys;
+    function contentPropertyDidChange(content, contentKey) {
+      var key = contentKey.slice(8); // remove "content."
+      if (key in this) { return; } // if shadowed in proxy
+      propertyDidChange(this, key);
+    }
+
+    /**
+      `Ember.ProxyMixin` forwards all properties not defined by the proxy itself
+      to a proxied `content` object.  See Ember.ObjectProxy for more details.
+
+      @class ProxyMixin
+      @namespace Ember
+    */
+    __exports__["default"] = Mixin.create({
+      /**
+        The object whose properties will be forwarded.
+
+        @property content
+        @type Ember.Object
+        @default null
+      */
+      content: null,
+      _contentDidChange: observer('content', function() {
+              }),
+
+      isTruthy: computed.bool('content'),
+
+      _debugContainerKey: null,
+
+      willWatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        addObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      didUnwatchProperty: function (key) {
+        var contentKey = 'content.' + key;
+        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
+        removeObserver(this, contentKey, null, contentPropertyDidChange);
+      },
+
+      unknownProperty: function (key) {
+        var content = get(this, 'content');
+        if (content) {
+          return get(content, key);
+        }
+      },
+
+      setUnknownProperty: function (key, value) {
+        var m = meta(this);
+        if (m.proto === this) {
+          // if marked as prototype then just defineProperty
+          // rather than delegate
+          defineProperty(this, key, null, value);
+          return value;
+        }
+
+        var content = get(this, 'content');
+                return set(content, key, value);
+      }
+
+    });
   });
-define("ember-runtime/mixins/action_handler",
+enifed("ember-runtime/mixins/action_handler",
   ["ember-metal/merge","ember-metal/mixin","ember-metal/property_get","ember-metal/utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -27948,7 +29411,8 @@ define("ember-runtime/mixins/action_handler",
         @param {*} context a context to send with the action
       */
       send: function(actionName) {
-        var args = [].slice.call(arguments, 1), target;
+        var args = [].slice.call(arguments, 1);
+        var target;
 
         if (this._actions && this._actions[actionName]) {
           if (this._actions[actionName].apply(this, args) === true) {
@@ -27956,12 +29420,6 @@ define("ember-runtime/mixins/action_handler",
           } else {
             return;
           }
-        } else if (!Ember.FEATURES.isEnabled('ember-routing-drop-deprecated-action-style') && this.deprecatedSend && this.deprecatedSendHandles && this.deprecatedSendHandles(actionName)) {
-                    if (this.deprecatedSend.apply(this, [].slice.call(arguments)) === true) {
-            // handler return true, so this action will bubble
-          } else {
-            return;
-          }
         }
 
         if (target = get(this, 'target')) {
@@ -27972,9 +29430,9 @@ define("ember-runtime/mixins/action_handler",
 
     __exports__["default"] = ActionHandler;
   });
-define("ember-runtime/mixins/array",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+enifed("ember-runtime/mixins/array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/computed","ember-metal/is_none","ember-runtime/mixins/enumerable","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/property_events","ember-metal/events","ember-metal/watching","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -27986,24 +29444,41 @@ define("ember-runtime/mixins/array",
     //
     var Ember = __dependency1__["default"];
     // ES6TODO: Ember.A
-
     var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var computed = __dependency4__.computed;
-    var cacheFor = __dependency4__.cacheFor;
-    var isNone = __dependency5__.isNone;
-    var none = __dependency5__.none;
-    var Enumerable = __dependency6__["default"];
-    var map = __dependency7__.map;
-    var Mixin = __dependency8__.Mixin;
-    var required = __dependency8__.required;
-    var propertyWillChange = __dependency9__.propertyWillChange;
-    var propertyDidChange = __dependency9__.propertyDidChange;
-    var addListener = __dependency10__.addListener;
-    var removeListener = __dependency10__.removeListener;
-    var sendEvent = __dependency10__.sendEvent;
-    var hasListeners = __dependency10__.hasListeners;
-    var isWatching = __dependency11__.isWatching;
+    var computed = __dependency3__.computed;
+    var cacheFor = __dependency3__.cacheFor;
+    var isNone = __dependency4__.isNone;
+    var none = __dependency4__.none;
+    var Enumerable = __dependency5__["default"];
+    var map = __dependency6__.map;
+    var Mixin = __dependency7__.Mixin;
+    var required = __dependency7__.required;
+    var propertyWillChange = __dependency8__.propertyWillChange;
+    var propertyDidChange = __dependency8__.propertyDidChange;
+    var addListener = __dependency9__.addListener;
+    var removeListener = __dependency9__.removeListener;
+    var sendEvent = __dependency9__.sendEvent;
+    var hasListeners = __dependency9__.hasListeners;
+    var isWatching = __dependency10__.isWatching;
+
+    function arrayObserversHelper(obj, target, opts, operation, notify) {
+      var willChange = (opts && opts.willChange) || 'arrayWillChange';
+      var didChange  = (opts && opts.didChange) || 'arrayDidChange';
+      var hasObservers = get(obj, 'hasArrayObservers');
+
+      if (hasObservers === notify) {
+        propertyWillChange(obj, 'hasArrayObservers');
+      }
+
+      operation(obj, '@array:before', target, willChange);
+      operation(obj, '@array:change', target, didChange);
+
+      if (hasObservers === notify) {
+        propertyDidChange(obj, 'hasArrayObservers');
+      }
+
+      return obj;
+    }
 
     // ..........................................................
     // ARRAY
@@ -28065,8 +29540,9 @@ define("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['a', 'b', 'c', 'd'];
-        arr.objectAt(0);   // "a"
-        arr.objectAt(3);   // "d"
+
+        arr.objectAt(0);   // 'a'
+        arr.objectAt(3);   // 'd'
         arr.objectAt(-1);  // undefined
         arr.objectAt(4);   // undefined
         arr.objectAt(5);   // undefined
@@ -28077,7 +29553,10 @@ define("ember-runtime/mixins/array",
         @return {*} item at index or undefined
       */
       objectAt: function(idx) {
-        if ((idx < 0) || (idx >= get(this, 'length'))) return undefined;
+        if (idx < 0 || idx >= get(this, 'length')) {
+          return undefined;
+        }
+
         return get(this, idx);
       },
 
@@ -28086,8 +29565,9 @@ define("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['a', 'b', 'c', 'd'];
-        arr.objectsAt([0, 1, 2]);  // ["a", "b", "c"]
-        arr.objectsAt([2, 3, 4]);  // ["c", "d", undefined]
+
+        arr.objectsAt([0, 1, 2]);  // ['a', 'b', 'c']
+        arr.objectsAt([2, 3, 4]);  // ['c', 'd', undefined]
         ```
 
         @method objectsAt
@@ -28096,7 +29576,10 @@ define("ember-runtime/mixins/array",
        */
       objectsAt: function(indexes) {
         var self = this;
-        return map(indexes, function(idx) { return self.objectAt(idx); });
+
+        return map(indexes, function(idx) {
+          return self.objectAt(idx);
+        });
       },
 
       // overrides Ember.Enumerable version
@@ -28115,8 +29598,11 @@ define("ember-runtime/mixins/array",
         @return this
       */
       '[]': computed(function(key, value) {
-        if (value !== undefined) this.replace(0, get(this, 'length'), value) ;
-        return this ;
+        if (value !== undefined) {
+          this.replace(0, get(this, 'length'), value);
+        }
+
+        return this;
       }),
 
       firstObject: computed(function() {
@@ -28124,7 +29610,7 @@ define("ember-runtime/mixins/array",
       }),
 
       lastObject: computed(function() {
-        return this.objectAt(get(this, 'length')-1);
+        return this.objectAt(get(this, 'length') - 1);
       }),
 
       // optimized version from Enumerable
@@ -28140,6 +29626,7 @@ define("ember-runtime/mixins/array",
 
         ```javascript
         var arr = ['red', 'green', 'blue'];
+
         arr.slice(0);       // ['red', 'green', 'blue']
         arr.slice(0, 2);    // ['red', 'green']
         arr.slice(1, 100);  // ['green', 'blue']
@@ -28152,17 +29639,29 @@ define("ember-runtime/mixins/array",
       */
       slice: function(beginIndex, endIndex) {
         var ret = Ember.A();
-        var length = get(this, 'length') ;
-        if (isNone(beginIndex)) beginIndex = 0 ;
-        if (isNone(endIndex) || (endIndex > length)) endIndex = length ;
+        var length = get(this, 'length');
 
-        if (beginIndex < 0) beginIndex = length + beginIndex;
-        if (endIndex < 0) endIndex = length + endIndex;
-
-        while(beginIndex < endIndex) {
-          ret[ret.length] = this.objectAt(beginIndex++) ;
+        if (isNone(beginIndex)) {
+          beginIndex = 0;
         }
-        return ret ;
+
+        if (isNone(endIndex) || (endIndex > length)) {
+          endIndex = length;
+        }
+
+        if (beginIndex < 0) {
+          beginIndex = length + beginIndex;
+        }
+
+        if (endIndex < 0) {
+          endIndex = length + endIndex;
+        }
+
+        while (beginIndex < endIndex) {
+          ret[ret.length] = this.objectAt(beginIndex++);
+        }
+
+        return ret;
       },
 
       /**
@@ -28172,13 +29671,14 @@ define("ember-runtime/mixins/array",
         the end of the array. Returns -1 if no match is found.
 
         ```javascript
-        var arr = ["a", "b", "c", "d", "a"];
-        arr.indexOf("a");       //  0
-        arr.indexOf("z");       // -1
-        arr.indexOf("a", 2);    //  4
-        arr.indexOf("a", -1);   //  4
-        arr.indexOf("b", 3);    // -1
-        arr.indexOf("a", 100);  // -1
+        var arr = ['a', 'b', 'c', 'd', 'a'];
+
+        arr.indexOf('a');       //  0
+        arr.indexOf('z');       // -1
+        arr.indexOf('a', 2);    //  4
+        arr.indexOf('a', -1);   //  4
+        arr.indexOf('b', 3);    // -1
+        arr.indexOf('a', 100);  // -1
         ```
 
         @method indexOf
@@ -28187,14 +29687,23 @@ define("ember-runtime/mixins/array",
         @return {Number} index or -1 if not found
       */
       indexOf: function(object, startAt) {
-        var idx, len = get(this, 'length');
+        var len = get(this, 'length');
+        var idx;
 
-        if (startAt === undefined) startAt = 0;
-        if (startAt < 0) startAt += len;
-
-        for(idx = startAt; idx < len; idx++) {
-          if (this.objectAt(idx) === object) return idx;
+        if (startAt === undefined) {
+          startAt = 0;
         }
+
+        if (startAt < 0) {
+          startAt += len;
+        }
+
+        for (idx = startAt; idx < len; idx++) {
+          if (this.objectAt(idx) === object) {
+            return idx;
+          }
+        }
+
         return -1;
       },
 
@@ -28205,13 +29714,14 @@ define("ember-runtime/mixins/array",
         from the end of the array. Returns -1 if no match is found.
 
         ```javascript
-        var arr = ["a", "b", "c", "d", "a"];
-        arr.lastIndexOf("a");       //  4
-        arr.lastIndexOf("z");       // -1
-        arr.lastIndexOf("a", 2);    //  0
-        arr.lastIndexOf("a", -1);   //  4
-        arr.lastIndexOf("b", 3);    //  1
-        arr.lastIndexOf("a", 100);  //  4
+        var arr = ['a', 'b', 'c', 'd', 'a'];
+
+        arr.lastIndexOf('a');       //  4
+        arr.lastIndexOf('z');       // -1
+        arr.lastIndexOf('a', 2);    //  0
+        arr.lastIndexOf('a', -1);   //  4
+        arr.lastIndexOf('b', 3);    //  1
+        arr.lastIndexOf('a', 100);  //  4
         ```
 
         @method lastIndexOf
@@ -28220,14 +29730,23 @@ define("ember-runtime/mixins/array",
         @return {Number} index or -1 if not found
       */
       lastIndexOf: function(object, startAt) {
-        var idx, len = get(this, 'length');
+        var len = get(this, 'length');
+        var idx;
 
-        if (startAt === undefined || startAt >= len) startAt = len-1;
-        if (startAt < 0) startAt += len;
-
-        for(idx = startAt; idx >= 0; idx--) {
-          if (this.objectAt(idx) === object) return idx;
+        if (startAt === undefined || startAt >= len) {
+          startAt = len-1;
         }
+
+        if (startAt < 0) {
+          startAt += len;
+        }
+
+        for (idx = startAt; idx >= 0; idx--) {
+          if (this.objectAt(idx) === object) {
+            return idx;
+          }
+        }
+
         return -1;
       },
 
@@ -28259,16 +29778,9 @@ define("ember-runtime/mixins/array",
           `willChange` and `didChange` option.
         @return {Ember.Array} receiver
       */
-      addArrayObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'arrayWillChange',
-            didChange  = (opts && opts.didChange) || 'arrayDidChange';
 
-        var hasObservers = get(this, 'hasArrayObservers');
-        if (!hasObservers) propertyWillChange(this, 'hasArrayObservers');
-        addListener(this, '@array:before', target, willChange);
-        addListener(this, '@array:change', target, didChange);
-        if (!hasObservers) propertyDidChange(this, 'hasArrayObservers');
-        return this;
+      addArrayObserver: function(target, opts) {
+        return arrayObserversHelper(this, target, opts, addListener, false);
       },
 
       /**
@@ -28283,15 +29795,7 @@ define("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       removeArrayObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'arrayWillChange',
-            didChange  = (opts && opts.didChange) || 'arrayDidChange';
-
-        var hasObservers = get(this, 'hasArrayObservers');
-        if (hasObservers) propertyWillChange(this, 'hasArrayObservers');
-        removeListener(this, '@array:before', target, willChange);
-        removeListener(this, '@array:change', target, didChange);
-        if (hasObservers) propertyDidChange(this, 'hasArrayObservers');
-        return this;
+        return arrayObserversHelper(this, target, opts, removeListener, true);
       },
 
       /**
@@ -28319,26 +29823,36 @@ define("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       arrayContentWillChange: function(startIdx, removeAmt, addAmt) {
+        var removing, lim;
 
         // if no args are passed assume everything changes
-        if (startIdx===undefined) {
+        if (startIdx === undefined) {
           startIdx = 0;
           removeAmt = addAmt = -1;
         } else {
-          if (removeAmt === undefined) removeAmt=-1;
-          if (addAmt    === undefined) addAmt=-1;
+          if (removeAmt === undefined) {
+            removeAmt = -1;
+          }
+
+          if (addAmt === undefined) {
+            addAmt = -1;
+          }
         }
 
         // Make sure the @each proxy is set up if anyone is observing @each
-        if (isWatching(this, '@each')) { get(this, '@each'); }
+        if (isWatching(this, '@each')) {
+          get(this, '@each');
+        }
 
         sendEvent(this, '@array:before', [this, startIdx, removeAmt, addAmt]);
 
-        var removing, lim;
-        if (startIdx>=0 && removeAmt>=0 && get(this, 'hasEnumerableObservers')) {
+        if (startIdx >= 0 && removeAmt >= 0 && get(this, 'hasEnumerableObservers')) {
           removing = [];
-          lim = startIdx+removeAmt;
-          for(var idx=startIdx;idx<lim;idx++) removing.push(this.objectAt(idx));
+          lim = startIdx + removeAmt;
+
+          for (var idx = startIdx; idx < lim; idx++) {
+            removing.push(this.objectAt(idx));
+          }
         } else {
           removing = removeAmt;
         }
@@ -28363,21 +29877,29 @@ define("ember-runtime/mixins/array",
         @return {Ember.Array} receiver
       */
       arrayContentDidChange: function(startIdx, removeAmt, addAmt) {
+        var adding, lim;
 
         // if no args are passed assume everything changes
-        if (startIdx===undefined) {
+        if (startIdx === undefined) {
           startIdx = 0;
           removeAmt = addAmt = -1;
         } else {
-          if (removeAmt === undefined) removeAmt=-1;
-          if (addAmt    === undefined) addAmt=-1;
+          if (removeAmt === undefined) {
+            removeAmt = -1;
+          }
+
+          if (addAmt === undefined) {
+            addAmt = -1;
+          }
         }
 
-        var adding, lim;
-        if (startIdx>=0 && addAmt>=0 && get(this, 'hasEnumerableObservers')) {
+        if (startIdx >= 0 && addAmt >= 0 && get(this, 'hasEnumerableObservers')) {
           adding = [];
-          lim = startIdx+addAmt;
-          for(var idx=startIdx;idx<lim;idx++) adding.push(this.objectAt(idx));
+          lim = startIdx + addAmt;
+
+          for (var idx = startIdx; idx < lim; idx++) {
+            adding.push(this.objectAt(idx));
+          }
         } else {
           adding = addAmt;
         }
@@ -28385,13 +29907,15 @@ define("ember-runtime/mixins/array",
         this.enumerableContentDidChange(removeAmt, adding);
         sendEvent(this, '@array:change', [this, startIdx, removeAmt, addAmt]);
 
-        var length      = get(this, 'length'),
-            cachedFirst = cacheFor(this, 'firstObject'),
-            cachedLast  = cacheFor(this, 'lastObject');
+        var length = get(this, 'length');
+        var cachedFirst = cacheFor(this, 'firstObject');
+        var cachedLast = cacheFor(this, 'lastObject');
+
         if (this.objectAt(0) !== cachedFirst) {
           propertyWillChange(this, 'firstObject');
           propertyDidChange(this, 'firstObject');
         }
+
         if (this.objectAt(length-1) !== cachedLast) {
           propertyWillChange(this, 'lastObject');
           propertyDidChange(this, 'lastObject');
@@ -28427,7 +29951,7 @@ define("ember-runtime/mixins/array",
       })
     });
   });
-define("ember-runtime/mixins/comparable",
+enifed("ember-runtime/mixins/comparable",
   ["ember-metal/mixin","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -28469,7 +29993,7 @@ define("ember-runtime/mixins/comparable",
       compare: required(Function)
     });
   });
-define("ember-runtime/mixins/controller",
+enifed("ember-runtime/mixins/controller",
   ["ember-metal/core","ember-metal/property_get","ember-runtime/system/object","ember-metal/mixin","ember-metal/computed","ember-runtime/mixins/action_handler","ember-runtime/mixins/controller_content_model_alias_deprecation","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
@@ -28533,20 +30057,11 @@ define("ember-runtime/mixins/controller",
       /**
         @private
        */
-      content: computed.alias('model'),
+      content: computed.alias('model')
 
-      deprecatedSendHandles: function(actionName) {
-        return !!this[actionName];
-      },
-
-      deprecatedSend: function(actionName) {
-        var args = [].slice.call(arguments, 1);
-                        this[actionName].apply(this, args);
-        return;
-      }
     });
   });
-define("ember-runtime/mixins/controller_content_model_alias_deprecation",
+enifed("ember-runtime/mixins/controller_content_model_alias_deprecation",
   ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -28604,7 +30119,7 @@ define("ember-runtime/mixins/controller_content_model_alias_deprecation",
       }
     });
   });
-define("ember-runtime/mixins/copyable",
+enifed("ember-runtime/mixins/copyable",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/mixin","ember-runtime/mixins/freezable","ember-runtime/system/string","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -28672,44 +30187,16 @@ define("ember-runtime/mixins/copyable",
       }
     });
   });
-define("ember-runtime/mixins/deferred",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-metal/run_loop","ember-runtime/ext/rsvp","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
+enifed("ember-runtime/mixins/deferred",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","ember-metal/computed","ember-runtime/ext/rsvp","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.FEATURES, Ember.Test
     var get = __dependency2__.get;
     var Mixin = __dependency3__.Mixin;
     var computed = __dependency4__.computed;
-    var run = __dependency5__["default"];
-    var RSVP = __dependency6__["default"];
-
-    var asyncStart = function() {
-      if (Ember.Test && Ember.Test.adapter) {
-        Ember.Test.adapter.asyncStart();
-      }
-    };
-
-    var asyncEnd = function() {
-      if (Ember.Test && Ember.Test.adapter) {
-        Ember.Test.adapter.asyncEnd();
-      }
-    };
-
-    RSVP.configure('async', function(callback, promise) {
-      var async = !run.currentRunLoop;
-
-      if (Ember.testing && async) { asyncStart(); }
-
-      run.backburner.schedule('actions', function(){
-        if (Ember.testing && async) { asyncEnd(); }
-        callback(promise);
-      });
-    });
-
-    RSVP.Promise.prototype.fail = function(callback, label){
-            return this['catch'](callback, label);
-    };
+    var RSVP = __dependency5__["default"];
 
     /**
     @module ember
@@ -28780,7 +30267,7 @@ define("ember-runtime/mixins/deferred",
       })
     });
   });
-define("ember-runtime/mixins/enumerable",
+enifed("ember-runtime/mixins/enumerable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/property_events","ember-metal/events","ember-runtime/compare","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
@@ -29131,7 +30618,7 @@ define("ember-runtime/mixins/enumerable",
         - `index` is the current index in the iteration.
         - `enumerable` is the enumerable object itself.
 
-        It should return the `true` to include the item in the results, `false`
+        It should return `true` to include the item in the results, `false`
         otherwise.
 
         Note that in addition to a callback, you can also pass an optional target
@@ -29221,9 +30708,9 @@ define("ember-runtime/mixins/enumerable",
         @return {Array} rejected array
       */
       rejectBy: function(key, value) {
-        var exactValue = function(item) { return get(item, key) === value; },
-            hasValue = function(item) { return !!get(item, key); },
-            use = (arguments.length === 2 ? exactValue : hasValue);
+        var exactValue = function(item) { return get(item, key) === value; };
+        var hasValue = function(item) { return !!get(item, key); };
+        var use = (arguments.length === 2 ? exactValue : hasValue);
 
         return this.reject(use);
       },
@@ -29420,11 +30907,11 @@ define("ember-runtime/mixins/enumerable",
         @return {Boolean} `true` if the passed function returns `true` for any item
       */
       any: function(callback, target) {
-        var len     = get(this, 'length'),
-            context = popCtx(),
-            found   = false,
-            last    = null,
-            next, idx;
+        var len     = get(this, 'length');
+        var context = popCtx();
+        var found   = false;
+        var last    = null;
+        var next, idx;
 
         if (target === undefined) { target = null; }
 
@@ -29677,10 +31164,10 @@ define("ember-runtime/mixins/enumerable",
         @return this
       */
       addEnumerableObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
-            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
-
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange';
+        var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
         var hasObservers = get(this, 'hasEnumerableObservers');
+
         if (!hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
         addListener(this, '@enumerable:before', target, willChange);
         addListener(this, '@enumerable:change', target, didChange);
@@ -29697,8 +31184,8 @@ define("ember-runtime/mixins/enumerable",
         @return this
       */
       removeEnumerableObserver: function(target, opts) {
-        var willChange = (opts && opts.willChange) || 'enumerableWillChange',
-            didChange  = (opts && opts.didChange) || 'enumerableDidChange';
+        var willChange = (opts && opts.willChange) || 'enumerableWillChange';
+        var didChange  = (opts && opts.didChange) || 'enumerableDidChange';
 
         var hasObservers = get(this, 'hasEnumerableObservers');
         if (hasObservers) propertyWillChange(this, 'hasEnumerableObservers');
@@ -29808,9 +31295,9 @@ define("ember-runtime/mixins/enumerable",
         var sortKeys = arguments;
         return this.toArray().sort(function(a, b){
           for(var i = 0; i < sortKeys.length; i++) {
-            var key = sortKeys[i],
-            propA = get(a, key),
-            propB = get(b, key);
+            var key = sortKeys[i];
+            var propA = get(a, key);
+            var propB = get(b, key);
             // return 1 or -1 else continue to the next sortKey
             var compareValue = compare(propA, propB);
             if (compareValue) { return compareValue; }
@@ -29820,7 +31307,7 @@ define("ember-runtime/mixins/enumerable",
       }
     });
   });
-define("ember-runtime/mixins/evented",
+enifed("ember-runtime/mixins/evented",
   ["ember-metal/mixin","ember-metal/events","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -29977,7 +31464,7 @@ define("ember-runtime/mixins/evented",
       }
     });
   });
-define("ember-runtime/mixins/freezable",
+enifed("ember-runtime/mixins/freezable",
   ["ember-metal/mixin","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -30075,7 +31562,7 @@ define("ember-runtime/mixins/freezable",
     var FROZEN_ERROR = "Frozen object cannot be modified.";
     __exports__.FROZEN_ERROR = FROZEN_ERROR;
   });
-define("ember-runtime/mixins/mutable_array",
+enifed("ember-runtime/mixins/mutable_array",
   ["ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/error","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -30359,7 +31846,7 @@ define("ember-runtime/mixins/mutable_array",
       },
 
       /**
-        Replace all the the receiver's content with content of the argument.
+        Replace all the receiver's content with content of the argument.
         If argument is an empty array receiver will be cleared.
 
         ```javascript
@@ -30429,7 +31916,7 @@ define("ember-runtime/mixins/mutable_array",
 
     });
   });
-define("ember-runtime/mixins/mutable_enumerable",
+enifed("ember-runtime/mixins/mutable_enumerable",
   ["ember-metal/enumerable_utils","ember-runtime/mixins/enumerable","ember-metal/mixin","ember-metal/property_events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -30550,7 +32037,7 @@ define("ember-runtime/mixins/mutable_enumerable",
       }
     });
   });
-define("ember-runtime/mixins/observable",
+enifed("ember-runtime/mixins/observable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/get_properties","ember-metal/set_properties","ember-metal/mixin","ember-metal/events","ember-metal/property_events","ember-metal/observer","ember-metal/computed","ember-metal/is_none","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -30692,7 +32179,7 @@ define("ember-runtime/mixins/observable",
       },
 
       /**
-        To get multiple properties at once, call `getProperties`
+        To get the values of multiple properties at once, call `getProperties`
         with a list of strings or an array:
 
         ```javascript
@@ -31058,12 +32545,12 @@ define("ember-runtime/mixins/observable",
       }
     });
   });
-define("ember-runtime/mixins/promise_proxy",
-  ["ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
+enifed("ember-runtime/mixins/promise_proxy",
+  ["ember-metal/property_get","ember-metal/set_properties","ember-metal/computed","ember-metal/mixin","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
     var get = __dependency1__.get;
-    var set = __dependency2__.set;
+    var setProperties = __dependency2__["default"];
     var computed = __dependency3__.computed;
     var Mixin = __dependency4__.Mixin;
     var EmberError = __dependency5__["default"];
@@ -31077,16 +32564,22 @@ define("ember-runtime/mixins/promise_proxy",
      */
 
     function tap(proxy, promise) {
-      set(proxy, 'isFulfilled', false);
-      set(proxy, 'isRejected', false);
+      setProperties(proxy, {
+        isFulfilled: false,
+        isRejected: false
+      });
 
       return promise.then(function(value) {
-        set(proxy, 'isFulfilled', true);
-        set(proxy, 'content', value);
+        setProperties(proxy, {
+          content: value,
+          isFulfilled: true
+        });
         return value;
       }, function(reason) {
-        set(proxy, 'isRejected', true);
-        set(proxy, 'reason', reason);
+        setProperties(proxy, {
+          reason: reason,
+          isRejected: true
+        });
         throw reason;
       }, "Ember: PromiseProxy");
     }
@@ -31266,7 +32759,7 @@ define("ember-runtime/mixins/promise_proxy",
       };
     }
   });
-define("ember-runtime/mixins/sortable",
+enifed("ember-runtime/mixins/sortable",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/mutable_enumerable","ember-runtime/compare","ember-metal/observer","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
     "use strict";
@@ -31388,10 +32881,10 @@ define("ember-runtime/mixins/sortable",
       sortFunction: compare,
 
       orderBy: function(item1, item2) {
-        var result = 0,
-            sortProperties = get(this, 'sortProperties'),
-            sortAscending = get(this, 'sortAscending'),
-            sortFunction = get(this, 'sortFunction');
+        var result = 0;
+        var sortProperties = get(this, 'sortProperties');
+        var sortAscending = get(this, 'sortAscending');
+        var sortFunction = get(this, 'sortFunction');
 
         
         forEach(sortProperties, function(propertyName) {
@@ -31407,8 +32900,8 @@ define("ember-runtime/mixins/sortable",
       },
 
       destroy: function() {
-        var content = get(this, 'content'),
-            sortProperties = get(this, 'sortProperties');
+        var content = get(this, 'content');
+        var sortProperties = get(this, 'sortProperties');
 
         if (content && sortProperties) {
           forEach(content, function(item) {
@@ -31431,10 +32924,10 @@ define("ember-runtime/mixins/sortable",
       */
 
       arrangedContent: computed('content', 'sortProperties.@each', function(key, value) {
-        var content = get(this, 'content'),
-            isSorted = get(this, 'isSorted'),
-            sortProperties = get(this, 'sortProperties'),
-            self = this;
+        var content = get(this, 'content');
+        var isSorted = get(this, 'isSorted');
+        var sortProperties = get(this, 'sortProperties');
+        var self = this;
 
         if (content && isSorted) {
           content = content.slice();
@@ -31453,8 +32946,8 @@ define("ember-runtime/mixins/sortable",
       }),
 
       _contentWillChange: beforeObserver('content', function() {
-        var content = get(this, 'content'),
-            sortProperties = get(this, 'sortProperties');
+        var content = get(this, 'content');
+        var sortProperties = get(this, 'sortProperties');
 
         if (content && sortProperties) {
           forEach(content, function(item) {
@@ -31507,8 +33000,8 @@ define("ember-runtime/mixins/sortable",
       },
 
       contentArrayDidChange: function(array, idx, removedCount, addedCount) {
-        var isSorted = get(this, 'isSorted'),
-            sortProperties = get(this, 'sortProperties');
+        var isSorted = get(this, 'isSorted');
+        var sortProperties = get(this, 'sortProperties');
 
         if (isSorted) {
           var addedObjects = array.slice(idx, idx+addedCount);
@@ -31534,12 +33027,12 @@ define("ember-runtime/mixins/sortable",
       },
 
       contentItemSortPropertyDidChange: function(item) {
-        var arrangedContent = get(this, 'arrangedContent'),
-            oldIndex = arrangedContent.indexOf(item),
-            leftItem = arrangedContent.objectAt(oldIndex - 1),
-            rightItem = arrangedContent.objectAt(oldIndex + 1),
-            leftResult = leftItem && this.orderBy(item, leftItem),
-            rightResult = rightItem && this.orderBy(item, rightItem);
+        var arrangedContent = get(this, 'arrangedContent');
+        var oldIndex = arrangedContent.indexOf(item);
+        var leftItem = arrangedContent.objectAt(oldIndex - 1);
+        var rightItem = arrangedContent.objectAt(oldIndex + 1);
+        var leftResult = leftItem && this.orderBy(item, leftItem);
+        var rightResult = rightItem && this.orderBy(item, rightItem);
 
         if (leftResult < 0 || rightResult > 0) {
           arrangedContent.removeObject(item);
@@ -31571,7 +33064,7 @@ define("ember-runtime/mixins/sortable",
       }
     });
   });
-define("ember-runtime/mixins/target_action_support",
+enifed("ember-runtime/mixins/target_action_support",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/mixin","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -31685,9 +33178,9 @@ define("ember-runtime/mixins/target_action_support",
       */
       triggerAction: function(opts) {
         opts = opts || {};
-        var action = opts.action || get(this, 'action'),
-            target = opts.target || get(this, 'targetObject'),
-            actionContext = opts.actionContext;
+        var action = opts.action || get(this, 'action');
+        var target = opts.target || get(this, 'targetObject');
+        var actionContext = opts.actionContext;
 
         function args(options, actionName) {
           var ret = [];
@@ -31720,7 +33213,7 @@ define("ember-runtime/mixins/target_action_support",
 
     __exports__["default"] = TargetActionSupport;
   });
-define("ember-runtime/system/application",
+enifed("ember-runtime/system/application",
   ["ember-runtime/system/namespace","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -31728,7 +33221,7 @@ define("ember-runtime/system/application",
 
     __exports__["default"] = Namespace.extend();
   });
-define("ember-runtime/system/array_proxy",
+enifed("ember-runtime/system/array_proxy",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/property_events","ember-metal/error","ember-runtime/system/object","ember-runtime/mixins/mutable_array","ember-runtime/mixins/enumerable","ember-runtime/system/string","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
@@ -31872,7 +33365,28 @@ define("ember-runtime/system/array_proxy",
         }
       },
 
+      /**
+        Override to implement content array `willChange` observer.
+
+        @method contentArrayWillChange
+
+        @param {Ember.Array} contentArray the content array
+        @param {Number} start starting index of the change
+        @param {Number} removeCount count of items removed
+        @param {Number} addCount count of items added
+
+      */
       contentArrayWillChange: K,
+      /**
+        Override to implement content array `didChange` observer.
+
+        @method contentArrayDidChange
+
+        @param {Ember.Array} contentArray the content array
+        @param {Number} start starting index of the change
+        @param {Number} removeCount count of items removed
+        @param {Number} addCount count of items added
+      */
       contentArrayDidChange: K,
 
       /**
@@ -31902,8 +33416,8 @@ define("ember-runtime/system/array_proxy",
       },
 
       _arrangedContentWillChange: beforeObserver('arrangedContent', function() {
-        var arrangedContent = get(this, 'arrangedContent'),
-            len = arrangedContent ? get(arrangedContent, 'length') : 0;
+        var arrangedContent = get(this, 'arrangedContent');
+        var len = arrangedContent ? get(arrangedContent, 'length') : 0;
 
         this.arrangedContentArrayWillChange(this, 0, len, undefined);
         this.arrangedContentWillChange(this);
@@ -31912,8 +33426,8 @@ define("ember-runtime/system/array_proxy",
       }),
 
       _arrangedContentDidChange: observer('arrangedContent', function() {
-        var arrangedContent = get(this, 'arrangedContent'),
-            len = arrangedContent ? get(arrangedContent, 'length') : 0;
+        var arrangedContent = get(this, 'arrangedContent');
+        var len = arrangedContent ? get(arrangedContent, 'length') : 0;
 
         
         this._setupArrangedContent();
@@ -31988,9 +33502,10 @@ define("ember-runtime/system/array_proxy",
 
       removeAt: function(start, len) {
         if ('number' === typeof start) {
-          var content = get(this, 'content'),
-              arrangedContent = get(this, 'arrangedContent'),
-              indices = [], i;
+          var content = get(this, 'content');
+          var arrangedContent = get(this, 'arrangedContent');
+          var indices = [];
+          var i;
 
           if ((start < 0) || (start >= get(this, 'length'))) {
             throw new EmberError(OUT_OF_RANGE_EXCEPTION);
@@ -32075,7 +33590,7 @@ define("ember-runtime/system/array_proxy",
 
     __exports__["default"] = ArrayProxy;
   });
-define("ember-runtime/system/container",
+enifed("ember-runtime/system/container",
   ["ember-metal/property_set","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -32086,8 +33601,8 @@ define("ember-runtime/system/container",
 
     __exports__["default"] = Container;
   });
-define("ember-runtime/system/core_object",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-runtime/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
+enifed("ember-runtime/system/core_object",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/platform","ember-metal/watching","ember-metal/chains","ember-metal/events","ember-metal/mixin","ember-metal/enumerable_utils","ember-metal/error","ember-metal/keys","ember-runtime/mixins/action_handler","ember-metal/properties","ember-metal/binding","ember-metal/computed","ember-metal/run_loop","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __exports__) {
         // Remove "use strict"; from transpiled module until
     // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
@@ -32100,7 +33615,7 @@ define("ember-runtime/system/core_object",
     */
 
     var Ember = __dependency1__["default"];
-    // Ember.ENV.MANDATORY_SETTER, Ember.assert, Ember.K, Ember.config
+    // Ember.assert, Ember.K, Ember.config
 
     // NOTE: this object should never be included directly. Instead use `Ember.Object`.
     // We only define this separately so that `Ember.Set` can depend on it.
@@ -32112,7 +33627,6 @@ define("ember-runtime/system/core_object",
     var generateGuid = __dependency4__.generateGuid;
     var GUID_KEY = __dependency4__.GUID_KEY;
     var meta = __dependency4__.meta;
-    var META_KEY = __dependency4__.META_KEY;
     var makeArray = __dependency4__.makeArray;
     var rewatch = __dependency6__.rewatch;
     var finishChains = __dependency7__.finishChains;
@@ -32122,7 +33636,7 @@ define("ember-runtime/system/core_object",
     var required = __dependency9__.required;
     var indexOf = __dependency10__.indexOf;
     var EmberError = __dependency11__["default"];
-    var platform = __dependency5__.platform;
+    var o_defineProperty = __dependency5__.defineProperty;
     var keys = __dependency12__["default"];
     var ActionHandler = __dependency13__["default"];
     var defineProperty = __dependency14__.defineProperty;
@@ -32130,14 +33644,13 @@ define("ember-runtime/system/core_object",
     var ComputedProperty = __dependency16__.ComputedProperty;
     var run = __dependency17__["default"];
     var destroy = __dependency6__.destroy;
-
     var K = __dependency1__.K;
-    var o_defineProperty = platform.defineProperty;
+    var hasPropertyAccessors = __dependency5__.hasPropertyAccessors;
+
     var schedule = run.schedule;
     var applyMixin = Mixin._apply;
     var finishPartial = Mixin.finishPartial;
     var reopen = Mixin.prototype.reopen;
-    var MANDATORY_SETTER = Ember.ENV.MANDATORY_SETTER;
     var hasCachedComputedProperties = false;
 
     var undefinedDescriptor = {
@@ -32160,7 +33673,8 @@ define("ember-runtime/system/core_object",
       // method a lot faster. This is glue code so we want it to be as fast as
       // possible.
 
-      var wasApplied = false, initMixins, initProperties;
+      var wasApplied = false;
+      var initMixins, initProperties;
 
       var Class = function() {
         if (!wasApplied) {
@@ -32168,7 +33682,8 @@ define("ember-runtime/system/core_object",
         }
         o_defineProperty(this, GUID_KEY, nullDescriptor);
         o_defineProperty(this, '__nextSuper', undefinedDescriptor);
-        var m = meta(this), proto = m.proto;
+        var m = meta(this);
+        var proto = m.proto;
         m.proto = this;
         if (initMixins) {
           // capture locally so we can clear the closed over variable
@@ -32233,10 +33748,10 @@ define("ember-runtime/system/core_object",
               } else {
                 if (typeof this.setUnknownProperty === 'function' && !(keyName in this)) {
                   this.setUnknownProperty(keyName, value);
-                } else if (MANDATORY_SETTER) {
-                  defineProperty(this, keyName, null, value); // setup mandatory setter
                 } else {
-                  this[keyName] = value;
+                  
+                    this[keyName] = value;
+                  
                 }
               }
             }
@@ -32288,7 +33803,6 @@ define("ember-runtime/system/core_object",
     */
     var CoreObject = makeCtor();
     CoreObject.toString = function() { return "Ember.CoreObject"; };
-
     CoreObject.PrototypeMixin = Mixin.create({
       reopen: function() {
         var length = arguments.length;
@@ -32505,9 +34019,10 @@ define("ember-runtime/system/core_object",
         @return {String} string representation
       */
       toString: function toString() {
-        var hasToStringExtension = typeof this.toStringExtension === 'function',
-            extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
+        var hasToStringExtension = typeof this.toStringExtension === 'function';
+        var extension = hasToStringExtension ? ":" + this.toStringExtension() : '';
         var ret = '<'+this.constructor.toString()+':'+guidFor(this)+extension+'>';
+
         this.toString = makeToString(ret);
         return ret;
       }
@@ -32615,8 +34130,9 @@ define("ember-runtime/system/core_object",
         @param {Mixin} [mixins]* One or more Mixin classes
         @param {Object} [arguments]* Object containing values to use within the new class
       */
-      extend: function() {
-        var Class = makeCtor(), proto;
+      extend: function extend() {
+        var Class = makeCtor();
+        var proto;
         Class.ClassMixin = Mixin.create(this.ClassMixin);
         Class.PrototypeMixin = Mixin.create(this.PrototypeMixin);
 
@@ -32862,8 +34378,8 @@ define("ember-runtime/system/core_object",
         @param key {String} property name
       */
       metaForProperty: function(key) {
-        var meta = this.proto()[META_KEY],
-            desc = meta && meta.descs[key];
+        var meta = this.proto()['__ember_meta__'];
+        var desc = meta && meta.descs[key];
 
                 return desc._meta || {};
       },
@@ -32930,15 +34446,12 @@ define("ember-runtime/system/core_object",
             cache._computedProperties = undefined;
           }
         }
-
-        this._super();
       }
     });
 
-
     __exports__["default"] = CoreObject;
   });
-define("ember-runtime/system/deferred",
+enifed("ember-runtime/system/deferred",
   ["ember-metal/core","ember-runtime/mixins/deferred","ember-metal/property_get","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -32963,7 +34476,7 @@ define("ember-runtime/system/deferred",
 
     __exports__["default"] = Deferred;
   });
-define("ember-runtime/system/each_proxy",
+enifed("ember-runtime/system/each_proxy",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/enumerable_utils","ember-metal/array","ember-runtime/mixins/array","ember-runtime/system/object","ember-metal/computed","ember-metal/observer","ember-metal/events","ember-metal/properties","ember-metal/property_events","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
@@ -33021,7 +34534,8 @@ define("ember-runtime/system/each_proxy",
     var IS_OBSERVER = /^.+:(before|change)$/;
 
     function addObserverForContentKey(content, keyName, proxy, idx, loc) {
-      var objects = proxy._objects, guid;
+      var objects = proxy._objects;
+      var guid;
       if (!objects) objects = proxy._objects = {};
 
       while(--loc>=idx) {
@@ -33102,7 +34616,8 @@ define("ember-runtime/system/each_proxy",
       // Invokes whenever the content array itself changes.
 
       arrayWillChange: function(content, idx, removedCnt, addedCnt) {
-        var keys = this._keys, key, lim;
+        var keys = this._keys;
+        var key, lim;
 
         lim = removedCnt>0 ? idx+removedCnt : -1;
         beginPropertyChanges(this);
@@ -33120,7 +34635,8 @@ define("ember-runtime/system/each_proxy",
       },
 
       arrayDidChange: function(content, idx, removedCnt, addedCnt) {
-        var keys = this._keys, lim;
+        var keys = this._keys;
+        var lim;
 
         lim = addedCnt>0 ? idx+addedCnt : -1;
         changeProperties(function() {
@@ -33161,8 +34677,9 @@ define("ember-runtime/system/each_proxy",
         if (!keys) keys = this._keys = {};
         if (!keys[keyName]) {
           keys[keyName] = 1;
-          var content = this._content,
-              len = get(content, 'length');
+          var content = this._content;
+          var len = get(content, 'length');
+
           addObserverForContentKey(content, keyName, this, 0, len);
         } else {
           keys[keyName]++;
@@ -33172,8 +34689,9 @@ define("ember-runtime/system/each_proxy",
       stopObservingContentKey: function(keyName) {
         var keys = this._keys;
         if (keys && (keys[keyName]>0) && (--keys[keyName]<=0)) {
-          var content = this._content,
-              len     = get(content, 'length');
+          var content = this._content;
+          var len     = get(content, 'length');
+
           removeObserverForContentKey(content, keyName, this, 0, len);
         }
       },
@@ -33190,7 +34708,7 @@ define("ember-runtime/system/each_proxy",
     __exports__.EachArray = EachArray;
     __exports__.EachProxy = EachProxy;
   });
-define("ember-runtime/system/lazy_load",
+enifed("ember-runtime/system/lazy_load",
   ["ember-metal/core","ember-metal/array","ember-runtime/system/native_array","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -33264,7 +34782,7 @@ define("ember-runtime/system/lazy_load",
 
     __exports__.runLoadHooks = runLoadHooks;
   });
-define("ember-runtime/system/namespace",
+enifed("ember-runtime/system/namespace",
   ["ember-metal/core","ember-metal/property_get","ember-metal/array","ember-metal/utils","ember-metal/mixin","ember-runtime/system/object","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __exports__) {
     "use strict";
@@ -33309,7 +34827,7 @@ define("ember-runtime/system/namespace",
       },
 
       toString: function() {
-        var name = get(this, 'name');
+        var name = get(this, 'name') || get(this, 'modulePrefix');
         if (name) { return name; }
 
         findNamespaces();
@@ -33321,8 +34839,8 @@ define("ember-runtime/system/namespace",
       },
 
       destroy: function() {
-        var namespaces = Namespace.NAMESPACES,
-            toString = this.toString();
+        var namespaces = Namespace.NAMESPACES;
+        var toString = this.toString();
 
         if (toString) {
           Ember.lookup[toString] = undefined;
@@ -33401,7 +34919,8 @@ define("ember-runtime/system/namespace",
     }
 
     function findNamespaces() {
-      var lookup = Ember.lookup, obj, isNamespace;
+      var lookup = Ember.lookup;
+      var obj, isNamespace;
 
       if (Namespace.PROCESSED) { return; }
 
@@ -33458,8 +34977,8 @@ define("ember-runtime/system/namespace",
     }
 
     function processAllNamespaces() {
-      var unprocessedNamespaces = !Namespace.PROCESSED,
-          unprocessedMixins = Ember.anyUnprocessedMixins;
+      var unprocessedNamespaces = !Namespace.PROCESSED;
+      var unprocessedMixins = Ember.anyUnprocessedMixins;
 
       if (unprocessedNamespaces) {
         findNamespaces();
@@ -33467,7 +34986,9 @@ define("ember-runtime/system/namespace",
       }
 
       if (unprocessedNamespaces || unprocessedMixins) {
-        var namespaces = Namespace.NAMESPACES, namespace;
+        var namespaces = Namespace.NAMESPACES;
+        var namespace;
+
         for (var i=0, l=namespaces.length; i<l; i++) {
           namespace = namespaces[i];
           processNamespace([namespace.toString()], namespace, {});
@@ -33485,9 +35006,9 @@ define("ember-runtime/system/namespace",
 
     __exports__["default"] = Namespace;
   });
-define("ember-runtime/system/native_array",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+enifed("ember-runtime/system/native_array",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/enumerable_utils","ember-metal/mixin","ember-metal/array","ember-runtime/mixins/array","ember-runtime/mixins/mutable_array","ember-runtime/mixins/observable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-runtime/copy","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -33502,12 +35023,14 @@ define("ember-runtime/system/native_array",
     var replace = __dependency4__._replace;
     var forEach = __dependency4__.forEach;
     var Mixin = __dependency5__.Mixin;
-    var EmberArray = __dependency6__["default"];
-    var MutableArray = __dependency7__["default"];
-    var Observable = __dependency8__["default"];
-    var Copyable = __dependency9__["default"];
-    var FROZEN_ERROR = __dependency10__.FROZEN_ERROR;
-    var copy = __dependency11__["default"];
+    var indexOf = __dependency6__.indexOf;
+    var lastIndexOf = __dependency6__.lastIndexOf;
+    var EmberArray = __dependency7__["default"];
+    var MutableArray = __dependency8__["default"];
+    var Observable = __dependency9__["default"];
+    var Copyable = __dependency10__["default"];
+    var FROZEN_ERROR = __dependency11__.FROZEN_ERROR;
+    var copy = __dependency12__["default"];
 
     // Add Ember.Array to Array.prototype. Remove methods with native
     // implementations and supply some more optimized versions of generic methods
@@ -33565,39 +35088,15 @@ define("ember-runtime/system/native_array",
       // from member items.
       unknownProperty: function(key, value) {
         var ret;// = this.reducedProperty(key, value) ;
-        if ((value !== undefined) && ret === undefined) {
+        if (value !== undefined && ret === undefined) {
           ret = this[key] = value;
         }
-        return ret ;
+        return ret;
       },
 
-      // If browser did not implement indexOf natively, then override with
-      // specialized version
-      indexOf: function(object, startAt) {
-        var idx, len = this.length;
+      indexOf: indexOf,
 
-        if (startAt === undefined) startAt = 0;
-        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
-        if (startAt < 0) startAt += len;
-
-        for(idx=startAt;idx<len;idx++) {
-          if (this[idx] === object) return idx ;
-        }
-        return -1;
-      },
-
-      lastIndexOf: function(object, startAt) {
-        var idx, len = this.length;
-
-        if (startAt === undefined) startAt = len-1;
-        else startAt = (startAt < 0) ? Math.ceil(startAt) : Math.floor(startAt);
-        if (startAt < 0) startAt += len;
-
-        for(idx=startAt;idx>=0;idx--) {
-          if (this[idx] === object) return idx ;
-        }
-        return -1;
-      },
+      lastIndexOf: lastIndexOf,
 
       copy: function(deep) {
         if (deep) {
@@ -33614,7 +35113,7 @@ define("ember-runtime/system/native_array",
       if (Array.prototype[methodName]) ignore.push(methodName);
     });
 
-    if (ignore.length>0) {
+    if (ignore.length > 0) {
       NativeArray = NativeArray.without.apply(NativeArray, ignore);
     }
 
@@ -33685,7 +35184,7 @@ define("ember-runtime/system/native_array",
     __exports__.NativeArray = NativeArray;
     __exports__["default"] = NativeArray;
   });
-define("ember-runtime/system/object",
+enifed("ember-runtime/system/object",
   ["ember-runtime/system/core_object","ember-runtime/mixins/observable","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -33714,42 +35213,12 @@ define("ember-runtime/system/object",
 
     __exports__["default"] = EmberObject;
   });
-define("ember-runtime/system/object_proxy",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/observer","ember-metal/property_events","ember-metal/computed","ember-metal/properties","ember-metal/mixin","ember-runtime/system/string","ember-runtime/system/object","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __exports__) {
+enifed("ember-runtime/system/object_proxy",
+  ["ember-runtime/system/object","ember-runtime/mixins/-proxy","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    /**
-    @module ember
-    @submodule ember-runtime
-    */
-    var Ember = __dependency1__["default"];
-    // Ember.assert
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var meta = __dependency4__.meta;
-    var addObserver = __dependency5__.addObserver;
-    var removeObserver = __dependency5__.removeObserver;
-    var addBeforeObserver = __dependency5__.addBeforeObserver;
-    var removeBeforeObserver = __dependency5__.removeBeforeObserver;
-    var propertyWillChange = __dependency6__.propertyWillChange;
-    var propertyDidChange = __dependency6__.propertyDidChange;
-    var computed = __dependency7__.computed;
-    var defineProperty = __dependency8__.defineProperty;
-    var observer = __dependency9__.observer;
-    var fmt = __dependency10__.fmt;
-    var EmberObject = __dependency11__["default"];
-
-    function contentPropertyWillChange(content, contentKey) {
-      var key = contentKey.slice(8); // remove "content."
-      if (key in this) { return; }  // if shadowed in proxy
-      propertyWillChange(this, key);
-    }
-
-    function contentPropertyDidChange(content, contentKey) {
-      var key = contentKey.slice(8); // remove "content."
-      if (key in this) { return; } // if shadowed in proxy
-      propertyDidChange(this, key);
-    }
+    var EmberObject = __dependency1__["default"];
+    var _ProxyMixin = __dependency2__["default"];
 
     /**
       `Ember.ObjectProxy` forwards all properties not defined by the proxy itself
@@ -33817,60 +35286,12 @@ define("ember-runtime/system/object_proxy",
       @class ObjectProxy
       @namespace Ember
       @extends Ember.Object
+      @extends Ember._ProxyMixin
     */
-    var ObjectProxy = EmberObject.extend({
-      /**
-        The object whose properties will be forwarded.
 
-        @property content
-        @type Ember.Object
-        @default null
-      */
-      content: null,
-      _contentDidChange: observer('content', function() {
-              }),
-
-      isTruthy: computed.bool('content'),
-
-      _debugContainerKey: null,
-
-      willWatchProperty: function (key) {
-        var contentKey = 'content.' + key;
-        addBeforeObserver(this, contentKey, null, contentPropertyWillChange);
-        addObserver(this, contentKey, null, contentPropertyDidChange);
-      },
-
-      didUnwatchProperty: function (key) {
-        var contentKey = 'content.' + key;
-        removeBeforeObserver(this, contentKey, null, contentPropertyWillChange);
-        removeObserver(this, contentKey, null, contentPropertyDidChange);
-      },
-
-      unknownProperty: function (key) {
-        var content = get(this, 'content');
-        if (content) {
-          return get(content, key);
-        }
-      },
-
-      setUnknownProperty: function (key, value) {
-        var m = meta(this);
-        if (m.proto === this) {
-          // if marked as prototype then just defineProperty
-          // rather than delegate
-          defineProperty(this, key, null, value);
-          return value;
-        }
-
-        var content = get(this, 'content');
-                return set(content, key, value);
-      }
-
-    });
-
-    __exports__["default"] = ObjectProxy;
+    __exports__["default"] = EmberObject.extend(_ProxyMixin);
   });
-define("ember-runtime/system/set",
+enifed("ember-runtime/system/set",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/utils","ember-metal/is_none","ember-runtime/system/string","ember-runtime/system/core_object","ember-runtime/mixins/mutable_enumerable","ember-runtime/mixins/enumerable","ember-runtime/mixins/copyable","ember-runtime/mixins/freezable","ember-metal/error","ember-metal/property_events","ember-metal/mixin","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
@@ -33879,7 +35300,7 @@ define("ember-runtime/system/set",
     @submodule ember-runtime
     */
     var Ember = __dependency1__["default"];
-    // Ember.isNone
+    // Ember.isNone, Ember.A
 
     var get = __dependency2__.get;
     var set = __dependency3__.set;
@@ -34231,7 +35652,7 @@ define("ember-runtime/system/set",
       //
 
       init: function(items) {
-        this._super();
+                this._super();
         if (items) this.addObjects(items);
       },
 
@@ -34255,10 +35676,10 @@ define("ember-runtime/system/set",
         if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
         if (isNone(obj)) return this; // nothing to do
 
-        var guid = guidFor(obj),
-            idx  = this[guid],
-            len  = get(this, 'length'),
-            added ;
+        var guid = guidFor(obj);
+        var idx  = this[guid];
+        var len  = get(this, 'length');
+        var added;
 
         if (idx>=0 && idx<len && (this[idx] === obj)) return this; // added
 
@@ -34283,12 +35704,12 @@ define("ember-runtime/system/set",
         if (get(this, 'isFrozen')) throw new EmberError(FROZEN_ERROR);
         if (isNone(obj)) return this; // nothing to do
 
-        var guid = guidFor(obj),
-            idx  = this[guid],
-            len = get(this, 'length'),
-            isFirst = idx === 0,
-            isLast = idx === len-1,
-            last, removed;
+        var guid = guidFor(obj);
+        var idx  = this[guid];
+        var len = get(this, 'length');
+        var isFirst = idx === 0;
+        var isLast = idx === len-1;
+        var last, removed;
 
 
         if (idx>=0 && idx<len && (this[idx] === obj)) {
@@ -34341,9 +35762,9 @@ define("ember-runtime/system/set",
       }
     });
   });
-define("ember-runtime/system/string",
-  ["ember-metal/core","ember-metal/utils","exports"],
-  function(__dependency1__, __dependency2__, __exports__) {
+enifed("ember-runtime/system/string",
+  ["ember-metal/core","ember-metal/utils","ember-metal/cache","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -34354,23 +35775,68 @@ define("ember-runtime/system/string",
     var isArray = __dependency2__.isArray;
     var emberInspect = __dependency2__.inspect;
 
+    var Cache = __dependency3__["default"];
+
     var STRING_DASHERIZE_REGEXP = (/[ _]/g);
-    var STRING_DASHERIZE_CACHE = {};
+
+    var STRING_DASHERIZE_CACHE = new Cache(1000, function(key) {
+      return decamelize(key).replace(STRING_DASHERIZE_REGEXP, '-');
+    });
+
+    var CAMELIZE_CACHE = new Cache(1000, function(key) {
+      return key.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
+        return chr ? chr.toUpperCase() : '';
+      }).replace(/^([A-Z])/, function(match, separator, chr) {
+        return match.toLowerCase();
+      });
+    });
+
+    var CLASSIFY_CACHE = new Cache(1000, function(str) {
+      var parts = str.split(".");
+      var out = [];
+
+      for (var i=0, l=parts.length; i<l; i++) {
+        var camelized = camelize(parts[i]);
+        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
+      }
+
+      return out.join(".");
+    });
+
+    var UNDERSCORE_CACHE = new Cache(1000, function(str) {
+      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
+        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
+    });
+
+    var CAPITALIZE_CACHE = new Cache(1000, function(str) {
+      return str.charAt(0).toUpperCase() + str.substr(1);
+    });
+
+    var DECAMELIZE_CACHE = new Cache(1000, function(str) {
+      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
+    });
+
     var STRING_DECAMELIZE_REGEXP = (/([a-z\d])([A-Z])/g);
     var STRING_CAMELIZE_REGEXP = (/(\-|_|\.|\s)+(.)?/g);
     var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
     var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
 
     function fmt(str, formats) {
-      if (!isArray(formats) || arguments.length > 2) {
-        formats = Array.prototype.slice.call(arguments, 1);
+      var cachedFormats = formats;
+
+      if (!isArray(cachedFormats) || arguments.length > 2) {
+        cachedFormats = new Array(arguments.length - 1);
+
+        for (var i = 1, l = arguments.length; i < l; i++) {
+          cachedFormats[i - 1] = arguments[i];
+        }
       }
 
       // first, replace any ORDERED replacements.
       var idx  = 0; // the current index for non-numerical replacements
       return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
         argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++;
-        s = formats[argIndex];
+        s = cachedFormats[argIndex];
         return (s === null) ? '(null)' : (s === undefined) ? '' : emberInspect(s);
       });
     }
@@ -34389,51 +35855,27 @@ define("ember-runtime/system/string",
     }
 
     function decamelize(str) {
-      return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
+      return DECAMELIZE_CACHE.get(str);
     }
 
     function dasherize(str) {
-      var cache = STRING_DASHERIZE_CACHE,
-          hit   = cache.hasOwnProperty(str),
-          ret;
-
-      if (hit) {
-        return cache[str];
-      } else {
-        ret = decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
-        cache[str] = ret;
-      }
-
-      return ret;
+      return STRING_DASHERIZE_CACHE.get(str);
     }
 
     function camelize(str) {
-      return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
-        return chr ? chr.toUpperCase() : '';
-      }).replace(/^([A-Z])/, function(match, separator, chr) {
-        return match.toLowerCase();
-      });
+      return CAMELIZE_CACHE.get(str);
     }
 
     function classify(str) {
-      var parts = str.split("."),
-          out = [];
-
-      for (var i=0, l=parts.length; i<l; i++) {
-        var camelized = camelize(parts[i]);
-        out.push(camelized.charAt(0).toUpperCase() + camelized.substr(1));
-      }
-
-      return out.join(".");
+      return CLASSIFY_CACHE.get(str);
     }
 
     function underscore(str) {
-      return str.replace(STRING_UNDERSCORE_REGEXP_1, '$1_$2').
-        replace(STRING_UNDERSCORE_REGEXP_2, '_').toLowerCase();
+      return UNDERSCORE_CACHE.get(str);
     }
 
     function capitalize(str) {
-      return str.charAt(0).toUpperCase() + str.substr(1);
+      return CAPITALIZE_CACHE.get(str);
     }
 
     /**
@@ -34635,7 +36077,7 @@ define("ember-runtime/system/string",
     __exports__.underscore = underscore;
     __exports__.capitalize = capitalize;
   });
-define("ember-runtime/system/subarray",
+enifed("ember-runtime/system/subarray",
   ["ember-metal/property_get","ember-metal/error","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -34678,15 +36120,15 @@ define("ember-runtime/system/subarray",
 
         @method addItem
 
-        @param {number} index The index of the item in the tracked array.
-        @param {boolean} match `true` iff the item is included in the subarray.
+        @param {Number} index The index of the item in the tracked array.
+        @param {Boolean} match `true` iff the item is included in the subarray.
 
         @return {number} The index of the item in the subarray.
       */
       addItem: function(index, match) {
-        var returnValue = -1,
-            itemType = match ? RETAIN : FILTER,
-            self = this;
+        var returnValue = -1;
+        var itemType = match ? RETAIN : FILTER;
+        var self = this;
 
         this._findOperation(index, function(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
           var newOperation, splitOperation;
@@ -34731,14 +36173,14 @@ define("ember-runtime/system/subarray",
 
         @method removeItem
 
-        @param {number} index The index of the item in the tracked array.
+        @param {Number} index The index of the item in the tracked array.
 
         @return {number} The index of the item in the subarray, or `-1` if the item
         was not in the subarray.
       */
       removeItem: function(index) {
-        var returnValue = -1,
-            self = this;
+        var returnValue = -1;
+        var self = this;
 
         this._findOperation(index, function (operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
           if (operation.type === RETAIN) {
@@ -34760,12 +36202,8 @@ define("ember-runtime/system/subarray",
 
 
       _findOperation: function (index, foundCallback, notFoundCallback) {
-        var operationIndex,
-            len,
-            operation,
-            rangeStart,
-            rangeEnd,
-            seenInSubArray = 0;
+        var seenInSubArray = 0;
+        var operationIndex, len, operation, rangeStart, rangeEnd;
 
         // OPTIMIZE: change to balanced tree
         // find leftmost operation to the right of `index`
@@ -34785,8 +36223,8 @@ define("ember-runtime/system/subarray",
       },
 
       _composeAt: function(index) {
-        var op = this._operations[index],
-            otherOp;
+        var op = this._operations[index];
+        var otherOp;
 
         if (!op) {
           // Composing out of bounds is a no-op, as when removing the last operation
@@ -34821,7 +36259,7 @@ define("ember-runtime/system/subarray",
       }
     };
   });
-define("ember-runtime/system/tracked_array",
+enifed("ember-runtime/system/tracked_array",
   ["ember-metal/property_get","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -34841,7 +36279,7 @@ define("ember-runtime/system/tracked_array",
 
       @class TrackedArray
       @namespace Ember
-      @param {array} [items=[]] The array to be tracked.  This is used just to get
+      @param {Array} [items=[]] The array to be tracked.  This is used just to get
       the initial items for the starting state of retain:n.
     */
     function TrackedArray(items) {
@@ -34873,15 +36311,11 @@ define("ember-runtime/system/tracked_array",
         var count = get(newItems, 'length');
         if (count < 1) { return; }
 
-        var match = this._findArrayOperation(index),
-            arrayOperation = match.operation,
-            arrayOperationIndex = match.index,
-            arrayOperationRangeStart = match.rangeStart,
-            composeIndex,
-            splitIndex,
-            splitItems,
-            splitArrayOperation,
-            newArrayOperation;
+        var match = this._findArrayOperation(index);
+        var arrayOperation = match.operation;
+        var arrayOperationIndex = match.index;
+        var arrayOperationRangeStart = match.rangeStart;
+        var composeIndex, splitIndex, splitItems, splitArrayOperation, newArrayOperation;
 
         newArrayOperation = new ArrayOperation(INSERT, count, newItems);
 
@@ -34913,12 +36347,11 @@ define("ember-runtime/system/tracked_array",
       removeItems: function (index, count) {
         if (count < 1) { return; }
 
-        var match = this._findArrayOperation(index),
-            arrayOperation = match.operation,
-            arrayOperationIndex = match.index,
-            arrayOperationRangeStart = match.rangeStart,
-            newArrayOperation,
-            composeIndex;
+        var match = this._findArrayOperation(index);
+        var arrayOperation = match.operation;
+        var arrayOperationIndex = match.index;
+        var arrayOperationRangeStart = match.rangeStart;
+        var newArrayOperation, composeIndex;
 
         newArrayOperation = new ArrayOperation(DELETE, count);
         if (!match.split) {
@@ -34946,11 +36379,11 @@ define("ember-runtime/system/tracked_array",
         `Ember.TrackedArray.{RETAIN, DELETE, INSERT}`
 
         @method apply
-        @param {function} callback
+        @param {Function} callback
       */
       apply: function (callback) {
-        var items = [],
-            offset = 0;
+        var items = [];
+        var offset = 0;
 
         forEach(this._operations, function (arrayOperation, operationIndex) {
           callback(arrayOperation.items, offset, arrayOperation.type, operationIndex);
@@ -34969,17 +36402,15 @@ define("ember-runtime/system/tracked_array",
 
         @method _findArrayOperation
 
-        @param {number} index the index of the item whose operation information
+        @param {Number} index the index of the item whose operation information
         should be returned.
         @private
       */
       _findArrayOperation: function (index) {
-        var arrayOperationIndex,
-            len,
-            split = false,
-            arrayOperation,
-            arrayOperationRangeStart,
-            arrayOperationRangeEnd;
+        var split = false;
+        var arrayOperationIndex, arrayOperation,
+            arrayOperationRangeStart, arrayOperationRangeEnd,
+            len;
 
         // OPTIMIZE: we could search these faster if we kept a balanced tree.
         // find leftmost arrayOperation to the right of `index`
@@ -35017,11 +36448,11 @@ define("ember-runtime/system/tracked_array",
 
       // see SubArray for a better implementation.
       _composeInsert: function (index) {
-        var newArrayOperation = this._operations[index],
-            leftArrayOperation = this._operations[index-1], // may be undefined
-            rightArrayOperation = this._operations[index+1], // may be undefined
-            leftOp = leftArrayOperation && leftArrayOperation.type,
-            rightOp = rightArrayOperation && rightArrayOperation.type;
+        var newArrayOperation = this._operations[index];
+        var leftArrayOperation = this._operations[index-1]; // may be undefined
+        var rightArrayOperation = this._operations[index+1]; // may be undefined
+        var leftOp = leftArrayOperation && leftArrayOperation.type;
+        var rightOp = rightArrayOperation && rightArrayOperation.type;
 
         if (leftOp === INSERT) {
             // merge left
@@ -35046,15 +36477,15 @@ define("ember-runtime/system/tracked_array",
       },
 
       _composeDelete: function (index) {
-        var arrayOperation = this._operations[index],
-            deletesToGo = arrayOperation.count,
-            leftArrayOperation = this._operations[index-1], // may be undefined
-            leftOp = leftArrayOperation && leftArrayOperation.type,
-            nextArrayOperation,
-            nextOp,
-            nextCount,
-            removeNewAndNextOp = false,
-            removedItems = [];
+        var arrayOperation = this._operations[index];
+        var deletesToGo = arrayOperation.count;
+        var leftArrayOperation = this._operations[index-1]; // may be undefined
+        var leftOp = leftArrayOperation && leftArrayOperation.type;
+        var nextArrayOperation;
+        var nextOp;
+        var nextCount;
+        var removeNewAndNextOp = false;
+        var removedItems = [];
 
         if (leftOp === DELETE) {
           arrayOperation = leftArrayOperation;
@@ -35127,10 +36558,10 @@ define("ember-runtime/system/tracked_array",
 
       @method ArrayOperation
       @private
-      @param {string} type The type of the operation.  One of
+      @param {String} type The type of the operation.  One of
       `Ember.TrackedArray.{RETAIN, INSERT, DELETE}`
-      @param {number} count The number of items in this operation.
-      @param {array} items The items of the operation, if included.  RETAIN and
+      @param {Number} count The number of items in this operation.
+      @param {Array} items The items of the operation, if included.  RETAIN and
       INSERT include their items, DELETE does not.
     */
     function ArrayOperation (operation, count, items) {
@@ -35146,10 +36577,10 @@ define("ember-runtime/system/tracked_array",
       @method ArrayOperationMatch
       @private
       @param {ArrayOperation} operation
-      @param {number} index The index of `operation` in the array of operations.
-      @param {boolean} split Whether or not the item index searched for would
+      @param {Number} index The index of `operation` in the array of operations.
+      @param {Boolean} split Whether or not the item index searched for would
       require a split for a new operation type.
-      @param {number} rangeStart The index of the first item in the operation,
+      @param {Number} rangeStart The index of the first item in the operation,
       with respect to the tracked array.  The index of the last item can be computed
       from `rangeStart` and `operation.count`.
     */
@@ -35160,9 +36591,9 @@ define("ember-runtime/system/tracked_array",
       this.rangeStart = rangeStart;
     }
   });
-define("ember-views",
-  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/core_view","ember-views/views/view","ember-views/views/view_collection","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __exports__) {
+enifed("ember-views",
+  ["ember-runtime","ember-views/system/jquery","ember-views/system/utils","ember-views/system/render_buffer","ember-views/system/ext","ember-views/views/states","ember-views/views/core_view","ember-views/views/view","ember-views/views/container_view","ember-views/views/collection_view","ember-views/views/component","ember-views/system/event_dispatcher","ember-views/mixins/view_target_action_support","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
     /**
     Ember Views
@@ -35176,7 +36607,6 @@ define("ember-views",
     // BEGIN IMPORTS
     var Ember = __dependency1__["default"];
     var jQuery = __dependency2__["default"];
-    var setInnerHTML = __dependency3__.setInnerHTML;
     var isSimpleClick = __dependency3__.isSimpleClick;
     var RenderBuffer = __dependency4__["default"];
      // for the side effect of extending Ember.run.queues
@@ -35185,13 +36615,12 @@ define("ember-views",
 
     var CoreView = __dependency7__["default"];
     var View = __dependency8__["default"];
-    var ViewCollection = __dependency9__["default"];
-    var ContainerView = __dependency10__["default"];
-    var CollectionView = __dependency11__["default"];
-    var Component = __dependency12__["default"];
+    var ContainerView = __dependency9__["default"];
+    var CollectionView = __dependency10__["default"];
+    var Component = __dependency11__["default"];
 
-    var EventDispatcher = __dependency13__["default"];
-    var ViewTargetActionSupport = __dependency14__["default"];
+    var EventDispatcher = __dependency12__["default"];
+    var ViewTargetActionSupport = __dependency13__["default"];
     // END IMPORTS
 
     /**
@@ -35208,7 +36637,6 @@ define("ember-views",
     Ember.RenderBuffer = RenderBuffer;
 
     var ViewUtils = Ember.ViewUtils = {};
-    ViewUtils.setInnerHTML = setInnerHTML;
     ViewUtils.isSimpleClick = isSimpleClick;
 
     Ember.CoreView = CoreView;
@@ -35216,7 +36644,6 @@ define("ember-views",
     Ember.View.states = states;
     Ember.View.cloneStates = cloneStates;
 
-    Ember._ViewCollection = ViewCollection;
     Ember.ContainerView = ContainerView;
     Ember.CollectionView = CollectionView;
     Ember.Component = Component;
@@ -35225,7 +36652,7 @@ define("ember-views",
 
     __exports__["default"] = Ember;
   });
-define("ember-views/mixins/component_template_deprecation",
+enifed("ember-views/mixins/component_template_deprecation",
   ["ember-metal/core","ember-metal/property_get","ember-metal/mixin","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -35268,8 +36695,8 @@ define("ember-views/mixins/component_template_deprecation",
         // there is another Mixin loaded first.
         this._super.apply(this, arguments);
 
-        var deprecatedProperty, replacementProperty,
-            layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
+        var deprecatedProperty, replacementProperty;
+        var layoutSpecified = (props.layoutName || props.layout || get(this, 'layoutName'));
 
         if (props.templateName && !layoutSpecified) {
           deprecatedProperty = 'templateName';
@@ -35292,7 +36719,7 @@ define("ember-views/mixins/component_template_deprecation",
       }
     });
   });
-define("ember-views/mixins/view_target_action_support",
+enifed("ember-views/mixins/view_target_action_support",
   ["ember-metal/mixin","ember-runtime/mixins/target_action_support","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -35355,9 +36782,31 @@ define("ember-views/mixins/view_target_action_support",
       actionContext: alias('context')
     });
   });
-define("ember-views/system/event_dispatcher",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/views/view","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
+enifed("ember-views/system/action_manager",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    /**
+    @module ember
+    @submodule ember-views
+    */
+
+    function ActionManager() {}
+
+    /**
+      Global action id hash.
+
+      @private
+      @property registeredActions
+      @type Object
+    */
+    ActionManager.registeredActions = {};
+
+    __exports__["default"] = ActionManager;
+  });
+enifed("ember-views/system/event_dispatcher",
+  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/run_loop","ember-metal/utils","ember-runtime/system/string","ember-runtime/system/object","ember-views/system/jquery","ember-views/system/action_manager","ember-views/views/view","ember-metal/merge","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
     "use strict";
     /**
     @module ember
@@ -35374,9 +36823,9 @@ define("ember-views/system/event_dispatcher",
     var fmt = __dependency7__.fmt;
     var EmberObject = __dependency8__["default"];
     var jQuery = __dependency9__["default"];
-    var View = __dependency10__["default"];
-
-    var ActionHelper;
+    var ActionManager = __dependency10__["default"];
+    var View = __dependency11__["default"];
+    var merge = __dependency12__["default"];
 
     //ES6TODO:
     // find a better way to do Ember.View.views without global state
@@ -35495,7 +36944,7 @@ define("ember-views/system/event_dispatcher",
       setup: function(addedEvents, rootElement) {
         var event, events = get(this, 'events');
 
-        jQuery.extend(events, addedEvents || {});
+        merge(events, addedEvents || {});
 
         if (!isNone(rootElement)) {
           set(this, 'rootElement', rootElement);
@@ -35532,8 +36981,8 @@ define("ember-views/system/event_dispatcher",
         var self = this;
 
         rootElement.on(event + '.ember', '.ember-view', function(evt, triggeringManager) {
-          var view = View.views[this.id],
-              result = true;
+          var view = View.views[this.id];
+          var result = true;
 
           var manager = self.canDispatchToEventManager ? self._findNearestEventManager(view, eventName) : null;
 
@@ -35547,11 +36996,8 @@ define("ember-views/system/event_dispatcher",
         });
 
         rootElement.on(event + '.ember', '[data-ember-action]', function(evt) {
-          //ES6TODO: Needed for ActionHelper (generally not available in ember-views test suite)
-          if (!ActionHelper) { ActionHelper = requireModule("ember-routing-handlebars/helpers/action")["ActionHelper"]; }
-
-          var actionId = jQuery(evt.currentTarget).attr('data-ember-action'),
-              action   = ActionHelper.registeredActions[actionId];
+          var actionId = jQuery(evt.currentTarget).attr('data-ember-action');
+          var action   = ActionManager.registeredActions[actionId];
 
           // We have to check for action here since in some cases, jQuery will trigger
           // an event on `removeChild` (i.e. focusout) after we've already torn down the
@@ -35602,11 +37048,11 @@ define("ember-views/system/event_dispatcher",
       },
 
       toString: function() {
-        return '(EventDisptacher)';
+        return '(EventDispatcher)';
       }
     });
   });
-define("ember-views/system/ext",
+enifed("ember-views/system/ext",
   ["ember-metal/run_loop"],
   function(__dependency1__) {
     "use strict";
@@ -35624,7 +37070,7 @@ define("ember-views/system/ext",
     run._addQueue('render', 'actions');
     run._addQueue('afterRender', 'render');
   });
-define("ember-views/system/jquery",
+enifed("ember-views/system/jquery",
   ["ember-metal/core","ember-runtime/system/string","ember-metal/enumerable_utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -35645,8 +37091,8 @@ define("ember-views/system/jquery",
     */
 
     var jQuery = (Ember.imports && Ember.imports.jQuery) || (this && this.jQuery);
-    if (!jQuery && typeof require === 'function') {
-      jQuery = require('jquery');
+    if (!jQuery && typeof eriuqer === 'function') {
+      jQuery = eriuqer('jquery');
     }
 
     
@@ -35667,31 +37113,74 @@ define("ember-views/system/jquery",
 
     __exports__["default"] = jQuery;
   });
-define("ember-views/system/render_buffer",
-  ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-views/system/utils","ember-views/system/jquery","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
+enifed("ember-views/system/render_buffer",
+  ["ember-views/system/jquery","morph","ember-metal/core","ember-metal/platform","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
     /**
     @module ember
     @submodule ember-views
     */
 
-    var Ember = __dependency1__["default"];
-    // jQuery
+    var jQuery = __dependency1__["default"];
+    var DOMHelper = __dependency2__.DOMHelper;
+    var Ember = __dependency3__["default"];
+    var create = __dependency4__.create;
 
-    var get = __dependency2__.get;
-    var set = __dependency3__.set;
-    var setInnerHTML = __dependency4__.setInnerHTML;
-    var jQuery = __dependency5__["default"];
+    // The HTML spec allows for "omitted start tags". These tags are optional
+    // when their intended child is the first thing in the parent tag. For
+    // example, this is a tbody start tag:
+    //
+    // <table>
+    //   <tbody>
+    //     <tr>
+    //
+    // The tbody may be omitted, and the browser will accept and render:
+    //
+    // <table>
+    //   <tr>
+    //
+    // However, the omitted start tag will still be added to the DOM. Here
+    // we test the string and context to see if the browser is about to
+    // perform this cleanup, but with a special allowance for disregarding
+    // <script tags. This disregarding of <script being the first child item
+    // may bend the offical spec a bit, and is only needed for Handlebars
+    // templates.
+    //
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
+    // describes which tags are omittable. The spec for tbody and colgroup
+    // explains this behavior:
+    //
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
+    //
+    var omittedStartTagChildren = {
+      tr: document.createElement('tbody'),
+      col: document.createElement('colgroup')
+    };
+
+    var omittedStartTagChildTest = /(?:<script)*.*?<([\w:]+)/i;
+
+    function detectOmittedStartTag(string, contextualElement){
+      // Omitted start tags are only inside table tags.
+      if (contextualElement.tagName === 'TABLE') {
+        var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
+        if (omittedStartTagChildMatch) {
+          // It is already asserted that the contextual element is a table
+          // and not the proper start tag. Just look up the start tag.
+          return omittedStartTagChildren[omittedStartTagChildMatch[1].toLowerCase()];
+        }
+      }
+    }
 
     function ClassSet() {
-      this.seen = {};
+      this.seen = create(null);
       this.list = [];
     }
 
     ClassSet.prototype = {
       add: function(string) {
-        if (string in this.seen) { return; }
+        if (this.seen[string] === true) { return; }
         this.seen[string] = true;
 
         this.list.push(string);
@@ -35745,8 +37234,8 @@ define("ember-views/system/render_buffer",
     // From http://msdn.microsoft.com/en-us/library/ie/ms536389(v=vs.85).aspx:
     // "To include the NAME attribute at run time on objects created with the createElement method, use the eTag."
     var canSetNameOnInputs = (function() {
-      var div = document.createElement('div'),
-          el = document.createElement('input');
+      var div = document.createElement('div');
+      var el = document.createElement('input');
 
       el.setAttribute('name', 'foo');
       div.appendChild(el);
@@ -35755,34 +37244,51 @@ define("ember-views/system/render_buffer",
     })();
 
     /**
-      `Ember.RenderBuffer` gathers information regarding the view and generates the
-      final representation. `Ember.RenderBuffer` will generate HTML which can be pushed
+      `Ember.renderBuffer` gathers information regarding the view and generates the
+      final representation. `Ember.renderBuffer` will generate HTML which can be pushed
       to the DOM.
 
        ```javascript
-       var buffer = Ember.RenderBuffer('div');
+       var buffer = Ember.renderBuffer('div', contextualElement);
       ```
 
-      @class RenderBuffer
+      @method renderBuffer
       @namespace Ember
-      @constructor
       @param {String} tagName tag name (such as 'div' or 'p') used for the buffer
     */
-    __exports__["default"] = function RenderBuffer(tagName) {
-      return new _RenderBuffer(tagName); // jshint ignore:line
+    __exports__["default"] = function renderBuffer(tagName, contextualElement) {
+      return new _RenderBuffer(tagName, contextualElement); // jshint ignore:line
     }
 
-    function _RenderBuffer(tagName) {
-      this.tagNames = [tagName || null];
-      this.buffer = "";
+    function _RenderBuffer(tagName, contextualElement) {
+      this.tagName = tagName;
+      this._outerContextualElement = contextualElement;
+      this.buffer = null;
+      this.childViews = [];
+      this.dom = new DOMHelper();
     }
 
     _RenderBuffer.prototype = {
 
+      reset: function(tagName, contextualElement) {
+        this.tagName = tagName;
+        this.buffer = null;
+        this._element = null;
+        this._outerContextualElement = contextualElement;
+        this.elementClasses = null;
+        this.elementId = null;
+        this.elementAttributes = null;
+        this.elementProperties = null;
+        this.elementTag = null;
+        this.elementStyle = null;
+        this.childViews.length = 0;
+      },
+
       // The root view's element
       _element: null,
 
-      _hasElement: true,
+      // The root view's contextualElement
+      _outerContextualElement: null,
 
       /**
         An internal set used to de-dupe class names when `addClass()` is
@@ -35857,7 +37363,7 @@ define("ember-views/system/render_buffer",
         example, if you wanted to create a `p` tag, then you would call
 
         ```javascript
-        Ember.RenderBuffer('p')
+        Ember.RenderBuffer('p', contextualElement)
         ```
 
         @property elementTag
@@ -35881,6 +37387,31 @@ define("ember-views/system/render_buffer",
       */
       elementStyle: null,
 
+      pushChildView: function (view) {
+        var index = this.childViews.length;
+        this.childViews[index] = view;
+        this.push("<script id='morph-"+index+"' type='text/x-placeholder'>\x3C/script>");
+      },
+
+      hydrateMorphs: function (contextualElement) {
+        var childViews = this.childViews;
+        var el = this._element;
+        for (var i=0,l=childViews.length; i<l; i++) {
+          var childView = childViews[i];
+          var ref = el.querySelector('#morph-'+i);
+
+          
+          var parent = ref.parentNode;
+
+          childView._morph = this.dom.insertMorphBefore(
+            parent,
+            ref,
+            parent.nodeType === 1 ? parent : contextualElement
+          );
+          parent.removeChild(ref);
+        }
+      },
+
       /**
         Adds a string of HTML to the `RenderBuffer`.
 
@@ -35888,8 +37419,11 @@ define("ember-views/system/render_buffer",
         @param {String} string HTML to push into the buffer
         @chainable
       */
-      push: function(string) {
-        this.buffer += string;
+      push: function(content) {
+        if (this.buffer === null) {
+          this.buffer = '';
+        }
+        this.buffer += content;
         return this;
       },
 
@@ -35911,7 +37445,8 @@ define("ember-views/system/render_buffer",
 
       setClasses: function(classNames) {
         this.elementClasses = null;
-        var len = classNames.length, i;
+        var len = classNames.length;
+        var i;
         for (i = 0; i < len; i++) {
           this.addClass(classNames[i]);
         }
@@ -36017,102 +37552,15 @@ define("ember-views/system/render_buffer",
         return this;
       },
 
-      begin: function(tagName) {
-        this.tagNames.push(tagName || null);
-        return this;
-      },
-
-      pushOpeningTag: function() {
-        var tagName = this.currentTagName();
-        if (!tagName) { return; }
-
-        if (this._hasElement && !this._element && this.buffer.length === 0) {
-          this._element = this.generateElement();
-          return;
-        }
-
-        var buffer = this.buffer,
-            id = this.elementId,
-            classes = this.classes,
-            attrs = this.elementAttributes,
-            props = this.elementProperties,
-            style = this.elementStyle,
-            attr, prop;
-
-        buffer += '<' + stripTagName(tagName);
-
-        if (id) {
-          buffer += ' id="' + escapeAttribute(id) + '"';
-          this.elementId = null;
-        }
-        if (classes) {
-          buffer += ' class="' + escapeAttribute(classes.join(' ')) + '"';
-          this.classes = null;
-          this.elementClasses = null;
-        }
-
-        if (style) {
-          buffer += ' style="';
-
-          for (prop in style) {
-            if (style.hasOwnProperty(prop)) {
-              buffer += prop + ':' + escapeAttribute(style[prop]) + ';';
-            }
-          }
-
-          buffer += '"';
-
-          this.elementStyle = null;
-        }
-
-        if (attrs) {
-          for (attr in attrs) {
-            if (attrs.hasOwnProperty(attr)) {
-              buffer += ' ' + attr + '="' + escapeAttribute(attrs[attr]) + '"';
-            }
-          }
-
-          this.elementAttributes = null;
-        }
-
-        if (props) {
-          for (prop in props) {
-            if (props.hasOwnProperty(prop)) {
-              var value = props[prop];
-              if (value || typeof(value) === 'number') {
-                if (value === true) {
-                  buffer += ' ' + prop + '="' + prop + '"';
-                } else {
-                  buffer += ' ' + prop + '="' + escapeAttribute(props[prop]) + '"';
-                }
-              }
-            }
-          }
-
-          this.elementProperties = null;
-        }
-
-        buffer += '>';
-        this.buffer = buffer;
-      },
-
-      pushClosingTag: function() {
-        var tagName = this.tagNames.pop();
-        if (tagName) { this.buffer += '</' + stripTagName(tagName) + '>'; }
-      },
-
-      currentTagName: function() {
-        return this.tagNames[this.tagNames.length-1];
-      },
-
       generateElement: function() {
-        var tagName = this.tagNames.pop(), // pop since we don't need to close
-            id = this.elementId,
-            classes = this.classes,
-            attrs = this.elementAttributes,
-            props = this.elementProperties,
-            style = this.elementStyle,
-            styleBuffer = '', attr, prop, tagString;
+        var tagName = this.tagName;
+        var id = this.elementId;
+        var classes = this.classes;
+        var attrs = this.elementAttributes;
+        var props = this.elementProperties;
+        var style = this.elementStyle;
+        var styleBuffer = '';
+        var attr, prop, tagString;
 
         if (attrs && attrs.name && !canSetNameOnInputs) {
           // IE allows passing a tag to createElement. See note on `canSetNameOnInputs` above as well.
@@ -36121,15 +37569,15 @@ define("ember-views/system/render_buffer",
           tagString = tagName;
         }
 
-        var element = document.createElement(tagString),
-            $element = jQuery(element);
+        var element = this.dom.createElement(tagString, this.outerContextualElement());
+        var $element = jQuery(element);
 
         if (id) {
-          $element.attr('id', id);
+          this.dom.setAttribute(element, 'id', id);
           this.elementId = null;
         }
         if (classes) {
-          $element.attr('class', classes.join(' '));
+          this.dom.setAttribute(element, 'class', classes.join(' '));
           this.classes = null;
           this.elementClasses = null;
         }
@@ -36141,7 +37589,7 @@ define("ember-views/system/render_buffer",
             }
           }
 
-          $element.attr('style', styleBuffer);
+          this.dom.setAttribute(element, 'style', styleBuffer);
 
           this.elementStyle = null;
         }
@@ -36149,7 +37597,7 @@ define("ember-views/system/render_buffer",
         if (attrs) {
           for (attr in attrs) {
             if (attrs.hasOwnProperty(attr)) {
-              $element.attr(attr, attrs[attr]);
+              this.dom.setAttribute(element, attr, attrs[attr]);
             }
           }
 
@@ -36166,7 +37614,7 @@ define("ember-views/system/render_buffer",
           this.elementProperties = null;
         }
 
-        return element;
+        this._element = element;
       },
 
       /**
@@ -36175,12 +37623,26 @@ define("ember-views/system/render_buffer",
           of this buffer
       */
       element: function() {
-        var html = this.innerString();
-
-        if (html) {
-          this._element = setInnerHTML(this._element, html);
+        var content = this.innerContent();
+        // No content means a text node buffer, with the content
+        // in _element. HandlebarsBoundView is an example.
+        if (content === null)  {
+          return this._element;
         }
 
+        var contextualElement = this.innerContextualElement(content);
+        this.dom.detectNamespace(contextualElement);
+
+        if (!this._element) {
+          this._element = document.createDocumentFragment();
+        }
+
+        var nodes = this.dom.parseHTML(content, contextualElement);
+        while (nodes[0]) {
+          this._element.appendChild(nodes[0]);
+        }
+        this.hydrateMorphs(contextualElement);
+
         return this._element;
       },
 
@@ -36191,9 +37653,10 @@ define("ember-views/system/render_buffer",
         @return {String} The generated HTML
       */
       string: function() {
-        if (this._hasElement && this._element) {
+        if (this._element) {
           // Firefox versions < 11 do not have support for element.outerHTML.
-          var thisElement = this.element(), outerHTML = thisElement.outerHTML;
+          var thisElement = this.element();
+          var outerHTML = thisElement.outerHTML;
           if (typeof outerHTML === 'undefined') {
             return jQuery('<div/>').append(thisElement).html();
           }
@@ -36203,156 +37666,232 @@ define("ember-views/system/render_buffer",
         }
       },
 
+      outerContextualElement: function() {
+        if (!this._outerContextualElement) {
+                    this.outerContextualElement = document.body;
+        }
+        return this._outerContextualElement;
+      },
+
+      innerContextualElement: function(html) {
+        var innerContextualElement;
+        if (this._element && this._element.nodeType === 1) {
+          innerContextualElement = this._element;
+        } else {
+          innerContextualElement = this.outerContextualElement();
+        }
+
+        var omittedStartTag;
+        if (html) {
+          omittedStartTag = detectOmittedStartTag(html, innerContextualElement);
+        }
+        return omittedStartTag || innerContextualElement;
+      },
+
       innerString: function() {
+        var content = this.innerContent();
+        if (content && !content.nodeType) {
+          return content;
+        }
+      },
+
+      innerContent: function() {
         return this.buffer;
       }
     };
   });
-define("ember-views/system/utils",
-  ["ember-metal/core","exports"],
-  function(__dependency1__, __exports__) {
+enifed("ember-views/system/renderer",
+  ["ember-metal/core","ember-metal-views/renderer","ember-metal/platform","ember-views/system/render_buffer","ember-metal/run_loop","ember-metal/property_set","ember-metal/instrumentation","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __exports__) {
     "use strict";
-    /* globals XMLSerializer */
-
     var Ember = __dependency1__["default"];
-    // Ember.assert
+    var Renderer = __dependency2__["default"];
+    var create = __dependency3__.create;
+    var renderBuffer = __dependency4__["default"];
+    var run = __dependency5__["default"];
+    var set = __dependency6__.set;
+    var _instrumentStart = __dependency7__._instrumentStart;
+    var subscribers = __dependency7__.subscribers;
 
+    function EmberRenderer() {
+      this.buffer = renderBuffer();
+      Renderer.call(this);
+    }
+    EmberRenderer.prototype = create(Renderer.prototype);
+    EmberRenderer.prototype.constructor = EmberRenderer;
+
+    var BAD_TAG_NAME_TEST_REGEXP = /[^a-zA-Z0-9\-]/;
+    var BAD_TAG_NAME_REPLACE_REGEXP = /[^a-zA-Z0-9\-]/g;
+
+    function stripTagName(tagName) {
+      if (!tagName) {
+        return tagName;
+      }
+
+      if (!BAD_TAG_NAME_TEST_REGEXP.test(tagName)) {
+        return tagName;
+      }
+
+      return tagName.replace(BAD_TAG_NAME_REPLACE_REGEXP, '');
+    }
+
+    EmberRenderer.prototype.scheduleRender =
+      function EmberRenderer_scheduleRender(ctx, fn) {
+        return run.scheduleOnce('render', ctx, fn);
+      };
+
+    EmberRenderer.prototype.cancelRender =
+      function EmberRenderer_cancelRender(id) {
+        run.cancel(id);
+      };
+
+    EmberRenderer.prototype.createChildViewsMorph =
+      function EmberRenderer_createChildViewsMorph(view, _element) {
+        if (view.createChildViewsMorph) {
+          return view.createChildViewsMorph(_element);
+        }
+        var element = _element;
+        if (view.tagName === '') {
+          if (view._morph) {
+            view._childViewsMorph = view._morph;
+          } else {
+            element = document.createDocumentFragment();
+            view._childViewsMorph = this._dom.appendMorph(element);
+          }
+        } else {
+          view._childViewsMorph = this._dom.createMorph(element, element.lastChild, null);
+        }
+        return element;
+      };
+
+    EmberRenderer.prototype.createElement =
+      function EmberRenderer_createElement(view, contextualElement) {
+        // If this is the top-most view, start a new buffer. Otherwise,
+        // create a new buffer relative to the original using the
+        // provided buffer operation (for example, `insertAfter` will
+        // insert a new buffer after the "parent buffer").
+        var tagName = view.tagName;
+        var classNameBindings = view.classNameBindings;
+        var taglessViewWithClassBindings = tagName === '' && classNameBindings.length > 0;
+
+        if (tagName === null || tagName === undefined) {
+          tagName = 'div';
+        }
+
+        
+        var buffer = view.buffer = this.buffer;
+        buffer.reset(tagName, contextualElement);
+
+        if (view.beforeRender) {
+          view.beforeRender(buffer);
+        }
+
+        if (tagName !== '') {
+          if (view.applyAttributesToBuffer) {
+            view.applyAttributesToBuffer(buffer);
+          }
+          buffer.generateElement();
+        }
+
+        if (view.render) {
+          view.render(buffer);
+        }
+
+        if (view.afterRender) {
+          view.afterRender(buffer);
+        }
+
+        var element = buffer.element();
+
+        if (view.isContainer) {
+          this.createChildViewsMorph(view, element);
+        }
+
+        view.buffer = null;
+        if (element && element.nodeType === 1) {
+          // We have hooks, we shouldn't make element observable
+          // consider just doing view.element = element
+          set(view, 'element', element);
+        }
+        return element;
+      };
+
+    EmberRenderer.prototype.destroyView = function destroyView(view) {
+      view.removedFromDOM = true;
+      view.destroy();
+    };
+
+    EmberRenderer.prototype.childViews = function childViews(view) {
+      return view._childViews;
+    };
+
+    Renderer.prototype.willCreateElement = function (view) {
+      if (subscribers.length && view.instrumentDetails) {
+        view._instrumentEnd = _instrumentStart('render.'+view.instrumentName, function viewInstrumentDetails() {
+          var details = {};
+          view.instrumentDetails(details);
+          return details;
+        });
+      }
+      if (view._transitionTo) {
+        view._transitionTo('inBuffer');
+      }
+    }; // inBuffer
+    Renderer.prototype.didCreateElement = function (view) {
+      if (view._transitionTo) {
+        view._transitionTo('hasElement');
+      }
+      if (view._instrumentEnd) {
+        view._instrumentEnd();
+      }
+    }; // hasElement
+    Renderer.prototype.willInsertElement = function (view) {
+      if (view.trigger) { view.trigger('willInsertElement'); }
+    }; // will place into DOM
+    Renderer.prototype.didInsertElement = function (view) {
+      if (view._transitionTo) {
+        view._transitionTo('inDOM');
+      }
+      if (view.trigger) { view.trigger('didInsertElement'); }
+    }; // inDOM // placed into DOM
+
+    Renderer.prototype.willRemoveElement = function (view) {};
+
+    Renderer.prototype.willDestroyElement = function (view) {
+      if (view.trigger) { view.trigger('willDestroyElement'); }
+      if (view.trigger) { view.trigger('willClearRender'); }
+    };
+
+    Renderer.prototype.didDestroyElement = function (view) {
+      set(view, 'element', null);
+      if (view._transitionTo) {
+        view._transitionTo('preRender');
+      }
+    }; // element destroyed so view.destroy shouldn't try to remove it removedFromDOM
+
+    __exports__["default"] = EmberRenderer;
+  });
+enifed("ember-views/system/utils",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
     /**
     @module ember
     @submodule ember-views
     */
 
-    /* BEGIN METAMORPH HELPERS */
-
-    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
-    // is a "zero-scope" element. This problem can be worked around by making
-    // the first node an invisible text node. We, like Modernizr, use &shy;
-
-    var needsShy = typeof document !== 'undefined' && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "<div></div>";
-      testEl.firstChild.innerHTML = "<script></script>";
-      return testEl.firstChild.innerHTML === '';
-    })();
-
-    // IE 8 (and likely earlier) likes to move whitespace preceeding
-    // a script tag to appear after it. This means that we can
-    // accidentally remove whitespace when updating a morph.
-    var movesWhitespace = typeof document !== 'undefined' && (function() {
-      var testEl = document.createElement('div');
-      testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
-      return testEl.childNodes[0].nodeValue === 'Test:' &&
-              testEl.childNodes[2].nodeValue === ' Value';
-    })();
-
-    // Use this to find children by ID instead of using jQuery
-    var findChildById = function(element, id) {
-      if (element.getAttribute('id') === id) { return element; }
-
-      var len = element.childNodes.length, idx, node, found;
-      for (idx=0; idx<len; idx++) {
-        node = element.childNodes[idx];
-        found = node.nodeType === 1 && findChildById(node, id);
-        if (found) { return found; }
-      }
-    };
-
-    var setInnerHTMLWithoutFix = function(element, html) {
-      if (needsShy) {
-        html = '&shy;' + html;
-      }
-
-      var matches = [];
-      if (movesWhitespace) {
-        // Right now we only check for script tags with ids with the
-        // goal of targeting morphs.
-        html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
-          matches.push([id, spaces]);
-          return tag;
-        });
-      }
-
-      element.innerHTML = html;
-
-      // If we have to do any whitespace adjustments do them now
-      if (matches.length > 0) {
-        var len = matches.length, idx;
-        for (idx=0; idx<len; idx++) {
-          var script = findChildById(element, matches[idx][0]),
-              node = document.createTextNode(matches[idx][1]);
-          script.parentNode.insertBefore(node, script);
-        }
-      }
-
-      if (needsShy) {
-        var shyElement = element.firstChild;
-        while (shyElement.nodeType === 1 && !shyElement.nodeName) {
-          shyElement = shyElement.firstChild;
-        }
-        if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
-          shyElement.nodeValue = shyElement.nodeValue.slice(1);
-        }
-      }
-    };
-
-    /* END METAMORPH HELPERS */
-
-
-    var innerHTMLTags = {};
-    var canSetInnerHTML = function(tagName) {
-      if (innerHTMLTags[tagName] !== undefined) {
-        return innerHTMLTags[tagName];
-      }
-
-      var canSet = true;
-
-      // IE 8 and earlier don't allow us to do innerHTML on select
-      if (tagName.toLowerCase() === 'select') {
-        var el = document.createElement('select');
-        setInnerHTMLWithoutFix(el, '<option value="test">Test</option>');
-        canSet = el.options.length === 1;
-      }
-
-      innerHTMLTags[tagName] = canSet;
-
-      return canSet;
-    };
-
-    function setInnerHTML(element, html) {
-      var tagName = element.tagName;
-
-      if (canSetInnerHTML(tagName)) {
-        setInnerHTMLWithoutFix(element, html);
-      } else {
-        // Firefox versions < 11 do not have support for element.outerHTML.
-        var outerHTML = element.outerHTML || new XMLSerializer().serializeToString(element);
-        
-        var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0],
-            endTag = '</'+tagName+'>';
-
-        var wrapper = document.createElement('div');
-        setInnerHTMLWithoutFix(wrapper, startTag + html + endTag);
-        element = wrapper.firstChild;
-        while (element.tagName !== tagName) {
-          element = element.nextSibling;
-        }
-      }
-
-      return element;
-    }
-
-    __exports__.setInnerHTML = setInnerHTML;function isSimpleClick(event) {
-      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey,
-          secondaryClick = event.which > 1; // IE9 may return undefined
+    function isSimpleClick(event) {
+      var modifier = event.shiftKey || event.metaKey || event.altKey || event.ctrlKey;
+      var secondaryClick = event.which > 1; // IE9 may return undefined
 
       return !modifier && !secondaryClick;
     }
 
     __exports__.isSimpleClick = isSimpleClick;
   });
-define("ember-views/views/collection_view",
-  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-runtime/mixins/array","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __exports__) {
+enifed("ember-views/views/collection_view",
+  ["ember-metal/core","ember-metal/platform","ember-metal/binding","ember-metal/merge","ember-metal/property_get","ember-metal/property_set","ember-runtime/system/string","ember-views/views/container_view","ember-views/views/core_view","ember-views/views/view","ember-metal/mixin","ember-handlebars/ext","ember-runtime/mixins/array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __exports__) {
     "use strict";
 
     /**
@@ -36373,7 +37912,8 @@ define("ember-views/views/collection_view",
     var View = __dependency10__["default"];
     var observer = __dependency11__.observer;
     var beforeObserver = __dependency11__.beforeObserver;
-    var EmberArray = __dependency12__["default"];
+    var handlebarsGetView = __dependency12__.handlebarsGetView;
+    var EmberArray = __dependency13__["default"];
 
     /**
       `Ember.CollectionView` is an `Ember.View` descendent responsible for managing
@@ -36396,27 +37936,32 @@ define("ember-views/views/collection_view",
       The view for each item in the collection will have its `content` property set
       to the item.
 
-      ## Specifying itemViewClass
+      ## Specifying `itemViewClass`
 
       By default the view class for each item in the managed collection will be an
       instance of `Ember.View`. You can supply a different class by setting the
       `CollectionView`'s `itemViewClass` property.
 
-      Given an empty `<body>` and the following code:
+      Given the following application code:
 
       ```javascript
-      someItemsView = Ember.CollectionView.create({
+      var App = Ember.Application.create();
+      App.ItemListView = Ember.CollectionView.extend({
         classNames: ['a-collection'],
         content: ['A','B','C'],
         itemViewClass: Ember.View.extend({
           template: Ember.Handlebars.compile("the letter: {{view.content}}")
         })
       });
-
-      someItemsView.appendTo('body');
       ```
 
-      Will result in the following HTML structure
+      And a simple application template:
+
+      ```handlebars
+      {{view 'item-list'}}
+      ```
+
+      The following HTML will result:
 
       ```html
       <div class="ember-view a-collection">
@@ -36432,21 +37977,26 @@ define("ember-views/views/collection_view",
       "ul", "ol", "table", "thead", "tbody", "tfoot", "tr", or "select" will result
       in the item views receiving an appropriately matched `tagName` property.
 
-      Given an empty `<body>` and the following code:
+      Given the following application code:
 
       ```javascript
-      anUnorderedListView = Ember.CollectionView.create({
+      var App = Ember.Application.create();
+      App.UnorderedListView = Ember.CollectionView.create({
         tagName: 'ul',
         content: ['A','B','C'],
         itemViewClass: Ember.View.extend({
           template: Ember.Handlebars.compile("the letter: {{view.content}}")
         })
       });
-
-      anUnorderedListView.appendTo('body');
       ```
 
-      Will result in the following HTML structure
+      And a simple application template:
+
+      ```handlebars
+      {{view 'unordered-list-view'}}
+      ```
+
+      The following HTML will result:
 
       ```html
       <ul class="ember-view a-collection">
@@ -36457,7 +38007,7 @@ define("ember-views/views/collection_view",
       ```
 
       Additional `tagName` pairs can be provided by adding to
-      `Ember.CollectionView.CONTAINER_MAP `
+      `Ember.CollectionView.CONTAINER_MAP`. For example:
 
       ```javascript
       Ember.CollectionView.CONTAINER_MAP['article'] = 'section'
@@ -36470,7 +38020,7 @@ define("ember-views/views/collection_view",
       `createChildView` method can be overidden:
 
       ```javascript
-      CustomCollectionView = Ember.CollectionView.extend({
+      App.CustomCollectionView = Ember.CollectionView.extend({
         createChildView: function(viewClass, attrs) {
           if (attrs.content.kind == 'album') {
             viewClass = App.AlbumView;
@@ -36490,18 +38040,23 @@ define("ember-views/views/collection_view",
       will be the `CollectionView`s only child.
 
       ```javascript
-      aListWithNothing = Ember.CollectionView.create({
-        classNames: ['nothing']
+      var App = Ember.Application.create();
+      App.ListWithNothing = Ember.CollectionView.create({
+        classNames: ['nothing'],
         content: null,
         emptyView: Ember.View.extend({
           template: Ember.Handlebars.compile("The collection is empty")
         })
       });
-
-      aListWithNothing.appendTo('body');
       ```
 
-      Will result in the following HTML structure
+      And a simple application template:
+
+      ```handlebars
+      {{view 'list-with-nothing'}}
+      ```
+
+      The following HTML will result:
 
       ```html
       <div class="ember-view nothing">
@@ -36658,18 +38213,8 @@ define("ember-views/views/collection_view",
         // Loop through child views that correspond with the removed items.
         // Note that we loop from the end of the array to the beginning because
         // we are mutating it as we go.
-        var childViews = this._childViews, childView, idx, len;
-
-        len = this._childViews.length;
-
-        var removingAll = removedCount === len;
-
-        if (removingAll) {
-          this.currentState.empty(this);
-          this.invokeRecursively(function(view) {
-            view.removedFromDOM = true;
-          }, false);
-        }
+        var childViews = this._childViews;
+        var childView, idx;
 
         for (idx = start + removedCount - 1; idx >= start; idx--) {
           childView = childViews[idx];
@@ -36692,19 +38237,15 @@ define("ember-views/views/collection_view",
         @param {Number} added number of object added to content
       */
       arrayDidChange: function(content, start, removed, added) {
-        var addedViews = [], view, item, idx, len, itemViewClass,
-          emptyView;
+        var addedViews = [];
+        var view, item, idx, len, itemViewClass, emptyView;
 
         len = content ? get(content, 'length') : 0;
 
         if (len) {
           itemViewClass = get(this, 'itemViewClass');
+          itemViewClass = handlebarsGetView(content, itemViewClass, this.container);
 
-          if ('string' === typeof itemViewClass && isGlobalPath(itemViewClass)) {
-            itemViewClass = get(itemViewClass) || itemViewClass;
-          }
-
-          
           for (idx = start; idx < start+added; idx++) {
             item = content.objectAt(idx);
 
@@ -36788,7 +38329,7 @@ define("ember-views/views/collection_view",
 
     __exports__["default"] = CollectionView;
   });
-define("ember-views/views/component",
+enifed("ember-views/views/component",
   ["ember-metal/core","ember-views/mixins/component_template_deprecation","ember-runtime/mixins/target_action_support","ember-views/views/view","ember-metal/property_get","ember-metal/property_set","ember-metal/is_none","ember-metal/computed","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -36938,8 +38479,8 @@ define("ember-views/views/component",
       template: computed(function(key, value) {
         if (value !== undefined) { return value; }
 
-        var templateName = get(this, 'templateName'),
-            template = this.templateForName(templateName, 'template');
+        var templateName = get(this, 'templateName');
+        var template = this.templateForName(templateName, 'template');
 
         
         return template || get(this, 'defaultTemplate');
@@ -36963,9 +38504,9 @@ define("ember-views/views/component",
       },
 
       _yield: function(context, options) {
-        var view = options.data.view,
-            parentView = this._parentView,
-            template = get(this, 'template');
+        var view = options.data.view;
+        var parentView = this._parentView;
+        var template = get(this, 'template');
 
         if (template) {
           
@@ -37075,8 +38616,8 @@ define("ember-views/views/component",
         @param [context] {*} a context to send with the action
       */
       sendAction: function(action) {
-        var actionName,
-            contexts = a_slice.call(arguments, 1);
+        var actionName;
+        var contexts = a_slice.call(arguments, 1);
 
         // Send the default action
         if (action === undefined) {
@@ -37097,9 +38638,9 @@ define("ember-views/views/component",
 
     __exports__["default"] = Component;
   });
-define("ember-views/views/container_view",
-  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/view_collection","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
+enifed("ember-views/views/container_view",
+  ["ember-metal/core","ember-metal/merge","ember-runtime/mixins/mutable_array","ember-metal/property_get","ember-metal/property_set","ember-views/views/view","ember-views/views/states","ember-metal/error","ember-metal/enumerable_utils","ember-metal/computed","ember-metal/run_loop","ember-metal/properties","ember-views/system/render_buffer","ember-metal/mixin","ember-runtime/system/native_array","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __exports__) {
     "use strict";
     var Ember = __dependency1__["default"];
     // Ember.assert, Ember.K
@@ -37110,22 +38651,21 @@ define("ember-views/views/container_view",
     var set = __dependency5__.set;
 
     var View = __dependency6__["default"];
-    var ViewCollection = __dependency7__["default"];
 
-    var cloneStates = __dependency8__.cloneStates;
-    var EmberViewStates = __dependency8__.states;
+    var cloneStates = __dependency7__.cloneStates;
+    var EmberViewStates = __dependency7__.states;
 
-    var EmberError = __dependency9__["default"];
+    var EmberError = __dependency8__["default"];
 
-    var forEach = __dependency10__.forEach;
+    var forEach = __dependency9__.forEach;
 
-    var computed = __dependency11__.computed;
-    var run = __dependency12__["default"];
-    var defineProperty = __dependency13__.defineProperty;
-    var renderBuffer = __dependency14__["default"];
-    var observer = __dependency15__.observer;
-    var beforeObserver = __dependency15__.beforeObserver;
-    var emberA = __dependency16__.A;
+    var computed = __dependency10__.computed;
+    var run = __dependency11__["default"];
+    var defineProperty = __dependency12__.defineProperty;
+    var renderBuffer = __dependency13__["default"];
+    var observer = __dependency14__.observer;
+    var beforeObserver = __dependency14__.beforeObserver;
+    var emberA = __dependency15__.A;
 
     /**
     @module ember
@@ -37285,6 +38825,7 @@ define("ember-views/views/container_view",
       @extends Ember.View
     */
     var ContainerView = View.extend(MutableArray, {
+      isContainer: true,
       _states: states,
 
       willWatchProperty: function(prop){
@@ -37358,9 +38899,6 @@ define("ember-views/views/container_view",
         @param {Ember.RenderBuffer} buffer the buffer to render to
       */
       render: function(buffer) {
-        this.forEachChildView(function(view) {
-          view.renderToBuffer(buffer);
-        });
       },
 
       instrumentName: 'container',
@@ -37478,69 +39016,40 @@ define("ember-views/views/container_view",
       },
 
       ensureChildrenAreInDOM: function(view) {
-        var childViews = view._childViews, i, len, childView, previous, buffer, viewCollection = new ViewCollection();
+        var childViews = view._childViews;
+        var renderer = view._renderer;
 
+        var i, len, childView;
         for (i = 0, len = childViews.length; i < len; i++) {
           childView = childViews[i];
-
-          if (!buffer) { buffer = renderBuffer(); buffer._hasElement = false; }
-
-          if (childView.renderToBufferIfNeeded(buffer)) {
-            viewCollection.push(childView);
-          } else if (viewCollection.length) {
-            insertViewCollection(view, viewCollection, previous, buffer);
-            buffer = null;
-            previous = childView;
-            viewCollection.clear();
-          } else {
-            previous = childView;
+          if (!childView._elementCreated) {
+            renderer.renderTree(childView, view, i);
           }
         }
-
-        if (viewCollection.length) {
-          insertViewCollection(view, viewCollection, previous, buffer);
-        }
       }
     });
 
-    function insertViewCollection(view, viewCollection, previous, buffer) {
-      viewCollection.triggerRecursively('willInsertElement');
-
-      if (previous) {
-        previous.domManager.after(previous, buffer.string());
-      } else {
-        view.domManager.prepend(view, buffer.string());
-      }
-
-      viewCollection.forEach(function(v) {
-        v._transitionTo('inDOM');
-        v.propertyDidChange('element');
-        v.triggerRecursively('didInsertElement');
-      });
-    }
-
-
     __exports__["default"] = ContainerView;
   });
-define("ember-views/views/core_view",
-  ["ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","ember-views/system/render_buffer","exports"],
-  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+enifed("ember-views/views/core_view",
+  ["ember-views/system/renderer","ember-views/views/states","ember-runtime/system/object","ember-runtime/mixins/evented","ember-runtime/mixins/action_handler","ember-metal/property_get","ember-metal/property_set","ember-metal/computed","ember-metal/utils","ember-metal/instrumentation","exports"],
+  function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
     "use strict";
-    var cloneStates = __dependency1__.cloneStates;
-    var states = __dependency1__.states;
-    var EmberObject = __dependency2__["default"];
-    var Evented = __dependency3__["default"];
-    var ActionHandler = __dependency4__["default"];
+    var Rerender = __dependency1__["default"];
 
-    var get = __dependency5__.get;
-    var computed = __dependency6__.computed;
+    var cloneStates = __dependency2__.cloneStates;
+    var states = __dependency2__.states;
+    var EmberObject = __dependency3__["default"];
+    var Evented = __dependency4__["default"];
+    var ActionHandler = __dependency5__["default"];
 
-    var typeOf = __dependency7__.typeOf;
+    var get = __dependency6__.get;
+    var set = __dependency7__.set;
+    var computed = __dependency8__.computed;
 
-    var instrument = __dependency8__.instrument;
+    var typeOf = __dependency9__.typeOf;
 
-
-    var renderBuffer = __dependency9__["default"];
+    var instrument = __dependency10__.instrument;
 
     /**
       `Ember.CoreView` is an abstract class that exists to give view-like behavior
@@ -37559,6 +39068,8 @@ define("ember-views/views/core_view",
     */
     var CoreView = EmberObject.extend(Evented, ActionHandler, {
       isView: true,
+      isVirtual: false,
+      isContainer: false,
 
       _states: cloneStates(states),
 
@@ -37604,55 +39115,6 @@ define("ember-views/views/core_view",
         hash.view = this;
       },
 
-      /**
-        Invoked by the view system when this view needs to produce an HTML
-        representation. This method will create a new render buffer, if needed,
-        then apply any default attributes, such as class names and visibility.
-        Finally, the `render()` method is invoked, which is responsible for
-        doing the bulk of the rendering.
-
-        You should not need to override this method; instead, implement the
-        `template` property, or if you need more control, override the `render`
-        method.
-
-        @method renderToBuffer
-        @param {Ember.RenderBuffer} buffer the render buffer. If no buffer is
-          passed, a default buffer, using the current view's `tagName`, will
-          be used.
-        @private
-      */
-      renderToBuffer: function(buffer) {
-        var name = 'render.' + this.instrumentName,
-            details = {};
-
-        this.instrumentDetails(details);
-
-        return instrument(name, details, function instrumentRenderToBuffer() {
-          return this._renderToBuffer(buffer);
-        }, this);
-      },
-
-      _renderToBuffer: function(_buffer) {
-        // If this is the top-most view, start a new buffer. Otherwise,
-        // create a new buffer relative to the original using the
-        // provided buffer operation (for example, `insertAfter` will
-        // insert a new buffer after the "parent buffer").
-        var tagName = this.tagName;
-
-        if (tagName === null || tagName === undefined) {
-          tagName = 'div';
-        }
-
-        var buffer = this.buffer = _buffer && _buffer.begin(tagName) || renderBuffer(tagName);
-        this._transitionTo('inBuffer', false);
-
-        this.beforeRender(buffer);
-        this.render(buffer);
-        this.afterRender(buffer);
-
-        return buffer;
-      },
-
       /**
         Override the default event firing from `Ember.Evented` to
         also call methods with the given name.
@@ -37675,16 +39137,6 @@ define("ember-views/views/core_view",
         }
       },
 
-      deprecatedSendHandles: function(actionName) {
-        return !!this[actionName];
-      },
-
-      deprecatedSend: function(actionName) {
-        var args = [].slice.call(arguments, 1);
-                        this[actionName].apply(this, args);
-        return;
-      },
-
       has: function(name) {
         return typeOf(this[name]) === 'function' || this._super(name);
       },
@@ -37694,9 +39146,12 @@ define("ember-views/views/core_view",
 
         if (!this._super()) { return; }
 
+
         // destroy the element -- this will avoid each child view destroying
         // the element over and over again...
-        if (!this.removedFromDOM) { this.destroyElement(); }
+        if (!this.removedFromDOM && this._renderer) {
+          this._renderer.remove(this, true);
+        }
 
         // remove from parent if found. Don't call removeFromParent,
         // as removeFromParent will try to remove the element from
@@ -37709,15 +39164,17 @@ define("ember-views/views/core_view",
       },
 
       clearRenderedChildren: Ember.K,
-      triggerRecursively: Ember.K,
-      invokeRecursively: Ember.K,
       _transitionTo: Ember.K,
       destroyElement: Ember.K
     });
 
+    CoreView.reopenClass({
+      renderer: new Rerender()
+    });
+
     __exports__["default"] = CoreView;
   });
-define("ember-views/views/states",
+enifed("ember-views/views/states",
   ["ember-metal/platform","ember-metal/merge","ember-views/views/states/default","ember-views/views/states/pre_render","ember-views/views/states/in_buffer","ember-views/views/states/has_element","ember-views/views/states/in_dom","ember-views/views/states/destroying","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -37758,7 +39215,7 @@ define("ember-views/views/states",
     };
     __exports__.states = states;
   });
-define("ember-views/views/states/default",
+enifed("ember-views/views/states/default",
   ["ember-metal/core","ember-metal/property_get","ember-metal/property_set","ember-metal/run_loop","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -37793,23 +39250,16 @@ define("ember-views/views/states/default",
       },
 
       destroyElement: function(view) {
-        set(view, 'element', null);
-        if (view._scheduledInsert) {
-          run.cancel(view._scheduledInsert);
-          view._scheduledInsert = null;
-        }
+        if (view._renderer)
+          view._renderer.remove(view, false);
         return view;
       },
 
-      renderToBufferIfNeeded: function () {
-        return false;
-      },
-
       rerender: Ember.K,
       invokeObserver: Ember.K
     };
   });
-define("ember-views/views/states/destroying",
+enifed("ember-views/views/states/destroying",
   ["ember-metal/merge","ember-metal/platform","ember-runtime/system/string","ember-views/views/states/default","ember-metal/error","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -37836,27 +39286,12 @@ define("ember-views/views/states/destroying",
       },
       destroyElement: function() {
         throw new EmberError(fmt(destroyingError, ['destroyElement']));
-      },
-      empty: function() {
-        throw new EmberError(fmt(destroyingError, ['empty']));
-      },
-
-      setElement: function() {
-        throw new EmberError(fmt(destroyingError, ["set('element', ...)"]));
-      },
-
-      renderToBufferIfNeeded: function() {
-        return false;
-      },
-
-      // Since element insertion is scheduled, don't do anything if
-      // the view has been destroyed between scheduling and execution
-      insertElement: Ember.K
+      }
     });
 
     __exports__["default"] = destroying;
   });
-define("ember-views/views/states/has_element",
+enifed("ember-views/views/states/has_element",
   ["ember-views/views/states/default","ember-metal/run_loop","ember-metal/merge","ember-metal/platform","ember-views/system/jquery","ember-metal/error","ember-metal/property_get","ember-metal/property_set","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -37879,7 +39314,7 @@ define("ember-views/views/states/has_element",
 
     merge(hasElement, {
       $: function(view, sel) {
-        var elem = get(view, 'element');
+        var elem = view.get('concreteView').element;
         return sel ? jQuery(sel, elem) : jQuery(elem);
       },
 
@@ -37890,25 +39325,17 @@ define("ember-views/views/states/has_element",
         return jQuery("#" + get(view, 'elementId'))[0];
       },
 
-      setElement: function(view, value) {
-        if (value === null) {
-          view._transitionTo('preRender');
-        } else {
-          throw new EmberError("You cannot set an element to a non-null value when the element is already in the DOM.");
-        }
-
-        return value;
-      },
-
       // once the view has been inserted into the DOM, rerendering is
       // deferred to allow bindings to synchronize.
       rerender: function(view) {
-        view.triggerRecursively('willClearRender');
-
-        view.clearRenderedChildren();
-
-        view.domManager.replace(view);
-        return view;
+        if (view._root._morph && !view._elementInserted) {
+          throw new EmberError("Something you did caused a view to re-render after it rendered but before it was inserted into the DOM.");
+        }
+        // TODO: should be scheduled with renderer
+        run.scheduleOnce('render', function () {
+          if (view.isDestroying) return;
+          view._renderer.renderTree(view, view._parentView);
+        });
       },
 
       // once the view is already in the DOM, destroying it removes it
@@ -37916,27 +39343,10 @@ define("ember-views/views/states/has_element",
       // preRender state if inDOM.
 
       destroyElement: function(view) {
-        view._notifyWillDestroyElement();
-        view.domManager.remove(view);
-        set(view, 'element', null);
-        if (view._scheduledInsert) {
-          run.cancel(view._scheduledInsert);
-          view._scheduledInsert = null;
-        }
+        view._renderer.remove(view, false);
         return view;
       },
 
-      empty: function(view) {
-        var _childViews = view._childViews, len, idx;
-        if (_childViews) {
-          len = _childViews.length;
-          for (idx = 0; idx < len; idx++) {
-            _childViews[idx]._notifyWillDestroyElement();
-          }
-        }
-        view.domManager.empty(view);
-      },
-
       // Handle events from `Ember.EventDispatcher`
       handleEvent: function(view, eventName, evt) {
         if (view.has(eventName)) {
@@ -37955,7 +39365,7 @@ define("ember-views/views/states/has_element",
 
     __exports__["default"] = hasElement;
   });
-define("ember-views/views/states/in_buffer",
+enifed("ember-views/views/states/in_buffer",
   ["ember-views/views/states/default","ember-metal/error","ember-metal/core","ember-metal/platform","ember-metal/merge","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -37994,54 +39404,22 @@ define("ember-views/views/states/in_buffer",
       // view will render that view and append the resulting
       // buffer into its buffer.
       appendChild: function(view, childView, options) {
-        var buffer = view.buffer, _childViews = view._childViews;
+        var buffer = view.buffer;
+        var _childViews = view._childViews;
 
         childView = view.createChildView(childView, options);
         if (!_childViews.length) { _childViews = view._childViews = _childViews.slice(); }
         _childViews.push(childView);
 
-        childView.renderToBuffer(buffer);
+        if (!childView._morph) {
+          buffer.pushChildView(childView);
+        }
 
         view.propertyDidChange('childViews');
 
         return childView;
       },
 
-      // when a view is rendered in a buffer, destroying the
-      // element will simply destroy the buffer and put the
-      // state back into the preRender state.
-      destroyElement: function(view) {
-        view.clearBuffer();
-        var viewCollection = view._notifyWillDestroyElement();
-        viewCollection.transitionTo('preRender', false);
-
-        return view;
-      },
-
-      empty: function() {
-              },
-
-      renderToBufferIfNeeded: function (view, buffer) {
-        return false;
-      },
-
-      // It should be impossible for a rendered view to be scheduled for
-      // insertion.
-      insertElement: function() {
-        throw new EmberError("You can't insert an element that has already been rendered");
-      },
-
-      setElement: function(view, value) {
-        if (value === null) {
-          view._transitionTo('preRender');
-        } else {
-          view.clearBuffer();
-          view._transitionTo('hasElement');
-        }
-
-        return value;
-      },
-
       invokeObserver: function(target, observer) {
         observer.call(target);
       }
@@ -38049,7 +39427,7 @@ define("ember-views/views/states/in_buffer",
 
     __exports__["default"] = inBuffer;
   });
-define("ember-views/views/states/in_dom",
+enifed("ember-views/views/states/in_dom",
   ["ember-metal/core","ember-metal/platform","ember-metal/merge","ember-metal/error","ember-views/views/states/has_element","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __exports__) {
     "use strict";
@@ -38088,21 +39466,15 @@ define("ember-views/views/states/in_dom",
         if (!View) { View = requireModule('ember-views/views/view')["default"]; } // ES6TODO: this sucks. Have to avoid cycles...
 
         if (!this.isVirtual) delete View.views[view.elementId];
-      },
-
-      insertElement: function(view, fn) {
-        throw new EmberError("You can't insert an element into the DOM that has already been inserted");
       }
     });
 
     __exports__["default"] = inDOM;
   });
-define("ember-views/views/states/pre_render",
+enifed("ember-views/views/states/pre_render",
   ["ember-views/views/states/default","ember-metal/platform","ember-metal/merge","ember-views/system/jquery","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
-    /* global Node */
-
     var _default = __dependency1__["default"];
     var create = __dependency2__.create;
     var merge = __dependency3__["default"];
@@ -38114,44 +39486,10 @@ define("ember-views/views/states/pre_render",
     */
     var preRender = create(_default);
 
-    merge(preRender, {
-      // a view leaves the preRender state once its element has been
-      // created (createElement).
-      insertElement: function(view, fn) {
-        view.createElement();
-        var viewCollection = view.viewHierarchyCollection();
-
-        viewCollection.trigger('willInsertElement');
-
-        fn.call(view);
-
-        // We transition to `inDOM` if the element exists in the DOM
-        var element = view.get('element');
-        if (jQuery.contains(document.body, element)) {
-          viewCollection.transitionTo('inDOM', false);
-          viewCollection.trigger('didInsertElement');
-        }
-      },
-
-      renderToBufferIfNeeded: function(view, buffer) {
-        view.renderToBuffer(buffer);
-        return true;
-      },
-
-      empty: Ember.K,
-
-      setElement: function(view, value) {
-        if (value !== null) {
-          view._transitionTo('hasElement');
-        }
-        return value;
-      }
-    });
-
     __exports__["default"] = preRender;
   });
-define("ember-views/views/view",
-  ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","ember-views/views/view_collection","exports"],
+enifed("ember-views/views/view",
+  ["ember-metal/core","ember-runtime/mixins/evented","ember-runtime/system/object","ember-metal/error","ember-metal/property_get","ember-metal/property_set","ember-metal/set_properties","ember-metal/run_loop","ember-metal/observer","ember-metal/properties","ember-metal/utils","ember-metal/computed","ember-metal/mixin","ember-metal/is_none","ember-metal/deprecate_property","ember-runtime/system/native_array","ember-runtime/system/string","ember-metal/enumerable_utils","ember-runtime/copy","ember-metal/binding","ember-metal/property_events","ember-views/system/jquery","ember-views/system/ext","ember-views/views/core_view","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __dependency17__, __dependency18__, __dependency19__, __dependency20__, __dependency21__, __dependency22__, __dependency23__, __dependency24__, __exports__) {
     "use strict";
     // Ember.assert, Ember.deprecate, Ember.warn, Ember.TEMPLATES,
@@ -38181,47 +39519,36 @@ define("ember-views/views/view",
     var isArray = __dependency11__.isArray;
     var isNone = __dependency14__.isNone;
     var Mixin = __dependency13__.Mixin;
-    var deprecateProperty = __dependency10__.deprecateProperty;
-    var emberA = __dependency15__.A;
+    var deprecateProperty = __dependency15__.deprecateProperty;
+    var emberA = __dependency16__.A;
 
-    var dasherize = __dependency16__.dasherize;
+    var dasherize = __dependency17__.dasherize;
 
     // ES6TODO: functions on EnumerableUtils should get their own export
-    var forEach = __dependency17__.forEach;
-    var addObject = __dependency17__.addObject;
-    var removeObject = __dependency17__.removeObject;
+    var forEach = __dependency18__.forEach;
+    var addObject = __dependency18__.addObject;
+    var removeObject = __dependency18__.removeObject;
 
     var beforeObserver = __dependency13__.beforeObserver;
-    var copy = __dependency18__["default"];
-    var isGlobalPath = __dependency19__.isGlobalPath;
+    var copy = __dependency19__["default"];
+    var isGlobalPath = __dependency20__.isGlobalPath;
 
-    var propertyWillChange = __dependency20__.propertyWillChange;
-    var propertyDidChange = __dependency20__.propertyDidChange;
+    var propertyWillChange = __dependency21__.propertyWillChange;
+    var propertyDidChange = __dependency21__.propertyDidChange;
 
-    var jQuery = __dependency21__["default"];
+    var jQuery = __dependency22__["default"];
      // for the side effect of extending Ember.run.queues
 
-    var CoreView = __dependency23__["default"];
-    var ViewCollection = __dependency24__["default"];
+    var CoreView = __dependency24__["default"];
 
     /**
     @module ember
     @submodule ember-views
     */
-
-    var ContainerView;
-
-    function nullViewsBuffer(view) {
-      view.buffer = null;
-
-    }
-
-    function clearCachedElement(view) {
-      meta(view).cache.element = undefined;
-    }
-
     var childViewsProperty = computed(function() {
-      var childViews = this._childViews, ret = emberA(), view = this;
+      var childViews = this._childViews;
+      var ret = emberA();
+      var view = this;
 
       forEach(childViews, function(view) {
         var currentChildViews;
@@ -38235,11 +39562,6 @@ define("ember-views/views/view",
       });
 
       ret.replace = function (idx, removedCount, addedViews) {
-        if (!ContainerView) { ContainerView = requireModule('ember-views/views/container_view')['default']; } // ES6TODO: stupid circular dep
-
-        if (view instanceof ContainerView) {
-                    return view.replace(idx, removedCount, addedViews);
-        }
         throw new EmberError("childViews is immutable");
       };
 
@@ -38757,8 +40079,9 @@ define("ember-views/views/view",
       on the descendent.
 
       ```javascript
-      OuterView = Ember.View.extend({
-        template: Ember.Handlebars.compile("outer {{#view InnerView}}inner{{/view}} outer"),
+      var App = Ember.Application.create();
+      App.OuterView = Ember.View.extend({
+        template: Ember.Handlebars.compile("outer {{#view 'inner'}}inner{{/view}} outer"),
         eventManager: Ember.Object.create({
           mouseEnter: function(event, view) {
             // view might be instance of either
@@ -38768,7 +40091,7 @@ define("ember-views/views/view",
         })
       });
 
-      InnerView = Ember.View.extend({
+      App.InnerView = Ember.View.extend({
         click: function(event) {
           // will be called if rendered inside
           // an OuterView because OuterView's
@@ -38912,8 +40235,8 @@ define("ember-views/views/view",
       template: computed('templateName', function(key, value) {
         if (value !== undefined) { return value; }
 
-        var templateName = get(this, 'templateName'),
-            template = this.templateForName(templateName, 'template');
+        var templateName = get(this, 'templateName');
+        var template = this.templateForName(templateName, 'template');
 
         
         return template || get(this, 'defaultTemplate');
@@ -38946,8 +40269,8 @@ define("ember-views/views/view",
         @type Function
       */
       layout: computed(function(key) {
-        var layoutName = get(this, 'layoutName'),
-            layout = this.templateForName(layoutName, 'layout');
+        var layoutName = get(this, 'layoutName');
+        var layout = this.templateForName(layoutName, 'layout');
 
         
         return layout || get(this, 'defaultLayout');
@@ -39103,8 +40426,8 @@ define("ember-views/views/view",
         @return Ember.View
       */
       nearestOfType: function(klass) {
-        var view = get(this, 'parentView'),
-            isOfType = klass instanceof Mixin ?
+        var view = get(this, 'parentView');
+        var isOfType = klass instanceof Mixin ?
                        function(view) { return klass.detect(view); } :
                        function(view) { return klass.detect(view.constructor); };
 
@@ -39249,21 +40572,6 @@ define("ember-views/views/view",
         return this.currentState.rerender(this);
       },
 
-      clearRenderedChildren: function() {
-        var lengthBefore = this.lengthBeforeRender,
-            lengthAfter  = this.lengthAfterRender;
-
-        // If there were child views created during the last call to render(),
-        // remove them under the assumption that they will be re-created when
-        // we re-render.
-
-        // VIEW-TODO: Unit test this path.
-        var childViews = this._childViews;
-        for (var i=lengthAfter-1; i>=lengthBefore; i--) {
-          if (childViews[i]) { childViews[i].destroy(); }
-        }
-      },
-
       /**
         Iterates over the view's `classNameBindings` array, inserts the value
         of the specified property into the `classNames` array, then creates an
@@ -39274,8 +40582,8 @@ define("ember-views/views/view",
         @private
       */
       _applyClassNameBindings: function(classBindings) {
-        var classNames = this.classNames,
-        elem, newClass, dasherizedClass;
+        var classNames = this.classNames;
+        var elem, newClass, dasherizedClass;
 
         // Loop through all of the configured bindings. These will be either
         // property names ('isUrgent') or property paths relative to the view
@@ -39353,14 +40661,15 @@ define("ember-views/views/view",
         @private
       */
       _applyAttributeBindings: function(buffer, attributeBindings) {
-        var attributeValue,
-            unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
+        var attributeValue;
+        var unspecifiedAttributeBindings = this._unspecifiedAttributeBindings = this._unspecifiedAttributeBindings || {};
 
         forEach(attributeBindings, function(binding) {
-          var split = binding.split(':'),
-              property = split[0],
-              attributeName = split[1] || property;
+          var split = binding.split(':');
+          var property = split[0];
+          var attributeName = split[1] || property;
 
+          
           if (property in this) {
             this._setupAttributeBindingObservation(property, attributeName);
 
@@ -39449,13 +40758,7 @@ define("ember-views/views/view",
         @property element
         @type DOMElement
       */
-      element: computed('_parentView', function(key, value) {
-        if (value !== undefined) {
-          return this.currentState.setElement(this, value);
-        } else {
-          return this.currentState.getElement(this);
-        }
-      }),
+      element: null,
 
       /**
         Returns a jQuery object for this view's element. If you pass in a selector
@@ -39474,9 +40777,9 @@ define("ember-views/views/view",
       },
 
       mutateChildViews: function(callback) {
-        var childViews = this._childViews,
-            idx = childViews.length,
-            view;
+        var childViews = this._childViews;
+        var idx = childViews.length;
+        var view;
 
         while(--idx >= 0) {
           view = childViews[idx];
@@ -39491,8 +40794,8 @@ define("ember-views/views/view",
 
         if (!childViews) { return this; }
 
-        var len = childViews.length,
-            view, idx;
+        var len = childViews.length;
+        var view, idx;
 
         for (idx = 0; idx < len; idx++) {
           view = childViews[idx];
@@ -39522,12 +40825,11 @@ define("ember-views/views/view",
         @param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object
         @return {Ember.View} receiver
       */
-      appendTo: function(target) {
-        // Schedule the DOM element to be created and appended to the given
-        // element after bindings have synchronized.
-        this._insertElementLater(function() {
-                              this.$().appendTo(target);
-        });
+      appendTo: function(selector) {
+        var target = jQuery(selector);
+
+                
+        this.constructor.renderer.appendTo(this, target[0]);
 
         return this;
       },
@@ -39545,47 +40847,15 @@ define("ember-views/views/view",
         @param {String|DOMElement|jQuery} target A selector, element, HTML string, or jQuery object
         @return {Ember.View} received
       */
-      replaceIn: function(target) {
+      replaceIn: function(selector) {
+        var target = jQuery(selector);
+
                 
-        this._insertElementLater(function() {
-          jQuery(target).empty();
-          this.$().appendTo(target);
-        });
+        this.constructor.renderer.replaceIn(this, target[0]);
 
         return this;
       },
 
-      /**
-        Schedules a DOM operation to occur during the next render phase. This
-        ensures that all bindings have finished synchronizing before the view is
-        rendered.
-
-        To use, pass a function that performs a DOM operation.
-
-        Before your function is called, this view and all child views will receive
-        the `willInsertElement` event. After your function is invoked, this view
-        and all of its child views will receive the `didInsertElement` event.
-
-        ```javascript
-        view._insertElementLater(function() {
-          this.createElement();
-          this.$().appendTo('body');
-        });
-        ```
-
-        @method _insertElementLater
-        @param {Function} fn the function that inserts the element into the DOM
-        @private
-      */
-      _insertElementLater: function(fn) {
-        this._scheduledInsert = run.scheduleOnce('render', this, '_insertElement', fn);
-      },
-
-      _insertElement: function (fn) {
-        this._scheduledInsert = null;
-        this.currentState.insertElement(this, fn);
-      },
-
       /**
         Appends the view's element to the document body. If the view does
         not have an HTML representation yet, `createElement()` will be called
@@ -39619,9 +40889,6 @@ define("ember-views/views/view",
         // In the interim, we will just re-render if that happens. It is more
         // important than elements get garbage collected.
         if (!this.removedFromDOM) { this.destroyElement(); }
-        this.invokeRecursively(function(view) {
-          if (view.clearRenderedChildren) { view.clearRenderedChildren(); }
-        });
       },
 
       elementId: null,
@@ -39643,20 +40910,20 @@ define("ember-views/views/view",
       },
 
       /**
-        Creates a DOM representation of the view and all of its
-        child views by recursively calling the `render()` method.
+        Creates a DOM representation of the view and all of its child views by
+        recursively calling the `render()` method.
 
-        After the element has been created, `didInsertElement` will
+        After the element has been inserted into the DOM, `didInsertElement` will
         be called on this view and all of its child views.
 
         @method createElement
         @return {Ember.View} receiver
       */
       createElement: function() {
-        if (get(this, 'element')) { return this; }
+        if (this.element) { return this; }
 
-        var buffer = this.renderToBuffer();
-        set(this, 'element', buffer.element());
+        this._didCreateElementWithoutMorph = true;
+        this.constructor.renderer.renderTree(this);
 
         return this;
       },
@@ -39673,6 +40940,9 @@ define("ember-views/views/view",
         or after the view was re-rendered. Override this function to do any
         set up that requires an element in the document body.
 
+        When a view has children, didInsertElement will be called on the
+        child view(s) first, bubbling upwards through the hierarchy.
+
         @event didInsertElement
       */
       didInsertElement: Ember.K,
@@ -39686,65 +40956,6 @@ define("ember-views/views/view",
       */
       willClearRender: Ember.K,
 
-      /**
-        Run this callback on the current view (unless includeSelf is false) and recursively on child views.
-
-        @method invokeRecursively
-        @param fn {Function}
-        @param includeSelf {Boolean} Includes itself if true.
-        @private
-      */
-      invokeRecursively: function(fn, includeSelf) {
-        var childViews = (includeSelf === false) ? this._childViews : [this];
-        var currentViews, view, currentChildViews;
-
-        while (childViews.length) {
-          currentViews = childViews.slice();
-          childViews = [];
-
-          for (var i=0, l=currentViews.length; i<l; i++) {
-            view = currentViews[i];
-            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
-            fn(view);
-            if (currentChildViews) {
-              childViews.push.apply(childViews, currentChildViews);
-            }
-          }
-        }
-      },
-
-      triggerRecursively: function(eventName) {
-        var childViews = [this], currentViews, view, currentChildViews;
-
-        while (childViews.length) {
-          currentViews = childViews.slice();
-          childViews = [];
-
-          for (var i=0, l=currentViews.length; i<l; i++) {
-            view = currentViews[i];
-            currentChildViews = view._childViews ? view._childViews.slice(0) : null;
-            if (view.trigger) { view.trigger(eventName); }
-            if (currentChildViews) {
-              childViews.push.apply(childViews, currentChildViews);
-            }
-
-          }
-        }
-      },
-
-      viewHierarchyCollection: function() {
-        var currentView, viewCollection = new ViewCollection([this]);
-
-        for (var i = 0; i < viewCollection.length; i++) {
-          currentView = viewCollection.objectAt(i);
-          if (currentView._childViews) {
-            viewCollection.push.apply(viewCollection, currentView._childViews);
-          }
-        }
-
-        return viewCollection;
-      },
-
       /**
         Destroys any existing element along with the element for any child views
         as well. If the view does not currently have a element, then this method
@@ -39772,40 +40983,13 @@ define("ember-views/views/view",
         this function to do any teardown that requires an element, like removing
         event listeners.
 
+        Please note: any property changes made during this event will have no
+        effect on object observers.
+
         @event willDestroyElement
       */
       willDestroyElement: Ember.K,
 
-      /**
-        Triggers the `willDestroyElement` event (which invokes the
-        `willDestroyElement()` method if it exists) on this view and all child
-        views.
-
-        Before triggering `willDestroyElement`, it first triggers the
-        `willClearRender` event recursively.
-
-        @method _notifyWillDestroyElement
-        @private
-      */
-      _notifyWillDestroyElement: function() {
-        var viewCollection = this.viewHierarchyCollection();
-        viewCollection.trigger('willClearRender');
-        viewCollection.trigger('willDestroyElement');
-        return viewCollection;
-      },
-
-      /**
-        If this view's element changes, we need to invalidate the caches of our
-        child views so that we do not retain references to DOM elements that are
-        no longer needed.
-
-        @method _elementDidChange
-        @private
-      */
-      _elementDidChange: observer('element', function() {
-        this.forEachChildView(clearCachedElement);
-      }),
-
       /**
         Called when the parentView property has changed.
 
@@ -39820,26 +41004,9 @@ define("ember-views/views/view",
         this._super(hash);
       },
 
-      _renderToBuffer: function(buffer) {
-        this.lengthBeforeRender = this._childViews.length;
-        buffer = this._super(buffer);
-        this.lengthAfterRender = this._childViews.length;
+      beforeRender: function(buffer) {},
 
-        return buffer;
-      },
-
-      renderToBufferIfNeeded: function (buffer) {
-        return this.currentState.renderToBufferIfNeeded(this, buffer);
-      },
-
-      beforeRender: function(buffer) {
-        this.applyAttributesToBuffer(buffer);
-        buffer.pushOpeningTag();
-      },
-
-      afterRender: function(buffer) {
-        buffer.pushClosingTag();
-      },
+      afterRender: function(buffer) {},
 
       applyAttributesToBuffer: function(buffer) {
         // Creates observers for all registered class name and attribute bindings,
@@ -40002,7 +41169,9 @@ define("ember-views/views/view",
         @private
       */
       init: function() {
-        this.elementId = this.elementId || guidFor(this);
+        if (!this.isVirtual && !this.elementId) {
+          this.elementId = guidFor(this);
+        }
 
         this._super();
 
@@ -40088,29 +41257,19 @@ define("ember-views/views/view",
         @method destroy
       */
       destroy: function() {
-        var childViews = this._childViews,
-            // get parentView before calling super because it'll be destroyed
-            nonVirtualParentView = get(this, 'parentView'),
-            viewName = this.viewName,
-            childLen, i;
+        var childViews = this._childViews;
+        // get parentView before calling super because it'll be destroyed
+        var nonVirtualParentView = get(this, 'parentView');
+        var viewName = this.viewName;
+        var childLen, i;
 
         if (!this._super()) { return; }
 
-        childLen = childViews.length;
-        for (i=childLen-1; i>=0; i--) {
-          childViews[i].removedFromDOM = true;
-        }
-
         // remove from non-virtual parent view if viewName was specified
         if (viewName && nonVirtualParentView) {
           nonVirtualParentView.set(viewName, null);
         }
 
-        childLen = childViews.length;
-        for (i=childLen-1; i>=0; i--) {
-          childViews[i].destroy();
-        }
-
         return this;
       },
 
@@ -40187,16 +41346,18 @@ define("ember-views/views/view",
 
       _toggleVisibility: function() {
         var $el = this.$();
-        if (!$el) { return; }
-
         var isVisible = get(this, 'isVisible');
 
         if (this._isVisible === isVisible) { return ; }
 
-        $el.toggle(isVisible);
-
+        // It's important to keep these in sync, even if we don't yet have
+        // an element in the DOM to manipulate:
         this._isVisible = isVisible;
 
+        if (!$el) { return; }
+
+        $el.toggle(isVisible);
+
         if (this._isAncestorHidden()) { return; }
 
         if (isVisible) {
@@ -40240,28 +41401,16 @@ define("ember-views/views/view",
 
         return false;
       },
-
-      clearBuffer: function() {
-        this.invokeRecursively(nullViewsBuffer);
-      },
       transitionTo: function(state, children) {
                 this._transitionTo(state, children);
       },
       _transitionTo: function(state, children) {
         var priorState = this.currentState;
         var currentState = this.currentState = this._states[state];
-
         this._state = state;
 
         if (priorState && priorState.exit) { priorState.exit(this); }
         if (currentState.enter) { currentState.enter(this); }
-        if (state === 'inDOM') { meta(this).cache.element = undefined; }
-
-        if (children !== false) {
-          this.forEachChildView(function(view) {
-            view._transitionTo(state);
-          });
-        }
       },
 
       // .......................................................
@@ -40290,13 +41439,13 @@ define("ember-views/views/view",
           return;
         }
 
-        var view = this,
-            stateCheckedObserver = function() {
-              view.currentState.invokeObserver(this, observer);
-            },
-            scheduledObserver = function() {
-              run.scheduleOnce('render', this, stateCheckedObserver);
-            };
+        var view = this;
+        var stateCheckedObserver = function() {
+          view.currentState.invokeObserver(this, observer);
+        };
+        var scheduledObserver = function() {
+          run.scheduleOnce('render', this, stateCheckedObserver);
+        };
 
         addObserver(root, path, target, scheduledObserver);
 
@@ -40340,48 +41489,6 @@ define("ember-views/views/view",
       run.once(View, 'notifyMutationListeners');
     }
 
-    var DOMManager = {
-      prepend: function(view, html) {
-        view.$().prepend(html);
-        notifyMutationListeners();
-      },
-
-      after: function(view, html) {
-        view.$().after(html);
-        notifyMutationListeners();
-      },
-
-      html: function(view, html) {
-        view.$().html(html);
-        notifyMutationListeners();
-      },
-
-      replace: function(view) {
-        var element = get(view, 'element');
-
-        set(view, 'element', null);
-
-        view._insertElementLater(function() {
-          jQuery(element).replaceWith(get(view, 'element'));
-          notifyMutationListeners();
-        });
-      },
-
-      remove: function(view) {
-        view.$().remove();
-        notifyMutationListeners();
-      },
-
-      empty: function(view) {
-        view.$().empty();
-        notifyMutationListeners();
-      }
-    };
-
-    View.reopen({
-      domManager: DOMManager
-    });
-
     View.reopenClass({
 
       /**
@@ -40404,11 +41511,10 @@ define("ember-views/views/view",
         @private
       */
       _parsePropertyPath: function(path) {
-        var split = path.split(':'),
-            propertyPath = split[0],
-            classNames = "",
-            className,
-            falsyClassName;
+        var split = path.split(':');
+        var propertyPath = split[0];
+        var classNames = "";
+        var className, falsyClassName;
 
         // check if the property is defined as prop:class or prop:trueClass:falseClass
         if (split.length > 1) {
@@ -40492,7 +41598,7 @@ define("ember-views/views/view",
     });
 
     var mutation = EmberObject.extend(Evented).create();
-
+    // TODO MOVE TO RENDERER HOOKS
     View.addMutationListener = function(callback) {
       mutation.on('change', callback);
     };
@@ -40550,82 +41656,11 @@ define("ember-views/views/view",
 
     __exports__["default"] = View;
   });
-define("ember-views/views/view_collection",
-  ["ember-metal/enumerable_utils","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var forEach = __dependency1__.forEach;
-
-    function ViewCollection(initialViews) {
-      var views = this.views = initialViews || [];
-      this.length = views.length;
-    }
-
-    ViewCollection.prototype = {
-      length: 0,
-
-      trigger: function(eventName) {
-        var views = this.views, view;
-        for (var i = 0, l = views.length; i < l; i++) {
-          view = views[i];
-          if (view.trigger) { view.trigger(eventName); }
-        }
-      },
-
-      triggerRecursively: function(eventName) {
-        var views = this.views;
-        for (var i = 0, l = views.length; i < l; i++) {
-          views[i].triggerRecursively(eventName);
-        }
-      },
-
-      invokeRecursively: function(fn) {
-        var views = this.views, view;
-
-        for (var i = 0, l = views.length; i < l; i++) {
-          view = views[i];
-          fn(view);
-        }
-      },
-
-      transitionTo: function(state, children) {
-        var views = this.views;
-        for (var i = 0, l = views.length; i < l; i++) {
-          views[i]._transitionTo(state, children);
-        }
-      },
-
-      push: function() {
-        this.length += arguments.length;
-        var views = this.views;
-        return views.push.apply(views, arguments);
-      },
-
-      objectAt: function(idx) {
-        return this.views[idx];
-      },
-
-      forEach: function(callback) {
-        var views = this.views;
-        return forEach(views, callback);
-      },
-
-      clear: function() {
-        this.length = 0;
-        this.views.length = 0;
-      }
-    };
-
-    __exports__["default"] = ViewCollection;
-  });
-define("ember",
+enifed("ember",
   ["ember-metal","ember-runtime","ember-handlebars","ember-views","ember-routing","ember-routing-handlebars","ember-application","ember-extension-support"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__) {
-        // Remove "use strict"; from transpiled module until
-    // https://bugs.webkit.org/show_bug.cgi?id=138038 is fixed
-    //
-    // REMOVE_USE_STRICT: true
-
+    "use strict";
+    /* global navigator */
     // require the main entry points for each of these packages
     // this is so that the global exports occur properly
 
@@ -40641,521 +41676,830 @@ define("ember",
     @module ember
     */
 
-    function throwWithMessage(msg) {
-      return function() {
-        throw new Ember.Error(msg);
-      };
-    }
-
-    function generateRemovedClass(className) {
-      var msg = " has been moved into a plugin: https://github.com/emberjs/ember-states";
-
-      return {
-        extend: throwWithMessage(className + msg),
-        create: throwWithMessage(className + msg)
-      };
-    }
-
-    Ember.StateManager = generateRemovedClass("Ember.StateManager");
-
-    /**
-      This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
-
-      @class StateManager
-      @namespace Ember
-    */
-
-    Ember.State = generateRemovedClass("Ember.State");
-
-    /**
-      This was exported to ember-states plugin for v 1.0.0 release. See: https://github.com/emberjs/ember-states
-
-      @class State
-      @namespace Ember
-    */
-  });
-define("metamorph",
-  [],
-  function() {
+      });
+enifed("morph",
+  ["./morph/morph","./morph/dom-helper","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
-    // ==========================================================================
-    // Project:   metamorph
-    // Copyright: ©2014 Tilde, Inc. All rights reserved.
-    // ==========================================================================
+    var Morph = __dependency1__["default"];
+    var Morph;
+    __exports__.Morph = Morph;
+    var DOMHelper = __dependency2__["default"];
+    var DOMHelper;
+    __exports__.DOMHelper = DOMHelper;
+  });
+enifed("morph/dom-helper",
+  ["../morph/morph","./dom-helper/build-html-dom","exports"],
+  function(__dependency1__, __dependency2__, __exports__) {
+    "use strict";
+    var Morph = __dependency1__["default"];
+    var buildHTMLDOM = __dependency2__.buildHTMLDOM;
+    var svgNamespace = __dependency2__.svgNamespace;
+    var svgHTMLIntegrationPoints = __dependency2__.svgHTMLIntegrationPoints;
 
-    var K = function() {},
-        guid = 0,
-        disableRange = (function(){
-          if ('undefined' !== typeof MetamorphENV) {
-            return MetamorphENV.DISABLE_RANGE_API;
-          } else if ('undefined' !== ENV) {
-            return ENV.DISABLE_RANGE_API;
-          } else {
-            return false;
-          }
-        })(),
+    var deletesBlankTextNodes = (function(){
+      var element = document.createElement('div');
+      element.appendChild( document.createTextNode('') );
+      var clonedElement = element.cloneNode(true);
+      return clonedElement.childNodes.length === 0;
+    })();
 
-        // Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
-        supportsRange = (!disableRange) && typeof document !== 'undefined' && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
+    var ignoresCheckedAttribute = (function(){
+      var element = document.createElement('input');
+      element.setAttribute('checked', 'checked');
+      var clonedElement = element.cloneNode(false);
+      return !clonedElement.checked;
+    })();
 
-        // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
-        // is a "zero-scope" element. This problem can be worked around by making
-        // the first node an invisible text node. We, like Modernizr, use &shy;
-        needsShy = typeof document !== 'undefined' && (function() {
-          var testEl = document.createElement('div');
-          testEl.innerHTML = "<div></div>";
-          testEl.firstChild.innerHTML = "<script></script>";
-          return testEl.firstChild.innerHTML === '';
-        })(),
+    function isSVG(ns){
+      return ns === svgNamespace;
+    }
 
-
-        // IE 8 (and likely earlier) likes to move whitespace preceeding
-        // a script tag to appear after it. This means that we can
-        // accidentally remove whitespace when updating a morph.
-        movesWhitespace = document && (function() {
-          var testEl = document.createElement('div');
-          testEl.innerHTML = "Test: <script type='text/x-placeholder'></script>Value";
-          return testEl.childNodes[0].nodeValue === 'Test:' &&
-                  testEl.childNodes[2].nodeValue === ' Value';
-        })();
-
-    // Constructor that supports either Metamorph('foo') or new
-    // Metamorph('foo');
-    //
-    // Takes a string of HTML as the argument.
-
-    var Metamorph = function(html) {
-      var self;
-
-      if (this instanceof Metamorph) {
-        self = this;
+    // This is not the namespace of the element, but of
+    // the elements inside that elements.
+    function interiorNamespace(element){
+      if (
+        element &&
+        element.namespaceURI === svgNamespace &&
+        !svgHTMLIntegrationPoints[element.tagName]
+      ) {
+        return svgNamespace;
       } else {
-        self = new K();
+        return null;
       }
+    }
 
-      self.innerHTML = html;
-      var myGuid = 'metamorph-'+(guid++);
-      self.start = myGuid + '-start';
-      self.end = myGuid + '-end';
+    // The HTML spec allows for "omitted start tags". These tags are optional
+    // when their intended child is the first thing in the parent tag. For
+    // example, this is a tbody start tag:
+    //
+    // <table>
+    //   <tbody>
+    //     <tr>
+    //
+    // The tbody may be omitted, and the browser will accept and render:
+    //
+    // <table>
+    //   <tr>
+    //
+    // However, the omitted start tag will still be added to the DOM. Here
+    // we test the string and context to see if the browser is about to
+    // perform this cleanup.
+    //
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/syntax.html#optional-tags
+    // describes which tags are omittable. The spec for tbody and colgroup
+    // explains this behavior:
+    //
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-tbody-element
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/tables.html#the-colgroup-element
+    //
 
-      return self;
+    var omittedStartTagChildTest = /<([\w:]+)/;
+    function detectOmittedStartTag(string, contextualElement){
+      // Omitted start tags are only inside table tags.
+      if (contextualElement.tagName === 'TABLE') {
+        var omittedStartTagChildMatch = omittedStartTagChildTest.exec(string);
+        if (omittedStartTagChildMatch) {
+          var omittedStartTagChild = omittedStartTagChildMatch[1];
+          // It is already asserted that the contextual element is a table
+          // and not the proper start tag. Just see if a tag was omitted.
+          return omittedStartTagChild === 'tr' ||
+                 omittedStartTagChild === 'col';
+        }
+      }
+    }
+
+    function buildSVGDOM(html, dom){
+      var div = dom.document.createElement('div');
+      div.innerHTML = '<svg>'+html+'</svg>';
+      return div.firstChild.childNodes;
+    }
+
+    /*
+     * A class wrapping DOM functions to address environment compatibility,
+     * namespaces, contextual elements for morph un-escaped content
+     * insertion.
+     *
+     * When entering a template, a DOMHelper should be passed:
+     *
+     *   template(context, { hooks: hooks, dom: new DOMHelper() });
+     *
+     * TODO: support foreignObject as a passed contextual element. It has
+     * a namespace (svg) that does not match its internal namespace
+     * (xhtml).
+     *
+     * @class DOMHelper
+     * @constructor
+     * @param {HTMLDocument} _document The document DOM methods are proxied to
+     */
+    function DOMHelper(_document){
+      this.document = _document || window.document;
+      this.namespace = null;
+    }
+
+    var prototype = DOMHelper.prototype;
+    prototype.constructor = DOMHelper;
+
+    prototype.insertBefore = function(element, childElement, referenceChild) {
+      return element.insertBefore(childElement, referenceChild);
     };
 
-    K.prototype = Metamorph.prototype;
-
-    var rangeFor, htmlFunc, removeFunc, outerHTMLFunc, appendToFunc, afterFunc, prependFunc, startTagFunc, endTagFunc;
-
-    outerHTMLFunc = function() {
-      return this.startTag() + this.innerHTML + this.endTag();
+    prototype.appendChild = function(element, childElement) {
+      return element.appendChild(childElement);
     };
 
-    startTagFunc = function() {
-      /*
-       * We replace chevron by its hex code in order to prevent escaping problems.
-       * Check this thread for more explaination:
-       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
-       */
-      return "<script id='" + this.start + "' type='text/x-placeholder'>\x3C/script>";
+    prototype.appendText = function(element, text) {
+      return element.appendChild(this.document.createTextNode(text));
     };
 
-    endTagFunc = function() {
-      /*
-       * We replace chevron by its hex code in order to prevent escaping problems.
-       * Check this thread for more explaination:
-       * http://stackoverflow.com/questions/8231048/why-use-x3c-instead-of-when-generating-html-from-javascript
-       */
-      return "<script id='" + this.end + "' type='text/x-placeholder'>\x3C/script>";
+    prototype.setAttribute = function(element, name, value) {
+      element.setAttribute(name, value);
     };
 
-    // If we have the W3C range API, this process is relatively straight forward.
-    if (supportsRange) {
-
-      // Get a range for the current morph. Optionally include the starting and
-      // ending placeholders.
-      rangeFor = function(morph, outerToo) {
-        var range = document.createRange();
-        var before = document.getElementById(morph.start);
-        var after = document.getElementById(morph.end);
-
-        if (outerToo) {
-          range.setStartBefore(before);
-          range.setEndAfter(after);
+    if (document.createElementNS) {
+      // Only opt into namespace detection if a contextualElement
+      // is passed.
+      prototype.createElement = function(tagName, contextualElement) {
+        var namespace = this.namespace;
+        if (contextualElement) {
+          if (tagName === 'svg') {
+            namespace = svgNamespace;
+          } else {
+            namespace = interiorNamespace(contextualElement);
+          }
+        }
+        if (namespace) {
+          return this.document.createElementNS(namespace, tagName);
         } else {
-          range.setStartAfter(before);
-          range.setEndBefore(after);
+          return this.document.createElement(tagName);
         }
-
-        return range;
       };
-
-      htmlFunc = function(html, outerToo) {
-        // get a range for the current metamorph object
-        var range = rangeFor(this, outerToo);
-
-        // delete the contents of the range, which will be the
-        // nodes between the starting and ending placeholder.
-        range.deleteContents();
-
-        // create a new document fragment for the HTML
-        var fragment = range.createContextualFragment(html);
-
-        // insert the fragment into the range
-        range.insertNode(fragment);
-      };
-
-      /**
-      * @public
-      *
-      * Remove this object (including starting and ending
-      * placeholders).
-      *
-      * @method remove
-      */
-      removeFunc = function() {
-        // get a range for the current metamorph object including
-        // the starting and ending placeholders.
-        var range = rangeFor(this, true);
-
-        // delete the entire range.
-        range.deleteContents();
-      };
-
-      appendToFunc = function(node) {
-        var range = document.createRange();
-        range.setStart(node);
-        range.collapse(false);
-        var frag = range.createContextualFragment(this.outerHTML());
-        node.appendChild(frag);
-      };
-
-      afterFunc = function(html) {
-        var range = document.createRange();
-        var after = document.getElementById(this.end);
-
-        range.setStartAfter(after);
-        range.setEndAfter(after);
-
-        var fragment = range.createContextualFragment(html);
-        range.insertNode(fragment);
-      };
-
-      prependFunc = function(html) {
-        var range = document.createRange();
-        var start = document.getElementById(this.start);
-
-        range.setStartAfter(start);
-        range.setEndAfter(start);
-
-        var fragment = range.createContextualFragment(html);
-        range.insertNode(fragment);
-      };
-
     } else {
-      /*
-       * This code is mostly taken from jQuery, with one exception. In jQuery's case, we
-       * have some HTML and we need to figure out how to convert it into some nodes.
-       *
-       * In this case, jQuery needs to scan the HTML looking for an opening tag and use
-       * that as the key for the wrap map. In our case, we know the parent node, and
-       * can use its type as the key for the wrap map.
-       **/
-      Metamorph._wrapMap = {
-        select: [ 1, "<select multiple='multiple'>", "</select>" ],
-        fieldset: [ 1, "<fieldset>", "</fieldset>" ],
-        table: [ 1, "<table>", "</table>" ],
-        tbody: [ 2, "<table><tbody>", "</tbody></table>" ],
-        tr: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-        colgroup: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-        map: [ 1, "<map>", "</map>" ],
-        _default: [ 0, "", "" ]
-      };
-
-      var findChildById = function(element, id) {
-        if (element.getAttribute('id') === id) { return element; }
-
-        var len = element.childNodes.length, idx, node, found;
-        for (idx=0; idx<len; idx++) {
-          node = element.childNodes[idx];
-          found = node.nodeType === 1 && findChildById(node, id);
-          if (found) { return found; }
-        }
-      };
-
-      var setInnerHTML = function(element, html) {
-        var matches = [];
-        if (movesWhitespace) {
-          // Right now we only check for script tags with ids with the
-          // goal of targeting morphs.
-          html = html.replace(/(\s+)(<script id='([^']+)')/g, function(match, spaces, tag, id) {
-            matches.push([id, spaces]);
-            return tag;
-          });
-        }
-
-        element.innerHTML = html;
-
-        // If we have to do any whitespace adjustments do them now
-        if (matches.length > 0) {
-          var len = matches.length, idx;
-          for (idx=0; idx<len; idx++) {
-            var script = findChildById(element, matches[idx][0]),
-                node = document.createTextNode(matches[idx][1]);
-            script.parentNode.insertBefore(node, script);
-          }
-        }
-      };
-
-      /*
-       * Given a parent node and some HTML, generate a set of nodes. Return the first
-       * node, which will allow us to traverse the rest using nextSibling.
-       *
-       * We need to do this because innerHTML in IE does not really parse the nodes.
-       */
-      var firstNodeFor = function(parentNode, html) {
-        var wrapMap = Metamorph._wrapMap;
-        var arr = wrapMap[parentNode.tagName.toLowerCase()] || wrapMap._default;
-        var depth = arr[0], start = arr[1], end = arr[2];
-
-        if (needsShy) { html = '&shy;'+html; }
-
-        var element = document.createElement('div');
-
-        setInnerHTML(element, start + html + end);
-
-        for (var i=0; i<=depth; i++) {
-          element = element.firstChild;
-        }
-
-        // Look for &shy; to remove it.
-        if (needsShy) {
-          var shyElement = element;
-
-          // Sometimes we get nameless elements with the shy inside
-          while (shyElement.nodeType === 1 && !shyElement.nodeName) {
-            shyElement = shyElement.firstChild;
-          }
-
-          // At this point it's the actual unicode character.
-          if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
-            shyElement.nodeValue = shyElement.nodeValue.slice(1);
-          }
-        }
-
-        return element;
-      };
-
-      /*
-       * In some cases, Internet Explorer can create an anonymous node in
-       * the hierarchy with no tagName. You can create this scenario via:
-       *
-       *     div = document.createElement("div");
-       *     div.innerHTML = "<table>&shy<script></script><tr><td>hi</td></tr></table>";
-       *     div.firstChild.firstChild.tagName //=> ""
-       *
-       * If our script markers are inside such a node, we need to find that
-       * node and use *it* as the marker.
-       */
-      var realNode = function(start) {
-        while (start.parentNode.tagName === "") {
-          start = start.parentNode;
-        }
-
-        return start;
-      };
-
-      /*
-       * When automatically adding a tbody, Internet Explorer inserts the
-       * tbody immediately before the first <tr>. Other browsers create it
-       * before the first node, no matter what.
-       *
-       * This means the the following code:
-       *
-       *     div = document.createElement("div");
-       *     div.innerHTML = "<table><script id='first'></script><tr><td>hi</td></tr><script id='last'></script></table>
-       *
-       * Generates the following DOM in IE:
-       *
-       *     + div
-       *       + table
-       *         - script id='first'
-       *         + tbody
-       *           + tr
-       *             + td
-       *               - "hi"
-       *           - script id='last'
-       *
-       * Which means that the two script tags, even though they were
-       * inserted at the same point in the hierarchy in the original
-       * HTML, now have different parents.
-       *
-       * This code reparents the first script tag by making it the tbody's
-       * first child.
-       *
-       */
-      var fixParentage = function(start, end) {
-        if (start.parentNode !== end.parentNode) {
-          end.parentNode.insertBefore(start, end.parentNode.firstChild);
-        }
-      };
-
-      htmlFunc = function(html, outerToo) {
-        // get the real starting node. see realNode for details.
-        var start = realNode(document.getElementById(this.start));
-        var end = document.getElementById(this.end);
-        var parentNode = end.parentNode;
-        var node, nextSibling, last;
-
-        // make sure that the start and end nodes share the same
-        // parent. If not, fix it.
-        fixParentage(start, end);
-
-        // remove all of the nodes after the starting placeholder and
-        // before the ending placeholder.
-        node = start.nextSibling;
-        while (node) {
-          nextSibling = node.nextSibling;
-          last = node === end;
-
-          // if this is the last node, and we want to remove it as well,
-          // set the `end` node to the next sibling. This is because
-          // for the rest of the function, we insert the new nodes
-          // before the end (note that insertBefore(node, null) is
-          // the same as appendChild(node)).
-          //
-          // if we do not want to remove it, just break.
-          if (last) {
-            if (outerToo) { end = node.nextSibling; } else { break; }
-          }
-
-          node.parentNode.removeChild(node);
-
-          // if this is the last node and we didn't break before
-          // (because we wanted to remove the outer nodes), break
-          // now.
-          if (last) { break; }
-
-          node = nextSibling;
-        }
-
-        // get the first node for the HTML string, even in cases like
-        // tables and lists where a simple innerHTML on a div would
-        // swallow some of the content.
-        node = firstNodeFor(start.parentNode, html);
-
-        if (outerToo) {
-          start.parentNode.removeChild(start);
-        }
-
-        // copy the nodes for the HTML between the starting and ending
-        // placeholder.
-        while (node) {
-          nextSibling = node.nextSibling;
-          parentNode.insertBefore(node, end);
-          node = nextSibling;
-        }
-      };
-
-      // remove the nodes in the DOM representing this metamorph.
-      //
-      // this includes the starting and ending placeholders.
-      removeFunc = function() {
-        var start = realNode(document.getElementById(this.start));
-        var end = document.getElementById(this.end);
-
-        this.html('');
-        start.parentNode.removeChild(start);
-        end.parentNode.removeChild(end);
-      };
-
-      appendToFunc = function(parentNode) {
-        var node = firstNodeFor(parentNode, this.outerHTML());
-        var nextSibling;
-
-        while (node) {
-          nextSibling = node.nextSibling;
-          parentNode.appendChild(node);
-          node = nextSibling;
-        }
-      };
-
-      afterFunc = function(html) {
-        // get the real starting node. see realNode for details.
-        var end = document.getElementById(this.end);
-        var insertBefore = end.nextSibling;
-        var parentNode = end.parentNode;
-        var nextSibling;
-        var node;
-
-        // get the first node for the HTML string, even in cases like
-        // tables and lists where a simple innerHTML on a div would
-        // swallow some of the content.
-        node = firstNodeFor(parentNode, html);
-
-        // copy the nodes for the HTML between the starting and ending
-        // placeholder.
-        while (node) {
-          nextSibling = node.nextSibling;
-          parentNode.insertBefore(node, insertBefore);
-          node = nextSibling;
-        }
-      };
-
-      prependFunc = function(html) {
-        var start = document.getElementById(this.start);
-        var parentNode = start.parentNode;
-        var nextSibling;
-        var node;
-
-        node = firstNodeFor(parentNode, html);
-        var insertBefore = start.nextSibling;
-
-        while (node) {
-          nextSibling = node.nextSibling;
-          parentNode.insertBefore(node, insertBefore);
-          node = nextSibling;
-        }
+      prototype.createElement = function(tagName) {
+        return this.document.createElement(tagName);
       };
     }
 
-    Metamorph.prototype.html = function(html) {
-      this.checkRemoved();
-      if (html === undefined) { return this.innerHTML; }
-
-      htmlFunc.call(this, html);
-
-      this.innerHTML = html;
+    prototype.setNamespace = function(ns) {
+      this.namespace = ns;
     };
 
-    Metamorph.prototype.replaceWith = function(html) {
-      this.checkRemoved();
-      htmlFunc.call(this, html, true);
+    prototype.detectNamespace = function(element) {
+      this.namespace = interiorNamespace(element);
     };
 
-    Metamorph.prototype.remove = removeFunc;
-    Metamorph.prototype.outerHTML = outerHTMLFunc;
-    Metamorph.prototype.appendTo = appendToFunc;
-    Metamorph.prototype.after = afterFunc;
-    Metamorph.prototype.prepend = prependFunc;
-    Metamorph.prototype.startTag = startTagFunc;
-    Metamorph.prototype.endTag = endTagFunc;
-
-    Metamorph.prototype.isRemoved = function() {
-      var before = document.getElementById(this.start);
-      var after = document.getElementById(this.end);
-
-      return !before || !after;
+    prototype.createDocumentFragment = function(){
+      return this.document.createDocumentFragment();
     };
 
-    Metamorph.prototype.checkRemoved = function() {
-      if (this.isRemoved()) {
-        throw new Error("Cannot perform operations on a Metamorph that is not in the DOM.");
+    prototype.createTextNode = function(text){
+      return this.document.createTextNode(text);
+    };
+
+    prototype.repairClonedNode = function(element, blankChildTextNodes, isChecked){
+      if (deletesBlankTextNodes && blankChildTextNodes.length > 0) {
+        for (var i=0, len=blankChildTextNodes.length;i<len;i++){
+          var textNode = this.document.createTextNode(''),
+              offset = blankChildTextNodes[i],
+              before = element.childNodes[offset];
+          if (before) {
+            element.insertBefore(textNode, before);
+          } else {
+            element.appendChild(textNode);
+          }
+        }
+      }
+      if (ignoresCheckedAttribute && isChecked) {
+        element.setAttribute('checked', 'checked');
       }
     };
 
-    return Metamorph;
-  });
+    prototype.cloneNode = function(element, deep){
+      var clone = element.cloneNode(!!deep);
+      return clone;
+    };
 
-define("route-recognizer",
+    prototype.createMorph = function(parent, start, end, contextualElement){
+      if (!contextualElement && parent.nodeType === 1) {
+        contextualElement = parent;
+      }
+      return new Morph(parent, start, end, this, contextualElement);
+    };
+
+    // This helper is just to keep the templates good looking,
+    // passing integers instead of element references.
+    prototype.createMorphAt = function(parent, startIndex, endIndex, contextualElement){
+      var childNodes = parent.childNodes,
+          start = startIndex === -1 ? null : childNodes[startIndex],
+          end = endIndex === -1 ? null : childNodes[endIndex];
+      return this.createMorph(parent, start, end, contextualElement);
+    };
+
+    prototype.insertMorphBefore = function(element, referenceChild, contextualElement) {
+      var start = this.document.createTextNode('');
+      var end = this.document.createTextNode('');
+      element.insertBefore(start, referenceChild);
+      element.insertBefore(end, referenceChild);
+      return this.createMorph(element, start, end, contextualElement);
+    };
+
+    prototype.appendMorph = function(element, contextualElement) {
+      var start = this.document.createTextNode('');
+      var end = this.document.createTextNode('');
+      element.appendChild(start);
+      element.appendChild(end);
+      return this.createMorph(element, start, end, contextualElement);
+    };
+
+    prototype.parseHTML = function(html, contextualElement) {
+      var isSVGContent = (
+        isSVG(this.namespace) &&
+        !svgHTMLIntegrationPoints[contextualElement.tagName]
+      );
+
+      if (isSVGContent) {
+        return buildSVGDOM(html, this);
+      } else {
+        var nodes = buildHTMLDOM(html, contextualElement, this);
+        if (detectOmittedStartTag(html, contextualElement)) {
+          var node = nodes[0];
+          while (node && node.nodeType !== 1) {
+            node = node.nextSibling;
+          }
+          return node.childNodes;
+        } else {
+          return nodes;
+        }
+      }
+    };
+
+    __exports__["default"] = DOMHelper;
+  });
+enifed("morph/dom-helper/build-html-dom",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var svgHTMLIntegrationPoints = {foreignObject: 1, desc: 1, title: 1};
+    __exports__.svgHTMLIntegrationPoints = svgHTMLIntegrationPoints;var svgNamespace = 'http://www.w3.org/2000/svg';
+    __exports__.svgNamespace = svgNamespace;
+    // Safari does not like using innerHTML on SVG HTML integration
+    // points (desc/title/foreignObject).
+    var needsIntegrationPointFix = document && document.createElementNS && (function() {
+      // In FF title will not accept innerHTML.
+      var testEl = document.createElementNS(svgNamespace, 'title');
+      testEl.innerHTML = "<div></div>";
+      return testEl.childNodes.length === 0 || testEl.childNodes[0].nodeType !== 1;
+    })();
+
+    // Internet Explorer prior to 9 does not allow setting innerHTML if the first element
+    // is a "zero-scope" element. This problem can be worked around by making
+    // the first node an invisible text node. We, like Modernizr, use &shy;
+    var needsShy = document && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "<div></div>";
+      testEl.firstChild.innerHTML = "<script><\/script>";
+      return testEl.firstChild.innerHTML === '';
+    })();
+
+    // IE 8 (and likely earlier) likes to move whitespace preceeding
+    // a script tag to appear after it. This means that we can
+    // accidentally remove whitespace when updating a morph.
+    var movesWhitespace = document && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "Test: <script type='text/x-placeholder'><\/script>Value";
+      return testEl.childNodes[0].nodeValue === 'Test:' &&
+              testEl.childNodes[2].nodeValue === ' Value';
+    })();
+
+    // IE8 create a selected attribute where they should only
+    // create a property
+    var createsSelectedAttribute = document && (function() {
+      var testEl = document.createElement('div');
+      testEl.innerHTML = "<select><option></option></select>";
+      return testEl.childNodes[0].childNodes[0].getAttribute('selected') === 'selected';
+    })();
+
+    var detectAutoSelectedOption;
+    if (createsSelectedAttribute) {
+      var detectAutoSelectedOptionRegex = /<option[^>]*selected/;
+      detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
+        return select.selectedIndex === 0 &&
+               !detectAutoSelectedOptionRegex.test(html);
+      };
+    } else {
+      detectAutoSelectedOption = function detectAutoSelectedOption(select, option, html) { //jshint ignore:line
+        var selectedAttribute = option.getAttribute('selected');
+        return select.selectedIndex === 0 && (
+                 selectedAttribute === null ||
+                 ( selectedAttribute !== '' && selectedAttribute.toLowerCase() !== 'selected' )
+                );
+      };
+    }
+
+    // IE 9 and earlier don't allow us to set innerHTML on col, colgroup, frameset,
+    // html, style, table, tbody, tfoot, thead, title, tr. Detect this and add
+    // them to an initial list of corrected tags.
+    //
+    // Here we are only dealing with the ones which can have child nodes.
+    //
+    var tagNamesRequiringInnerHTMLFix, tableNeedsInnerHTMLFix;
+    var tableInnerHTMLTestElement = document.createElement('table');
+    try {
+      tableInnerHTMLTestElement.innerHTML = '<tbody></tbody>';
+    } catch (e) {
+    } finally {
+      tableNeedsInnerHTMLFix = (tableInnerHTMLTestElement.childNodes.length === 0);
+    }
+    if (tableNeedsInnerHTMLFix) {
+      tagNamesRequiringInnerHTMLFix = {
+        colgroup: ['table'],
+        table: [],
+        tbody: ['table'],
+        tfoot: ['table'],
+        thead: ['table'],
+        tr: ['table', 'tbody']
+      };
+    }
+
+    // IE 8 doesn't allow setting innerHTML on a select tag. Detect this and
+    // add it to the list of corrected tags.
+    //
+    var selectInnerHTMLTestElement = document.createElement('select');
+    selectInnerHTMLTestElement.innerHTML = '<option></option>';
+    if (selectInnerHTMLTestElement) {
+      tagNamesRequiringInnerHTMLFix = tagNamesRequiringInnerHTMLFix || {};
+      tagNamesRequiringInnerHTMLFix.select = [];
+    }
+
+    function scriptSafeInnerHTML(element, html) {
+      // without a leading text node, IE will drop a leading script tag.
+      html = '&shy;'+html;
+
+      element.innerHTML = html;
+
+      var nodes = element.childNodes;
+
+      // Look for &shy; to remove it.
+      var shyElement = nodes[0];
+      while (shyElement.nodeType === 1 && !shyElement.nodeName) {
+        shyElement = shyElement.firstChild;
+      }
+      // At this point it's the actual unicode character.
+      if (shyElement.nodeType === 3 && shyElement.nodeValue.charAt(0) === "\u00AD") {
+        var newValue = shyElement.nodeValue.slice(1);
+        if (newValue.length) {
+          shyElement.nodeValue = shyElement.nodeValue.slice(1);
+        } else {
+          shyElement.parentNode.removeChild(shyElement);
+        }
+      }
+
+      return nodes;
+    }
+
+    function buildDOMWithFix(html, contextualElement){
+      var tagName = contextualElement.tagName;
+
+      // Firefox versions < 11 do not have support for element.outerHTML.
+      var outerHTML = contextualElement.outerHTML || new XMLSerializer().serializeToString(contextualElement);
+      if (!outerHTML) {
+        throw "Can't set innerHTML on "+tagName+" in this browser";
+      }
+
+      var wrappingTags = tagNamesRequiringInnerHTMLFix[tagName.toLowerCase()];
+      var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0];
+      var endTag = '</'+tagName+'>';
+
+      var wrappedHTML = [startTag, html, endTag];
+
+      var i = wrappingTags.length;
+      var wrappedDepth = 1 + i;
+      while(i--) {
+        wrappedHTML.unshift('<'+wrappingTags[i]+'>');
+        wrappedHTML.push('</'+wrappingTags[i]+'>');
+      }
+
+      var wrapper = document.createElement('div');
+      scriptSafeInnerHTML(wrapper, wrappedHTML.join(''));
+      var element = wrapper;
+      while (wrappedDepth--) {
+        element = element.firstChild;
+        while (element && element.nodeType !== 1) {
+          element = element.nextSibling;
+        }
+      }
+      while (element && element.tagName !== tagName) {
+        element = element.nextSibling;
+      }
+      return element ? element.childNodes : [];
+    }
+
+    var buildDOM;
+    if (needsShy) {
+      buildDOM = function buildDOM(html, contextualElement, dom){
+        contextualElement = dom.cloneNode(contextualElement, false);
+        scriptSafeInnerHTML(contextualElement, html);
+        return contextualElement.childNodes;
+      };
+    } else {
+      buildDOM = function buildDOM(html, contextualElement, dom){
+        contextualElement = dom.cloneNode(contextualElement, false);
+        contextualElement.innerHTML = html;
+        return contextualElement.childNodes;
+      };
+    }
+
+    var buildIESafeDOM;
+    if (tagNamesRequiringInnerHTMLFix || movesWhitespace) {
+      buildIESafeDOM = function buildIESafeDOM(html, contextualElement, dom) {
+        // Make a list of the leading text on script nodes. Include
+        // script tags without any whitespace for easier processing later.
+        var spacesBefore = [];
+        var spacesAfter = [];
+        html = html.replace(/(\s*)(<script)/g, function(match, spaces, tag) {
+          spacesBefore.push(spaces);
+          return tag;
+        });
+
+        html = html.replace(/(<\/script>)(\s*)/g, function(match, tag, spaces) {
+          spacesAfter.push(spaces);
+          return tag;
+        });
+
+        // Fetch nodes
+        var nodes;
+        if (tagNamesRequiringInnerHTMLFix[contextualElement.tagName.toLowerCase()]) {
+          // buildDOMWithFix uses string wrappers for problematic innerHTML.
+          nodes = buildDOMWithFix(html, contextualElement);
+        } else {
+          nodes = buildDOM(html, contextualElement, dom);
+        }
+
+        // Build a list of script tags, the nodes themselves will be
+        // mutated as we add test nodes.
+        var i, j, node, nodeScriptNodes;
+        var scriptNodes = [];
+        for (i=0;node=nodes[i];i++) {
+          if (node.nodeType !== 1) {
+            continue;
+          }
+          if (node.tagName === 'SCRIPT') {
+            scriptNodes.push(node);
+          } else {
+            nodeScriptNodes = node.getElementsByTagName('script');
+            for (j=0;j<nodeScriptNodes.length;j++) {
+              scriptNodes.push(nodeScriptNodes[j]);
+            }
+          }
+        }
+
+        // Walk the script tags and put back their leading text nodes.
+        var scriptNode, textNode, spaceBefore, spaceAfter;
+        for (i=0;scriptNode=scriptNodes[i];i++) {
+          spaceBefore = spacesBefore[i];
+          if (spaceBefore && spaceBefore.length > 0) {
+            textNode = dom.document.createTextNode(spaceBefore);
+            scriptNode.parentNode.insertBefore(textNode, scriptNode);
+          }
+
+          spaceAfter = spacesAfter[i];
+          if (spaceAfter && spaceAfter.length > 0) {
+            textNode = dom.document.createTextNode(spaceAfter);
+            scriptNode.parentNode.insertBefore(textNode, scriptNode.nextSibling);
+          }
+        }
+
+        return nodes;
+      };
+    } else {
+      buildIESafeDOM = buildDOM;
+    }
+
+    // When parsing innerHTML, the browser may set up DOM with some things
+    // not desired. For example, with a select element context and option
+    // innerHTML the first option will be marked selected.
+    //
+    // This method cleans up some of that, resetting those values back to
+    // their defaults.
+    //
+    function buildSafeDOM(html, contextualElement, dom) {
+      var childNodes = buildIESafeDOM(html, contextualElement, dom);
+
+      if (contextualElement.tagName === 'SELECT') {
+        // Walk child nodes
+        for (var i = 0; childNodes[i]; i++) {
+          // Find and process the first option child node
+          if (childNodes[i].tagName === 'OPTION') {
+            if (detectAutoSelectedOption(childNodes[i].parentNode, childNodes[i], html)) {
+              // If the first node is selected but does not have an attribute,
+              // presume it is not really selected.
+              childNodes[i].parentNode.selectedIndex = -1;
+            }
+            break;
+          }
+        }
+      }
+
+      return childNodes;
+    }
+
+    var buildHTMLDOM;
+    if (needsIntegrationPointFix) {
+      buildHTMLDOM = function buildHTMLDOM(html, contextualElement, dom){
+        if (svgHTMLIntegrationPoints[contextualElement.tagName]) {
+          return buildSafeDOM(html, document.createElement('div'), dom);
+        } else {
+          return buildSafeDOM(html, contextualElement, dom);
+        }
+      };
+    } else {
+      buildHTMLDOM = buildSafeDOM;
+    }
+
+    __exports__.buildHTMLDOM = buildHTMLDOM;
+  });
+enifed("morph/morph",
+  ["exports"],
+  function(__exports__) {
+    "use strict";
+    var splice = Array.prototype.splice;
+
+    function ensureStartEnd(start, end) {
+      if (start === null || end === null) {
+        throw new Error('a fragment parent must have boundary nodes in order to detect insertion');
+      }
+    }
+
+    function ensureContext(contextualElement) {
+      if (!contextualElement || contextualElement.nodeType !== 1) {
+        throw new Error('An element node must be provided for a contextualElement, you provided ' +
+                        (contextualElement ? 'nodeType ' + contextualElement.nodeType : 'nothing'));
+      }
+    }
+
+    // TODO: this is an internal API, this should be an assert
+    function Morph(parent, start, end, domHelper, contextualElement) {
+      if (parent.nodeType === 11) {
+        ensureStartEnd(start, end);
+        this.element = null;
+      } else {
+        this.element = parent;
+      }
+      this._parent = parent;
+      this.start = start;
+      this.end = end;
+      this.domHelper = domHelper;
+      ensureContext(contextualElement);
+      this.contextualElement = contextualElement;
+      this.reset();
+    }
+
+    Morph.prototype.reset = function() {
+      this.text = null;
+      this.owner = null;
+      this.morphs = null;
+      this.before = null;
+      this.after = null;
+      this.escaped = true;
+    };
+
+    Morph.prototype.parent = function () {
+      if (!this.element) {
+        var parent = this.start.parentNode;
+        if (this._parent !== parent) {
+          this.element = this._parent = parent;
+        }
+      }
+      return this._parent;
+    };
+
+    Morph.prototype.destroy = function () {
+      if (this.owner) {
+        this.owner.removeMorph(this);
+      } else {
+        clear(this.element || this.parent(), this.start, this.end);
+      }
+    };
+
+    Morph.prototype.removeMorph = function (morph) {
+      var morphs = this.morphs;
+      for (var i=0, l=morphs.length; i<l; i++) {
+        if (morphs[i] === morph) {
+          this.replace(i, 1);
+          break;
+        }
+      }
+    };
+
+    Morph.prototype.update = function (nodeOrString) {
+      this._update(this.element || this.parent(), nodeOrString);
+    };
+
+    Morph.prototype.updateNode = function (node) {
+      var parent = this.element || this.parent();
+      if (!node) return this._updateText(parent, '');
+      this._updateNode(parent, node);
+    };
+
+    Morph.prototype.updateText = function (text) {
+      this._updateText(this.element || this.parent(), text);
+    };
+
+    Morph.prototype.updateHTML = function (html) {
+      var parent = this.element || this.parent();
+      if (!html) return this._updateText(parent, '');
+      this._updateHTML(parent, html);
+    };
+
+    Morph.prototype._update = function (parent, nodeOrString) {
+      if (nodeOrString === null || nodeOrString === undefined) {
+        this._updateText(parent, '');
+      } else if (typeof nodeOrString === 'string') {
+        if (this.escaped) {
+          this._updateText(parent, nodeOrString);
+        } else {
+          this._updateHTML(parent, nodeOrString);
+        }
+      } else if (nodeOrString.nodeType) {
+        this._updateNode(parent, nodeOrString);
+      } else if (nodeOrString.string) { // duck typed SafeString
+        this._updateHTML(parent, nodeOrString.string);
+      } else {
+        this._updateText(parent, nodeOrString.toString());
+      }
+    };
+
+    Morph.prototype._updateNode = function (parent, node) {
+      if (this.text) {
+        if (node.nodeType === 3) {
+          this.text.nodeValue = node.nodeValue;
+          return;
+        } else {
+          this.text = null;
+        }
+      }
+      var start = this.start, end = this.end;
+      clear(parent, start, end);
+      parent.insertBefore(node, end);
+      if (this.before !== null) {
+        this.before.end = start.nextSibling;
+      }
+      if (this.after !== null) {
+        this.after.start = end.previousSibling;
+      }
+    };
+
+    Morph.prototype._updateText = function (parent, text) {
+      if (this.text) {
+        this.text.nodeValue = text;
+        return;
+      }
+      var node = this.domHelper.createTextNode(text);
+      this.text = node;
+      clear(parent, this.start, this.end);
+      parent.insertBefore(node, this.end);
+      if (this.before !== null) {
+        this.before.end = node;
+      }
+      if (this.after !== null) {
+        this.after.start = node;
+      }
+    };
+
+    Morph.prototype._updateHTML = function (parent, html) {
+      var start = this.start, end = this.end;
+      clear(parent, start, end);
+      this.text = null;
+      var childNodes = this.domHelper.parseHTML(html, this.contextualElement);
+      appendChildren(parent, end, childNodes);
+      if (this.before !== null) {
+        this.before.end = start.nextSibling;
+      }
+      if (this.after !== null) {
+        this.after.start = end.previousSibling;
+      }
+    };
+
+    Morph.prototype.append = function (node) {
+      if (this.morphs === null) this.morphs = [];
+      var index = this.morphs.length;
+      return this.insert(index, node);
+    };
+
+    Morph.prototype.insert = function (index, node) {
+      if (this.morphs === null) this.morphs = [];
+      var parent = this.element || this.parent();
+      var morphs = this.morphs;
+      var before = index > 0 ? morphs[index-1] : null;
+      var after  = index < morphs.length ? morphs[index] : null;
+      var start  = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
+      var end    = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
+      var morph  = new Morph(parent, start, end, this.domHelper, this.contextualElement);
+
+      morph.owner = this;
+      morph._update(parent, node);
+
+      if (before !== null) {
+        morph.before = before;
+        before.end = start.nextSibling;
+        before.after = morph;
+      }
+
+      if (after !== null) {
+        morph.after = after;
+        after.before = morph;
+        after.start = end.previousSibling;
+      }
+
+      this.morphs.splice(index, 0, morph);
+      return morph;
+    };
+
+    Morph.prototype.replace = function (index, removedLength, addedNodes) {
+      if (this.morphs === null) this.morphs = [];
+      var parent = this.element || this.parent();
+      var morphs = this.morphs;
+      var before = index > 0 ? morphs[index-1] : null;
+      var after = index+removedLength < morphs.length ? morphs[index+removedLength] : null;
+      var start = before === null ? this.start : (before.end === null ? parent.lastChild : before.end.previousSibling);
+      var end   = after === null ? this.end : (after.start === null ? parent.firstChild : after.start.nextSibling);
+      var addedLength = addedNodes === undefined ? 0 : addedNodes.length;
+      var args, i, current;
+
+      if (removedLength > 0) {
+        clear(parent, start, end);
+      }
+
+      if (addedLength === 0) {
+        if (before !== null) {
+          before.after = after;
+          before.end = end;
+        }
+        if (after !== null) {
+          after.before = before;
+          after.start = start;
+        }
+        morphs.splice(index, removedLength);
+        return;
+      }
+
+      args = new Array(addedLength+2);
+      if (addedLength > 0) {
+        for (i=0; i<addedLength; i++) {
+          args[i+2] = current = new Morph(parent, start, end, this.domHelper, this.contextualElement);
+          current._update(parent, addedNodes[i]);
+          current.owner = this;
+          if (before !== null) {
+            current.before = before;
+            before.end = start.nextSibling;
+            before.after = current;
+          }
+          before = current;
+          start = end === null ? parent.lastChild : end.previousSibling;
+        }
+        if (after !== null) {
+          current.after = after;
+          after.before = current;
+          after.start = end.previousSibling;
+        }
+      }
+
+      args[0] = index;
+      args[1] = removedLength;
+
+      splice.apply(morphs, args);
+    };
+
+    function appendChildren(parent, end, nodeList) {
+      var ref = end;
+      var i = nodeList.length;
+      var node;
+
+      while (i--) {
+        node = nodeList[i];
+        parent.insertBefore(node, ref);
+        ref = node;
+      }
+    }
+
+    function clear(parent, start, end) {
+      var current, previous;
+      if (end === null) {
+        current = parent.lastChild;
+      } else {
+        current = end.previousSibling;
+      }
+
+      while (current !== null && current !== start) {
+        previous = current.previousSibling;
+        parent.removeChild(current);
+        current = previous;
+      }
+    }
+
+    __exports__["default"] = Morph;
+  });
+enifed("route-recognizer",
   ["route-recognizer/dsl","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -41688,7 +43032,7 @@ define("route-recognizer",
 
     __exports__["default"] = RouteRecognizer;
   });
-define("route-recognizer/dsl",
+enifed("route-recognizer/dsl",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -41792,8 +43136,15 @@ define("route-recognizer/dsl",
       }, this);
     }
   });
+enifed("router",
+  ["./router/router","exports"],
+  function(__dependency1__, __exports__) {
+    "use strict";
+    var Router = __dependency1__["default"];
 
-define("router/handler-info",
+    __exports__["default"] = Router;
+  });
+enifed("router/handler-info",
   ["./utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -41970,7 +43321,7 @@ define("router/handler-info",
 
     __exports__["default"] = HandlerInfo;
   });
-define("router/handler-info/factory",
+enifed("router/handler-info/factory",
   ["router/handler-info/resolved-handler-info","router/handler-info/unresolved-handler-info-by-object","router/handler-info/unresolved-handler-info-by-param","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -41993,7 +43344,7 @@ define("router/handler-info/factory",
 
     __exports__["default"] = handlerInfoFactory;
   });
-define("router/handler-info/resolved-handler-info",
+enifed("router/handler-info/resolved-handler-info",
   ["../handler-info","router/utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -42024,7 +43375,7 @@ define("router/handler-info/resolved-handler-info",
 
     __exports__["default"] = ResolvedHandlerInfo;
   });
-define("router/handler-info/unresolved-handler-info-by-object",
+enifed("router/handler-info/unresolved-handler-info-by-object",
   ["../handler-info","router/utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -42086,7 +43437,7 @@ define("router/handler-info/unresolved-handler-info-by-object",
 
     __exports__["default"] = UnresolvedHandlerInfoByObject;
   });
-define("router/handler-info/unresolved-handler-info-by-param",
+enifed("router/handler-info/unresolved-handler-info-by-param",
   ["../handler-info","router/utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -42120,7 +43471,7 @@ define("router/handler-info/unresolved-handler-info-by-param",
 
     __exports__["default"] = UnresolvedHandlerInfoByParam;
   });
-define("router/router",
+enifed("router/router",
   ["route-recognizer","rsvp/promise","./utils","./transition-state","./transition","./transition-intent/named-transition-intent","./transition-intent/url-transition-intent","./handler-info","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -42151,6 +43502,58 @@ define("router/router",
       this.reset();
     }
 
+    function getTransitionByIntent(intent, isIntermediate) {
+      var wasTransitioning = !!this.activeTransition;
+      var oldState = wasTransitioning ? this.activeTransition.state : this.state;
+      var newTransition;
+
+      var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
+      var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
+
+      if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
+
+        // This is a no-op transition. See if query params changed.
+        if (queryParamChangelist) {
+          newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
+          if (newTransition) {
+            return newTransition;
+          }
+        }
+
+        // No-op. No need to create a new transition.
+        return new Transition(this);
+      }
+
+      if (isIntermediate) {
+        setupContexts(this, newState);
+        return;
+      }
+
+      // Create a new transition to the destination route.
+      newTransition = new Transition(this, intent, newState);
+
+      // Abort and usurp any previously active transition.
+      if (this.activeTransition) {
+        this.activeTransition.abort();
+      }
+      this.activeTransition = newTransition;
+
+      // Transition promises by default resolve with resolved state.
+      // For our purposes, swap out the promise to resolve
+      // after the transition has been finalized.
+      newTransition.promise = newTransition.promise.then(function(result) {
+        return finalizeTransition(newTransition, result.state);
+      }, null, promiseLabel("Settle transition promise when transition is finalized"));
+
+      if (!wasTransitioning) {
+        notifyExistingHandlers(this, newState, newTransition);
+      }
+
+      fireQueryParamDidChange(this, newState, queryParamChangelist);
+
+      return newTransition;
+    }
+
     Router.prototype = {
 
       /**
@@ -42215,58 +43618,8 @@ define("router/router",
       // it shall remain until our ES6 transpiler can
       // handle cyclical deps.
       transitionByIntent: function(intent, isIntermediate) {
-
-        var wasTransitioning = !!this.activeTransition;
-        var oldState = wasTransitioning ? this.activeTransition.state : this.state;
-        var newTransition;
-        var router = this;
-
         try {
-          var newState = intent.applyToState(oldState, this.recognizer, this.getHandler, isIntermediate);
-          var queryParamChangelist = getChangelist(oldState.queryParams, newState.queryParams);
-
-          if (handlerInfosEqual(newState.handlerInfos, oldState.handlerInfos)) {
-
-            // This is a no-op transition. See if query params changed.
-            if (queryParamChangelist) {
-              newTransition = this.queryParamsTransition(queryParamChangelist, wasTransitioning, oldState, newState);
-              if (newTransition) {
-                return newTransition;
-              }
-            }
-
-            // No-op. No need to create a new transition.
-            return new Transition(this);
-          }
-
-          if (isIntermediate) {
-            setupContexts(this, newState);
-            return;
-          }
-
-          // Create a new transition to the destination route.
-          newTransition = new Transition(this, intent, newState);
-
-          // Abort and usurp any previously active transition.
-          if (this.activeTransition) {
-            this.activeTransition.abort();
-          }
-          this.activeTransition = newTransition;
-
-          // Transition promises by default resolve with resolved state.
-          // For our purposes, swap out the promise to resolve
-          // after the transition has been finalized.
-          newTransition.promise = newTransition.promise.then(function(result) {
-            return finalizeTransition(newTransition, result.state);
-          }, null, promiseLabel("Settle transition promise when transition is finalized"));
-
-          if (!wasTransitioning) {
-            notifyExistingHandlers(this, newState, newTransition);
-          }
-
-          fireQueryParamDidChange(this, newState, queryParamChangelist);
-
-          return newTransition;
+          return getTransitionByIntent.apply(this, arguments);
         } catch(e) {
           return new Transition(this, intent, null, e);
         }
@@ -42608,7 +43961,9 @@ define("router/router",
       var handler = handlerInfo.handler,
           context = handlerInfo.context;
 
-      callHook(handler, 'enter', transition);
+      if (enter) {
+        callHook(handler, 'enter', transition);
+      }
       if (transition && transition.isAborted) {
         throw new TransitionAborted();
       }
@@ -42937,7 +44292,7 @@ define("router/router",
 
     __exports__["default"] = Router;
   });
-define("router/transition-intent",
+enifed("router/transition-intent",
   ["./utils","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -42957,7 +44312,7 @@ define("router/transition-intent",
 
     __exports__["default"] = TransitionIntent;
   });
-define("router/transition-intent/named-transition-intent",
+enifed("router/transition-intent/named-transition-intent",
   ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -43158,7 +44513,7 @@ define("router/transition-intent/named-transition-intent",
       }
     });
   });
-define("router/transition-intent/url-transition-intent",
+enifed("router/transition-intent/url-transition-intent",
   ["../transition-intent","../transition-state","../handler-info/factory","../utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -43228,7 +44583,7 @@ define("router/transition-intent/url-transition-intent",
       this.name = "UnrecognizedURLError";
     }
   });
-define("router/transition-state",
+enifed("router/transition-state",
   ["./handler-info","./utils","rsvp/promise","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -43344,7 +44699,7 @@ define("router/transition-state",
 
     __exports__["default"] = TransitionState;
   });
-define("router/transition",
+enifed("router/transition",
   ["rsvp/promise","./handler-info","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -43655,7 +45010,7 @@ define("router/transition",
     __exports__.logAbort = logAbort;
     __exports__.TransitionAborted = TransitionAborted;
   });
-define("router/utils",
+enifed("router/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -43874,16 +45229,7 @@ define("router/utils",
     __exports__.resolveHook = resolveHook;
     __exports__.applyHook = applyHook;
   });
-define("router",
-  ["./router/router","exports"],
-  function(__dependency1__, __exports__) {
-    "use strict";
-    var Router = __dependency1__["default"];
-
-    __exports__["default"] = Router;
-  });
-
-define("rsvp",
+enifed("rsvp",
   ["./rsvp/promise","./rsvp/events","./rsvp/node","./rsvp/all","./rsvp/all-settled","./rsvp/race","./rsvp/hash","./rsvp/hash-settled","./rsvp/rethrow","./rsvp/defer","./rsvp/config","./rsvp/map","./rsvp/resolve","./rsvp/reject","./rsvp/filter","./rsvp/asap","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __dependency11__, __dependency12__, __dependency13__, __dependency14__, __dependency15__, __dependency16__, __exports__) {
     "use strict";
@@ -43950,7 +45296,7 @@ define("rsvp",
     __exports__.map = map;
     __exports__.filter = filter;
   });
-define("rsvp.umd",
+enifed("rsvp.umd",
   ["./rsvp"],
   function(__dependency1__) {
     "use strict";
@@ -43995,15 +45341,15 @@ define("rsvp.umd",
     };
 
     /* global define:true module:true window: true */
-    if (typeof define === 'function' && define.amd) {
-      define(function() { return RSVP; });
-    } else if (typeof module !== 'undefined' && module.exports) {
-      module.exports = RSVP;
+    if (typeof enifed === 'function' && enifed['amd']) {
+      enifed(function() { return RSVP; });
+    } else if (typeof module !== 'undefined' && module['exports']) {
+      module['exports'] = RSVP;
     } else if (typeof this !== 'undefined') {
       this['RSVP'] = RSVP;
     }
   });
-define("rsvp/-internal",
+enifed("rsvp/-internal",
   ["./utils","./instrument","./config","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -44014,6 +45360,10 @@ define("rsvp/-internal",
 
     var config = __dependency3__.config;
 
+    function  withOwnPromise() {
+      return new TypeError('A promises callback cannot return that same promise.');
+    }
+
     function noop() {}
 
     var PENDING   = void 0;
@@ -44213,7 +45563,7 @@ define("rsvp/-internal",
         }
 
         if (promise === value) {
-          reject(promise, new TypeError('A promises callback cannot return that same promise.'));
+          reject(promise, withOwnPromise());
           return;
         }
 
@@ -44260,7 +45610,7 @@ define("rsvp/-internal",
     __exports__.REJECTED = REJECTED;
     __exports__.PENDING = PENDING;
   });
-define("rsvp/all-settled",
+enifed("rsvp/all-settled",
   ["./enumerator","./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -44336,7 +45686,7 @@ define("rsvp/all-settled",
       return new AllSettled(Promise, entries, label).promise;
     }
   });
-define("rsvp/all",
+enifed("rsvp/all",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -44356,7 +45706,7 @@ define("rsvp/all",
       return Promise.all(array, label);
     }
   });
-define("rsvp/asap",
+enifed("rsvp/asap",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -44374,7 +45724,8 @@ define("rsvp/asap",
       }
     }
 
-    var browserGlobal = (typeof window !== 'undefined') ? window : {};
+    var browserWindow = (typeof window !== 'undefined') ? window : undefined
+    var browserGlobal = browserWindow || {};
     var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
 
     // test for web worker but not in IE10
@@ -44389,6 +45740,13 @@ define("rsvp/asap",
       };
     }
 
+    // vertx
+    function useVertxTimer() {
+      return function() {
+        vertxNext(flush);
+      };
+    }
+
     function useMutationObserver() {
       var iterations = 0;
       var observer = new BrowserMutationObserver(flush);
@@ -44430,8 +45788,17 @@ define("rsvp/asap",
       len = 0;
     }
 
-    var scheduleFlush;
+    function attemptVertex() {
+      try {
+        var vertx = eriuqer('vertx');
+        var vertxNext = vertx.runOnLoop || vertx.runOnContext;
+        return useVertxTimer();
+      } catch(e) {
+        return useSetTimeout();
+      }
+    }
 
+    var scheduleFlush;
     // Decide what async method to use to triggering processing of queued callbacks:
     if (typeof process !== 'undefined' && {}.toString.call(process) === '[object process]') {
       scheduleFlush = useNextTick();
@@ -44439,11 +45806,13 @@ define("rsvp/asap",
       scheduleFlush = useMutationObserver();
     } else if (isWorker) {
       scheduleFlush = useMessageChannel();
+    } else if (browserWindow === undefined && typeof eriuqer === 'function') {
+      scheduleFlush = attemptVertex();
     } else {
       scheduleFlush = useSetTimeout();
     }
   });
-define("rsvp/config",
+enifed("rsvp/config",
   ["./events","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -44474,7 +45843,7 @@ define("rsvp/config",
     __exports__.config = config;
     __exports__.configure = configure;
   });
-define("rsvp/defer",
+enifed("rsvp/defer",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -44516,15 +45885,15 @@ define("rsvp/defer",
     __exports__["default"] = function defer(label) {
       var deferred = { };
 
-      deferred.promise = new Promise(function(resolve, reject) {
-        deferred.resolve = resolve;
-        deferred.reject = reject;
+      deferred['promise'] = new Promise(function(resolve, reject) {
+        deferred['resolve'] = resolve;
+        deferred['reject'] = reject;
       }, label);
 
       return deferred;
     }
   });
-define("rsvp/enumerator",
+enifed("rsvp/enumerator",
   ["./utils","./-internal","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -44650,7 +46019,7 @@ define("rsvp/enumerator",
       });
     };
   });
-define("rsvp/events",
+enifed("rsvp/events",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -44856,7 +46225,7 @@ define("rsvp/events",
       }
     };
   });
-define("rsvp/filter",
+enifed("rsvp/filter",
   ["./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -44979,7 +46348,7 @@ define("rsvp/filter",
       });
     }
   });
-define("rsvp/hash-settled",
+enifed("rsvp/hash-settled",
   ["./promise","./enumerator","./promise-hash","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __exports__) {
     "use strict";
@@ -45106,7 +46475,7 @@ define("rsvp/hash-settled",
       return new HashSettled(Promise, object, label).promise;
     }
   });
-define("rsvp/hash",
+enifed("rsvp/hash",
   ["./promise","./promise-hash","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -45205,7 +46574,7 @@ define("rsvp/hash",
       return new PromiseHash(Promise, object, label).promise;
     }
   });
-define("rsvp/instrument",
+enifed("rsvp/instrument",
   ["./config","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -45214,31 +46583,44 @@ define("rsvp/instrument",
 
     var queue = [];
 
+    function scheduleFlush() {
+      setTimeout(function() {
+        var entry;
+        for (var i = 0; i < queue.length; i++) {
+          entry = queue[i];
+
+          var payload = entry.payload;
+
+          payload.guid = payload.key + payload.id;
+          payload.childGuid = payload.key + payload.childId;
+          if (payload.error) {
+            payload.stack = payload.error.stack;
+          }
+
+          config.trigger(entry.name, entry.payload);
+        }
+        queue.length = 0;
+      }, 50);
+    }
+
     __exports__["default"] = function instrument(eventName, promise, child) {
       if (1 === queue.push({
           name: eventName,
           payload: {
-            guid: promise._guidKey + promise._id,
+            key: promise._guidKey,
+            id:  promise._id,
             eventName: eventName,
             detail: promise._result,
-            childGuid: child && promise._guidKey + child._id,
+            childId: child && child._id,
             label: promise._label,
             timeStamp: now(),
-            stack: new Error(promise._label).stack
+            error: config["instrument-with-stack"] ? new Error(promise._label) : null
           }})) {
-
-            setTimeout(function() {
-              var entry;
-              for (var i = 0; i < queue.length; i++) {
-                entry = queue[i];
-                config.trigger(entry.name, entry.payload);
-              }
-              queue.length = 0;
-            }, 50);
+            scheduleFlush();
           }
       }
   });
-define("rsvp/map",
+enifed("rsvp/map",
   ["./promise","./utils","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -45340,7 +46722,7 @@ define("rsvp/map",
       });
     }
   });
-define("rsvp/node",
+enifed("rsvp/node",
   ["./promise","./-internal","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45624,7 +47006,7 @@ define("rsvp/node",
       }
     }
   });
-define("rsvp/promise-hash",
+enifed("rsvp/promise-hash",
   ["./enumerator","./-internal","./utils","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __exports__) {
     "use strict";
@@ -45676,7 +47058,7 @@ define("rsvp/promise-hash",
       }
     };
   });
-define("rsvp/promise",
+enifed("rsvp/promise",
   ["./config","./instrument","./utils","./-internal","./promise/all","./promise/race","./promise/resolve","./promise/reject","exports"],
   function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __exports__) {
     "use strict";
@@ -46165,7 +47547,7 @@ define("rsvp/promise",
       }
     };
   });
-define("rsvp/promise/all",
+enifed("rsvp/promise/all",
   ["../enumerator","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46222,7 +47604,7 @@ define("rsvp/promise/all",
       return new Enumerator(this, entries, true /* abort on reject */, label).promise;
     }
   });
-define("rsvp/promise/race",
+enifed("rsvp/promise/race",
   ["../utils","../-internal","exports"],
   function(__dependency1__, __dependency2__, __exports__) {
     "use strict";
@@ -46328,7 +47710,7 @@ define("rsvp/promise/race",
       return promise;
     }
   });
-define("rsvp/promise/reject",
+enifed("rsvp/promise/reject",
   ["../-internal","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46378,7 +47760,7 @@ define("rsvp/promise/reject",
       return promise;
     }
   });
-define("rsvp/promise/resolve",
+enifed("rsvp/promise/resolve",
   ["../-internal","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46430,7 +47812,7 @@ define("rsvp/promise/resolve",
       return promise;
     }
   });
-define("rsvp/race",
+enifed("rsvp/race",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46450,7 +47832,7 @@ define("rsvp/race",
       return Promise.race(array, label);
     }
   });
-define("rsvp/reject",
+enifed("rsvp/reject",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46471,7 +47853,7 @@ define("rsvp/reject",
       return Promise.reject(reason, label);
     }
   });
-define("rsvp/resolve",
+enifed("rsvp/resolve",
   ["./promise","exports"],
   function(__dependency1__, __exports__) {
     "use strict";
@@ -46493,7 +47875,7 @@ define("rsvp/resolve",
       return Promise.resolve(value, label);
     }
   });
-define("rsvp/rethrow",
+enifed("rsvp/rethrow",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -46544,7 +47926,7 @@ define("rsvp/rethrow",
       throw reason;
     }
   });
-define("rsvp/utils",
+enifed("rsvp/utils",
   ["exports"],
   function(__exports__) {
     "use strict";
@@ -46591,4 +47973,4 @@ define("rsvp/utils",
   });
 requireModule("ember");
 
-})();
\ No newline at end of file
+})();
diff --git a/vendor/assets/javascripts/production/list-view.js b/vendor/assets/javascripts/production/list-view.js
deleted file mode 100755
index eb9e791e84..0000000000
--- a/vendor/assets/javascripts/production/list-view.js
+++ /dev/null
@@ -1,8 +0,0 @@
-// ==========================================================================
-// Project:   Ember ListView
-// Copyright: ©2012-2013 Erik Bryn, Yapp Inc., and contributors.
-// License:   Licensed under MIT license
-// Version:   0.0.5
-// ==========================================================================
-
-(function(e){var t,i,n,r;(function(){var e;if(!Array.isArray){e=function(e){return Object.prototype.toString.call(e)==="[object Array]"}}else{e=Array.isArray}var s={},o={},l={};var h=false;t=function(t,i,n){if(!e(i)){n=i;i=[]}s[t]={deps:i,callback:n}};function a(e,t,i){var r=e.length;var s=new Array(r);var o;var l;for(var h=0,a=r;h<a;h++){o=e[h];if(o==="exports"){l=s[h]=i}else{s[h]=n(c(o,t))}}return{deps:s,exports:l}}r=n=i=function(e){if(l[e]!==h&&o.hasOwnProperty(e)){return o[e]}if(!s[e]){throw new Error("Could not find module "+e)}var t=s[e];var i;var n;var r=false;o[e]={};try{i=a(t.deps,e,o[e]);n=t.callback.apply(this,i.deps);r=true}finally{if(!r){l[e]=h}}return i.exports?o[e]:o[e]=n};function c(e,t){if(e.charAt(0)!=="."){return e}var i=e.split("/");var n=t.split("/");var r;if(n.length===1){r=n}else{r=n.slice(0,-1)}for(var s=0,o=i.length;s<o;s++){var l=i[s];if(l===".."){r.pop()}else if(l==="."){continue}else{r.push(l)}}return r.join("/")}r.entries=r._eak_seen=s;r.clear=function(){r.entries=r._eak_seen=s={};o=l={}}})();t("list-view/helper",["exports"],function(e){"use strict";e["default"]=function t(e){var t=e.hash;var i=e.hashTypes;t.content=t.items;delete t.items;i.content=i.items;delete i.items;if(!t.content){t.content="this";i.content="ID"}for(var n in t){if(/-/.test(n)){var r=Ember.String.camelize(n);t[r]=t[n];i[r]=i[n];delete t[n];delete i[n]}}return Ember.Handlebars.helpers.collection.call(this,"Ember.ListView",e)}});t("list-view/list_item_view",["list-view/list_item_view_mixin","exports"],function(e,t){"use strict";var i=e["default"];var n=Ember.get,r=Ember.set;function s(e){var t=[],i=e.childBuffers;Ember.ArrayPolyfills.forEach.call(i,function(e){var i=typeof e==="string";if(i){t.push(e)}else{e.array(t)}});return t.join("")}function o(e){if(e.willInsertElement){e.willInsertElement()}}function l(e){if(e.didInsertElement){e.didInsertElement()}}function h(){var e,t,i,h;e=n(this,"element");if(!e){return}i=n(this,"context");this.triggerRecursively("willClearRender");if(this.lengthAfterRender>this.lengthBeforeRender){this.clearRenderedChildren();this._childViews.length=this.lengthBeforeRender}if(i){t=Ember.RenderBuffer();t=this.renderToBuffer(t);h=this._childViews.length>0;if(h){this.invokeRecursively(o,false)}e.innerHTML=t.innerString?t.innerString():s(t);r(this,"element",e);var a=this._transitionTo?this._transitionTo:this.transitionTo;a.call(this,"inDOM");if(h){this.invokeRecursively(l,false)}}else{e.innerHTML=""}}t["default"]=Ember.View.extend(i,{updateContext:function(e){var t=n(this,"context");Ember.instrument("view.updateContext.render",this,function(){if(t!==e){r(this,"context",e);if(e&&e.isController){r(this,"controller",e)}}},this)},rerender:function(){Ember.run.scheduleOnce("render",this,h)},_contextDidChange:Ember.observer(h,"context","controller")})});t("list-view/list_item_view_mixin",["exports"],function(e){"use strict";var t=Ember.get,i=Ember.set;function n(e,t){return e&&t&&e.x===t.x&&e.y===t.y}function r(){var e,i,r;Ember.instrument("view.updateContext.positionElement",this,function(){e=t(this,"element");i=this.position;r=this._position;if(!i||!e){return}if(n(i,r)){return}Ember.run.schedule("render",this,this._parentView.applyTransform,e,i.x,i.y);this._position=i},this)}e["default"]=Ember.Mixin.create({init:function(){this._super();this.one("didInsertElement",r)},classNames:["ember-list-item-view"],_position:null,updatePosition:function(e){this.position=e;this._positionElement()},_positionElement:r})});t("list-view/list_view",["list-view/list_view_helper","list-view/list_view_mixin","exports"],function(e,t,i){"use strict";var n=e["default"];var r=t["default"];var s=Ember.get,o=Ember.set;i["default"]=Ember.ContainerView.extend(r,{css:{position:"relative",overflow:"auto","-webkit-overflow-scrolling":"touch","overflow-scrolling":"touch"},applyTransform:n.applyTransform,_scrollTo:function(e){var t=s(this,"element");if(t){t.scrollTop=e}},didInsertElement:function(){var e=this;var t=s(this,"element");this._updateScrollableHeight();this._scroll=function(t){e.scroll(t)};Ember.$(t).on("scroll",this._scroll)},willDestroyElement:function(){var e;e=s(this,"element");Ember.$(e).off("scroll",this._scroll)},scroll:function(e){this.scrollTo(e.target.scrollTop)},scrollTo:function(e){var t=s(this,"element");this._scrollTo(e);this._scrollContentTo(e)},totalHeightDidChange:Ember.observer(function(){Ember.run.scheduleOnce("afterRender",this,this._updateScrollableHeight)},"totalHeight"),_updateScrollableHeight:function(){var e,t;t=this._state||this.state;if(t==="inDOM"){if(this._isChildEmptyView()){e=""}else{e=s(this,"totalHeight")}this.$(".ember-list-container").css({height:e})}}})});t("list-view/list_view_helper",["exports"],function(e){"use strict";var t=document.createElement("div"),i=t.style;var n=["Webkit","Moz","O","ms"];function r(e){if(e in i)return e;var t=e.charAt(0).toUpperCase()+e.slice(1);for(var r=0;r<n.length;r++){var s=n[r]+t;if(s in i){return s}}return null}var s=r("transform");var o=r("perspective");var l=s!==null;var h=o!==null;e["default"]={transformProp:s,applyTransform:function(){if(l){return function(e,t,i){e.style[s]="translate("+t+"px, "+i+"px)"}}else{return function(e,t,i){e.style.top=i+"px";e.style.left=t+"px"}}}(),apply3DTransform:function(){if(h){return function(e,t,i){e.style[s]="translate3d("+t+"px, "+i+"px, 0)"}}else if(l){return function(e,t,i){e.style[s]="translate("+t+"px, "+i+"px)"}}else{return function(e,t,i){e.style.top=i+"px";e.style.left=t+"px"}}}()}});t("list-view/list_view_mixin",["list-view/reusable_list_item_view","exports"],function(e,t){"use strict";var i=e["default"];var n=Ember.get,r=Ember.set,s=Math.min,o=Math.max,l=Math.floor,h=Math.ceil,a=Ember.ArrayPolyfills.forEach;function c(){var e=n(this,"content");if(e){e.addArrayObserver(this)}}function u(e){this.removeObject(e);e.destroy()}function d(){Ember.run.once(this,"_syncChildViews")}function f(e,t){return n(e,"contentIndex")-n(t,"contentIndex")}function m(){if(Ember.View.notifyMutationListeners){Ember.run.once(Ember.View,"notifyMutationListeners")}}function v(){var e=n(this,"emptyView");if(e&&e instanceof Ember.View){e.removeFromParent();if(this.totalHeightDidChange!==undefined){this.totalHeightDidChange()}}}function g(){var e=n(this,"emptyView");if(!e){return}if("string"===typeof e){e=n(e)||e}e=this.createChildView(e);r(this,"emptyView",e);if(Ember.CoreView.detect(e)){this._createdEmptyView=e}this.unshiftObject(e)}var w=Ember.create(Ember.ContainerView.proto().domManager);w.prepend=function(e,t){e.$(".ember-list-container").prepend(t);m()};function p(){function e(e,t,i){console.time(e)}function t(e,t,i){console.timeEnd(e)}if(Ember.ENABLE_PROFILING){Ember.subscribe("view._scrollContentTo",{before:e,after:t});Ember.subscribe("view.updateContext",{before:e,after:t})}}t["default"]=Ember.Mixin.create({itemViewClass:i,emptyViewClass:Ember.View,classNames:["ember-list-view"],attributeBindings:["style"],classNameBindings:["_isGrid:ember-list-view-grid:ember-list-view-list"],domManager:w,scrollTop:0,bottomPadding:0,_lastEndingIndex:0,paddingCount:1,_cachedPos:0,_isGrid:Ember.computed("columnCount",function(){return this.get("columnCount")>1}).readOnly(),init:function(){this._super();this._cachedHeights=[0];this.on("didInsertElement",this._syncListContainerWidth);this.columnCountDidChange();this._syncChildViews();this._addContentArrayObserver()},_addContentArrayObserver:Ember.beforeObserver(function(){c.call(this)},"content"),render:function(e){e.push('<div class="ember-list-container">');this._super(e);e.push("</div>")},willInsertElement:function(){if(!this.get("height")||!this.get("rowHeight")){throw new Error("A ListView must be created with a height and a rowHeight.")}this._super()},style:Ember.computed("height","width",function(){var e,t,i,r;e=n(this,"height");t=n(this,"width");r=n(this,"css");i="";if(e){i+="height:"+e+"px;"}if(t){i+="width:"+t+"px;"}for(var s in r){if(r.hasOwnProperty(s)){i+=s+":"+r[s]+";"}}return i}),scrollTo:function(e){throw new Error("must override to perform the visual scroll and effectively delegate to _scrollContentTo")},_scrollTo:Ember.K,_scrollContentTo:function(e){var t,i,r,l,h,a,c,u,d;u=o(0,e);if(this.scrollTop===u){return}var f=o(0,n(this,"totalHeight")-n(this,"height"));u=s(u,f);d=n(this,"content");c=n(d,"length");t=this._startingIndex(c);Ember.instrument("view._scrollContentTo",{scrollTop:u,content:d,startingIndex:t,endingIndex:s(o(c-1,0),t+this._numChildViewsForViewport())},function(){this.scrollTop=u;h=o(c-1,0);t=this._startingIndex();l=t+this._numChildViewsForViewport();i=s(h,l);if(t===this._lastStartingIndex&&i===this._lastEndingIndex){this.trigger("scrollYChanged",e);return}else{Ember.run(this,function(){this._reuseChildren();this._lastStartingIndex=t;this._lastEndingIndex=i;this.trigger("scrollYChanged",e)})}},this)},totalHeight:Ember.computed("content.length","rowHeight","columnCount","bottomPadding",function(){if(typeof this.heightForIndex==="function"){return this._totalHeightWithHeightForIndex()}else{return this._totalHeightWithStaticRowHeight()}}),_doRowHeightDidChange:function(){this._cachedHeights=[0];this._cachedPos=0;this._syncChildViews()},_rowHeightDidChange:Ember.observer("rowHeight",function(){Ember.run.once(this,this._doRowHeightDidChange)}),_totalHeightWithHeightForIndex:function(){var e=this.get("content.length");return this._cachedHeightLookup(e)},_totalHeightWithStaticRowHeight:function(){var e,t,i,r;e=n(this,"content.length");t=n(this,"rowHeight");i=n(this,"columnCount");r=n(this,"bottomPadding");return h(e/i)*t+r},_prepareChildForReuse:function(e){e.prepareForReuse()},_reuseChildForContentIndex:function(e,t){var i,s,o,l,h,a,c;var u=this.itemViewForIndex(t);if(e.constructor!==u){var d=this._childViews.indexOf(e);e.destroy();e=this.createChildView(u);this.insertAt(d,e)}i=n(this,"content");a=n(this,"enableProfiling");h=this.positionForIndex(t);e.updatePosition(h);r(e,"contentIndex",t);if(a){Ember.instrument("view._reuseChildForContentIndex",h,function(){},this)}o=i.objectAt(t);e.updateContext(o)},positionForIndex:function(e){if(typeof this.heightForIndex!=="function"){return this._singleHeightPosForIndex(e)}else{return this._multiHeightPosForIndex(e)}},_singleHeightPosForIndex:function(e){var t,i,r,s,o,h;t=n(this,"elementWidth")||1;i=n(this,"width")||1;r=n(this,"columnCount");s=n(this,"rowHeight");o=s*l(e/r);h=e%r*t;return{y:o,x:h}},_multiHeightPosForIndex:function(e){var t,i,r,s,o,l;t=n(this,"elementWidth")||1;i=n(this,"width")||1;r=n(this,"columnCount");l=e%r*t;o=this._cachedHeightLookup(e);return{x:l,y:o}},_cachedHeightLookup:function(e){for(var t=this._cachedPos;t<e;t++){this._cachedHeights[t+1]=this._cachedHeights[t]+this.heightForIndex(t)}this._cachedPos=t;return this._cachedHeights[e]},_childViewCount:function(){var e,t;e=n(this,"content.length");t=this._numChildViewsForViewport();return s(e,t)},columnCount:Ember.computed("width","elementWidth",function(){var e,t,i;e=n(this,"elementWidth");t=n(this,"width");if(e&&t>e){i=l(t/e)}else{i=1}return i}),columnCountDidChange:Ember.observer(function(){var e,t,i,r,o,l,h,a;l=this._lastColumnCount;t=this.scrollTop;h=n(this,"columnCount");r=n(this,"maxScrollTop");a=n(this,"element");this._lastColumnCount=h;if(l){e=l/h;i=t*e;o=s(r,i);this._scrollTo(o);this.scrollTop=o}if(arguments.length>0){Ember.run.schedule("afterRender",this,this._syncListContainerWidth)}},"columnCount"),maxScrollTop:Ember.computed("height","totalHeight",function(){var e,t;e=n(this,"totalHeight");t=n(this,"height");return o(0,e-t)}),_isChildEmptyView:function(){var e=n(this,"emptyView");return e&&e instanceof Ember.View&&this._childViews.length===1&&this._childViews.indexOf(e)===0},_numChildViewsForViewport:function(){if(this.heightForIndex){return this._numChildViewsForViewportWithMultiHeight()}else{return this._numChildViewsForViewportWithoutMultiHeight()}},_numChildViewsForViewportWithoutMultiHeight:function(){var e,t,i,r;e=n(this,"height");t=n(this,"rowHeight");i=n(this,"paddingCount");r=n(this,"columnCount");return h(e/t)*r+i*r},_numChildViewsForViewportWithMultiHeight:function(){var e,t,i;var r=this.scrollTop;var s=this.get("height");var o=this.get("content.length");var l=0;var h=n(this,"paddingCount");var a=this._calculatedStartingIndex();var c=0;var u=this._cachedHeightLookup(a);for(var d=0;d<o;d++){if(this._cachedHeightLookup(a+d+1)-u>s){break}}return d+h+1},_startingIndex:function(e){var t,i,r,h,a;if(e===undefined){a=n(this,"content.length")}else{a=e}t=this.scrollTop;i=n(this,"rowHeight");r=n(this,"columnCount");if(this.heightForIndex){h=this._calculatedStartingIndex()}else{h=l(t/i)*r}var c=this._numChildViewsForViewport();var u=1*r;var d=o(a-c,0);return s(h,d)},_calculatedStartingIndex:function(){var e,t,i;var r=this.scrollTop;var s=this.get("height");var o=this.get("content.length");var l=0;var h=n(this,"paddingCount");for(var a=0;a<o;a++){if(this._cachedHeightLookup(a+1)>=r){break}}return a},contentWillChange:Ember.beforeObserver(function(){var e;e=n(this,"content");if(e){e.removeArrayObserver(this)}},"content"),contentDidChange:Ember.observer(function(){c.call(this);d.call(this)},"content"),needsSyncChildViews:Ember.observer(d,"height","width","columnCount"),_addItemView:function(e){var t,i;t=this.itemViewForIndex(e);i=this.createChildView(t);this.pushObject(i)},itemViewForIndex:function(e){return n(this,"itemViewClass")},heightForIndex:null,_syncChildViews:function(){var e,t,i,r,s,o,l,h,c,d,f;if(n(this,"isDestroyed")||n(this,"isDestroying")){return}h=n(this,"content.length");c=n(this,"emptyView");t=this._childViewCount();e=this.positionOrderedChildViews();if(this._isChildEmptyView()){v.call(this)}o=this._startingIndex();l=o+t;r=t;i=e.length;f=r-i;if(f===0){}else if(f>0){s=this._lastEndingIndex;for(d=0;d<f;d++,s++){this._addItemView(s)}}else{a.call(e.splice(r,i),u,this)}this._reuseChildren();this._lastStartingIndex=o;this._lastEndingIndex=this._lastEndingIndex+f;if(h===0||h===undefined){g.call(this)}},_syncListContainerWidth:function(){var e,t,i,r;e=n(this,"elementWidth");t=n(this,"columnCount");i=e*t;r=this.$(".ember-list-container");if(i&&r){r.css("width",i)}},_reuseChildren:function(){var e,t,i,r,l,h,a,c,u,d,f,m;m=this.scrollTop;e=n(this,"content.length");d=o(e-1,0);t=this.getReusableChildViews();i=t.length;r=this._startingIndex();u=r+this._numChildViewsForViewport();l=s(d,u);f=s(u,r+i);for(c=r;c<f;c++){h=t[c%i];this._reuseChildForContentIndex(h,c)}},getReusableChildViews:function(){return this._childViews},positionOrderedChildViews:function(){return this.getReusableChildViews().sort(f)},arrayWillChange:Ember.K,arrayDidChange:function(e,t,i,n){var r,s,o;if(this._isChildEmptyView()){v.call(this)}o=this._state||this.state;if(o==="inDOM"){if(t>=this._lastStartingIndex||t<this._lastEndingIndex){r=0;a.call(this.positionOrderedChildViews(),function(e){s=this._lastStartingIndex+r;this._reuseChildForContentIndex(e,s);r++},this)}d.call(this)}},destroy:function(){if(!this._super()){return}if(this._createdEmptyView){this._createdEmptyView.destroy()}return this}})});t("list-view/main",["list-view/reusable_list_item_view","list-view/virtual_list_view","list-view/list_item_view","list-view/helper","list-view/list_view","list-view/list_view_helper"],function(e,t,i,n,r,s){"use strict";var o=e["default"];var l=t["default"];var h=i["default"];var a=n["default"];var c=r["default"];var u=s["default"];Ember.ReusableListItemView=o;Ember.VirtualListView=l;Ember.ListItemView=h;Ember.ListView=c;Ember.ListViewHelper=u;Ember.Handlebars.registerHelper("ember-list",a)});t("list-view/reusable_list_item_view",["list-view/list_item_view_mixin","exports"],function(e,t){"use strict";var i=e["default"];var n=Ember.get,r=Ember.set;t["default"]=Ember.View.extend(i,{init:function(){this._super();var e=Ember.ObjectProxy.create();this.set("context",e);this._proxyContext=e},isVisible:Ember.computed("context.content",function(){return!!this.get("context.content")}),updateContext:function(e){var t=n(this._proxyContext,"content"),i;i=this._state||this.state;if(t!==e){if(i==="inDOM"){this.prepareForReuse(e)}r(this._proxyContext,"content",e);if(e&&e.isController){r(this,"controller",e)}}},prepareForReuse:Ember.K})});t("list-view/virtual_list_scroller_events",["exports"],function(e){"use strict";var t=/input|textarea|select/i,i="ontouchstart"in window||window.DocumentTouch&&document instanceof window.DocumentTouch,n,r,s,o,l,h,a,c;if(i){l="touchstart";n=function(e){var i=e.touches[0],n=i&&i.target;if(n&&t.test(n.tagName)){return}m(this.scrollerEventHandlers);this.willBeginScroll(e.touches,e.timeStamp);e.preventDefault()};h="touchmove";r=function(e){this.continueScroll(e.touches,e.timeStamp)};a="touchend";s=function(e){if(!this._isScrolling){w(e)}v(this.scrollerEventHandlers);this.endScroll(e.timeStamp)};c="touchcancel";o=function(e){v(this.scrollerEventHandlers);this.endScroll(e.timeStamp)}}else{l="mousedown";n=function(e){if(e.which!==1)return;var i=e.target;if(i&&t.test(i.tagName)){return}m(this.scrollerEventHandlers);this.willBeginScroll([e],e.timeStamp);e.preventDefault()};h="mousemove";r=function(e){this.continueScroll([e],e.timeStamp)};a="mouseup";s=function(e){v(this.scrollerEventHandlers);this.endScroll(e.timeStamp)};c="mouseout";o=function(e){if(e.relatedTarget)return;v(this.scrollerEventHandlers);this.endScroll(e.timeStamp)}}function u(e){this.mouseWheel(e);e.preventDefault()}function d(e,t){e.addEventListener(l,t.start,false);e.addEventListener("mousewheel",t.wheel,false)}function f(e,t){e.removeEventListener(l,t.start,false);e.removeEventListener("mousewheel",t.wheel,false)}function m(e){window.addEventListener(h,e.move,true);window.addEventListener(a,e.end,true);window.addEventListener(c,e.cancel,true)}function v(e){window.removeEventListener(h,e.move,true);window.removeEventListener(a,e.end,true);window.removeEventListener(c,e.cancel,true)}e["default"]=Ember.Mixin.create({init:function(){this.on("didInsertElement",this,"bindScrollerEvents");this.on("willDestroyElement",this,"unbindScrollerEvents");this.scrollerEventHandlers={start:g(this,n),move:g(this,r),end:g(this,s),cancel:g(this,o),wheel:g(this,u)};return this._super()},scrollElement:Ember.computed.oneWay("element").readOnly(),bindScrollerEvents:function(){var e=this.get("scrollElement"),t=this.scrollerEventHandlers;d(e,t)},unbindScrollerEvents:function(){var e=this.get("scrollElement"),t=this.scrollerEventHandlers;f(e,t);v(t)}});function g(e,t){return function(i){t.call(e,i)}}function w(e){var i=e.changedTouches[0],n=i.target,r;if(n&&t.test(n.tagName)){r=document.createEvent("MouseEvents");r.initMouseEvent("click",true,true,e.view,1,i.screenX,i.screenY,i.clientX,i.clientY,e.ctrlKey,e.altKey,e.shiftKey,e.metaKey,0,null);return n.dispatchEvent(r)}}});t("list-view/virtual_list_view",["list-view/list_view_mixin","list-view/list_view_helper","list-view/virtual_list_scroller_events","exports"],function(e,t,i,n){"use strict";var r=e["default"];var s=t["default"];var o=i["default"];var l=Math.max,h=Ember.get,a=Ember.set;function c(e){var t,i,n;e=e||this;t=h(e,"width");i=h(e,"height");n=h(e,"totalHeight");e.scroller.setDimensions(t,i,t,n);e.trigger("scrollerDimensionsDidChange")}n["default"]=Ember.ContainerView.extend(r,o,{_isScrolling:false,_mouseWheel:null,css:{position:"relative",overflow:"hidden"},init:function(){this._super();this.setupScroller();this.setupPullToRefresh()},_scrollerTop:0,applyTransform:s.apply3DTransform,setupScroller:function(){var e,t;e=this;e.scroller=new Scroller(function(t,i,n){var r=e._state||e.state;if(r!=="inDOM"){return}if(e.listContainerElement){e._scrollerTop=i;e._scrollContentTo(i);e.applyTransform(e.listContainerElement,0,-i)}},{scrollingX:false,scrollingComplete:function(){e.trigger("scrollingDidComplete")}});e.trigger("didInitializeScroller");c(e)},setupPullToRefresh:function(){if(!this.pullToRefreshViewClass){return}this._insertPullToRefreshView();this._activateScrollerPullToRefresh()},_insertPullToRefreshView:function(){this.pullToRefreshView=this.createChildView(this.pullToRefreshViewClass);this.insertAt(0,this.pullToRefreshView);var e=this;this.pullToRefreshView.on("didInsertElement",function(){Ember.run.schedule("afterRender",this,function(){e.applyTransform(this.get("element"),0,-1*e.pullToRefreshViewHeight)})})},_activateScrollerPullToRefresh:function(){var e=this;function t(){e.pullToRefreshView.set("active",true);e.trigger("activatePullToRefresh")}function i(){e.pullToRefreshView.set("active",false);e.trigger("deactivatePullToRefresh")}function n(){Ember.run(function(){e.pullToRefreshView.set("refreshing",true);function t(){if(e&&!e.get("isDestroyed")&&!e.get("isDestroying")){e.scroller.finishPullToRefresh();e.pullToRefreshView.set("refreshing",false)}}e.startRefresh(t)})}this.scroller.activatePullToRefresh(this.pullToRefreshViewHeight,t,i,n)},getReusableChildViews:function(){var e=this._childViews[0];if(e&&e===this.pullToRefreshView){return this._childViews.slice(1)}else{return this._childViews}},scrollerDimensionsNeedToChange:Ember.observer(function(){Ember.run.once(this,c)},"width","height","totalHeight"),didInsertElement:function(){this.listContainerElement=this.$("> .ember-list-container")[0]},willBeginScroll:function(e,t){this._isScrolling=false;this.trigger("scrollingDidStart");this.scroller.doTouchStart(e,t)},continueScroll:function(e,t){var i,n,r;if(this._isScrolling){this.scroller.doTouchMove(e,t)}else{i=this._scrollerTop;this.scroller.doTouchMove(e,t);n=this._scrollerTop;if(i!==n){r=Ember.$.Event("scrollerstart");Ember.$(e[0].target).trigger(r);this._isScrolling=true}}},endScroll:function(e){this.scroller.doTouchEnd(e)},scrollTo:function(e,t){if(t===undefined){t=true}this.scroller.scrollTo(0,e,t,1)},mouseWheel:function(e){var t,i,n;t=e.webkitDirectionInvertedFromDevice;i=e.wheelDeltaY*(t?.8:-.8);n=this.scroller.__scrollTop+i;if(n>=0&&n<=this.scroller.__maxScrollTop){this.scroller.scrollBy(0,i,true);e.stopPropagation()}return false}})});i("list-view/main")})(this);
\ No newline at end of file
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ar.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ar.yml
new file mode 100644
index 0000000000..60f365ad68
--- /dev/null
+++ b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.ar.yml
@@ -0,0 +1,12 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+ar:
+  site_settings:
+    enable_imgur: "الرجاء تمكين حسابك في imgur. لا تقم بتحميل الملفات محلياً"
+    imgur_client_id: "حسابك لدى imgur.com مطلوب لتحميل الصور"
+    imgur_client_secret: "حسابك في imgur.com سرّي , غير مطلوب الآن لرفع الصور, لكن ربما سيكون مطلوباً في وقت لاحق"
diff --git a/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.tr_TR.yml b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.tr_TR.yml
new file mode 100644
index 0000000000..a9c90a45cc
--- /dev/null
+++ b/vendor/gems/discourse_imgur/lib/discourse_imgur/locale/server.tr_TR.yml
@@ -0,0 +1,12 @@
+# encoding: utf-8
+#
+# Never edit this file. It will be overwritten when translations are pulled from Transifex.
+#
+# To work with us on translations, join this project:
+# https://www.transifex.com/projects/p/discourse-org/
+
+tr_TR:
+  site_settings:
+    enable_imgur: "Yükleme için imgur api'sini etkinleştirin, dosyaları yerel olarak barındırmayın"
+    imgur_client_id: "Imgur.com kullanıcı ID'niz, fotoğraf yükleme işlevi için gerekli"
+    imgur_client_secret: "Imgur.com kullanıcı anahtarınız. Fotoğraf yükleme işlevi için şu an gerekli değil, ama ileride bazı durumlarda gerekli olabilir."