diff --git a/Gemfile.lock b/Gemfile.lock
index 593d89ab1f..725ea9068b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -145,7 +145,7 @@ GEM
       thor (~> 0.15)
     libv8 (3.16.14.7)
     listen (0.7.3)
-    logster (0.8.3)
+    logster (0.8.4.1.pre)
     lru_redux (1.1.0)
     mail (2.5.4)
       mime-types (~> 1.16)
@@ -206,7 +206,7 @@ GEM
     omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
-    onebox (1.5.22)
+    onebox (1.5.23)
       moneta (~> 0.8)
       multi_json (~> 1.11)
       mustache
diff --git a/app/assets/javascripts/admin/models/report.js.es6 b/app/assets/javascripts/admin/models/report.js.es6
index ebb63486d2..1ce48a1448 100644
--- a/app/assets/javascripts/admin/models/report.js.es6
+++ b/app/assets/javascripts/admin/models/report.js.es6
@@ -1,14 +1,12 @@
 import round from "discourse/lib/round";
 
 const Report = Discourse.Model.extend({
-  reportUrl: function() {
-    return("/admin/reports/" + this.get('type'));
-  }.property('type'),
+  reportUrl: Discourse.computed.fmt("type", "/admin/reports/%@"),
 
   valueAt(numDaysAgo) {
     if (this.data) {
-      var wantedDate = moment().subtract(numDaysAgo, 'days').format('YYYY-MM-DD');
-      var item = this.data.find( function(d) { return d.x === wantedDate; } );
+      const wantedDate = moment().subtract(numDaysAgo, "days").format("YYYY-MM-DD");
+      const item = this.data.find(d => d.x === wantedDate);
       if (item) {
         return item.y;
       }
@@ -16,128 +14,117 @@ const Report = Discourse.Model.extend({
     return 0;
   },
 
-  sumDays(startDaysAgo, endDaysAgo) {
+  valueFor(startDaysAgo, endDaysAgo) {
     if (this.data) {
-      var earliestDate = moment().subtract(endDaysAgo, 'days').startOf('day');
-      var latestDate = moment().subtract(startDaysAgo, 'days').startOf('day');
-      var d, sum = 0;
-      _.each(this.data,function(datum){
+      const earliestDate = moment().subtract(endDaysAgo, "days").startOf("day");
+      const latestDate = moment().subtract(startDaysAgo, "days").startOf("day");
+      var d, sum = 0, count = 0;
+      _.each(this.data, datum => {
         d = moment(datum.x);
-        if(d >= earliestDate && d <= latestDate) {
+        if (d >= earliestDate && d <= latestDate) {
           sum += datum.y;
+          count++;
         }
       });
+      if (this.get("method") === "average") { sum /= count; }
       return round(sum, -2);
     }
   },
 
-  todayCount: function() {
-    return this.valueAt(0);
-  }.property('data'),
+  todayCount:          function() { return this.valueAt(0); }.property("data"),
+  yesterdayCount:      function() { return this.valueAt(1); }.property("data"),
+  sevenDaysAgoCount:   function() { return this.valueAt(7); }.property("data"),
+  thirtyDaysAgoCount:  function() { return this.valueAt(30); }.property("data"),
 
-  yesterdayCount: function() {
-    return this.valueAt(1);
-  }.property('data'),
-
-  lastSevenDaysCount: function() {
-    return this.sumDays(1,7);
-  }.property('data'),
-
-  lastThirtyDaysCount: function() {
-    return this.sumDays(1,30);
-  }.property('data'),
-
-  sevenDaysAgoCount: function() {
-    return this.valueAt(7);
-  }.property('data'),
-
-  thirtyDaysAgoCount: function() {
-    return this.valueAt(30);
-  }.property('data'),
+  lastSevenDaysCount:  function() { return this.valueFor(1, 7); }.property("data"),
+  lastThirtyDaysCount: function() { return this.valueFor(1, 30); }.property("data"),
 
   yesterdayTrend: function() {
-    var yesterdayVal = this.valueAt(1);
-    var twoDaysAgoVal = this.valueAt(2);
-    if ( yesterdayVal > twoDaysAgoVal ) {
-      return 'trending-up';
-    } else if ( yesterdayVal < twoDaysAgoVal ) {
-      return 'trending-down';
+    const yesterdayVal = this.valueAt(1);
+    const twoDaysAgoVal = this.valueAt(2);
+    if (yesterdayVal > twoDaysAgoVal) {
+      return "trending-up";
+    } else if (yesterdayVal < twoDaysAgoVal) {
+      return "trending-down";
     } else {
-      return 'no-change';
+      return "no-change";
     }
-  }.property('data'),
+  }.property("data"),
 
   sevenDayTrend: function() {
-    var currentPeriod = this.sumDays(1,7);
-    var prevPeriod = this.sumDays(8,14);
-    if ( currentPeriod > prevPeriod ) {
-      return 'trending-up';
-    } else if ( currentPeriod < prevPeriod ) {
-      return 'trending-down';
+    const currentPeriod = this.valueFor(1, 7);
+    const prevPeriod = this.valueFor(8, 14);
+    if (currentPeriod > prevPeriod) {
+      return "trending-up";
+    } else if (currentPeriod < prevPeriod) {
+      return "trending-down";
     } else {
-      return 'no-change';
+      return "no-change";
     }
-  }.property('data'),
+  }.property("data"),
 
   thirtyDayTrend: function() {
-    if( this.get('prev30Days') ) {
-      var currentPeriod = this.sumDays(1,30);
-      if( currentPeriod > this.get('prev30Days') ) {
-        return 'trending-up';
-      } else if ( currentPeriod < this.get('prev30Days') ) {
-        return 'trending-down';
+    if (this.get("prev30Days")) {
+      const currentPeriod = this.valueFor(1, 30);
+      if (currentPeriod > this.get("prev30Days")) {
+        return "trending-up";
+      } else if (currentPeriod < this.get("prev30Days")) {
+        return "trending-down";
       }
     }
-    return 'no-change';
-  }.property('data', 'prev30Days'),
+    return "no-change";
+  }.property("data", "prev30Days"),
 
   icon: function() {
-    switch( this.get('type') ) {
-    case 'flags':
-      return 'flag';
-    case 'likes':
-      return 'heart';
-    default:
-      return null;
+    switch (this.get("type")) {
+      case "flags": return "flag";
+      case "likes": return "heart";
+      default:      return null;
     }
-  }.property('type'),
+  }.property("type"),
+
+  method: function() {
+    if (this.get("type") === "time_to_first_response") {
+      return "average";
+    } else {
+      return "sum";
+    }
+  }.property("type"),
 
   percentChangeString(val1, val2) {
-    var val = ((val1 - val2) / val2) * 100;
-    if( isNaN(val) || !isFinite(val) ) {
+    const val = ((val1 - val2) / val2) * 100;
+    if (isNaN(val) || !isFinite(val)) {
       return null;
-    } else if( val > 0 ) {
-      return '+' + val.toFixed(0) + '%';
+    } else if (val > 0) {
+      return "+" + val.toFixed(0) + "%";
     } else {
-      return val.toFixed(0) + '%';
+      return val.toFixed(0) + "%";
     }
   },
 
   changeTitle(val1, val2, prevPeriodString) {
-    var title = '';
-    var percentChange = this.percentChangeString(val1, val2);
-    if( percentChange ) {
-      title += percentChange + ' change. ';
-    }
-    title += 'Was ' + val2 + ' ' + prevPeriodString + '.';
+    const percentChange = this.percentChangeString(val1, val2);
+    var title = "";
+    if (percentChange) { title += percentChange + " change. "; }
+    title += "Was " + val2 + " " + prevPeriodString + ".";
     return title;
   },
 
   yesterdayCountTitle: function() {
-    return this.changeTitle( this.valueAt(1), this.valueAt(2),'two days ago');
-  }.property('data'),
+    return this.changeTitle(this.valueAt(1), this.valueAt(2), "two days ago");
+  }.property("data"),
 
   sevenDayCountTitle: function() {
-    return this.changeTitle( this.sumDays(1,7), this.sumDays(8,14), 'two weeks ago');
-  }.property('data'),
+    return this.changeTitle(this.valueFor(1, 7), this.valueFor(8, 14), "two weeks ago");
+  }.property("data"),
 
   thirtyDayCountTitle: function() {
-    return this.changeTitle( this.sumDays(1,30), this.get('prev30Days'), 'in the previous 30 day period');
-  }.property('data'),
+    return this.changeTitle(this.valueFor(1, 30), this.get("prev30Days"), "in the previous 30 day period");
+  }.property("data"),
 
   dataReversed: function() {
-    return this.get('data').toArray().reverse();
-  }.property('data')
+    return this.get("data").toArray().reverse();
+  }.property("data")
 
 });
 
diff --git a/app/assets/javascripts/admin/templates/admin.hbs b/app/assets/javascripts/admin/templates/admin.hbs
index d8e88712c4..c7746a6d4a 100644
--- a/app/assets/javascripts/admin/templates/admin.hbs
+++ b/app/assets/javascripts/admin/templates/admin.hbs
@@ -1,5 +1,4 @@
 <div class="container">
-  {{global-notice}}
   <div class="row">
     <div class="full-width">
 
diff --git a/app/assets/javascripts/discourse/components/combo-box.js.es6 b/app/assets/javascripts/discourse/components/combo-box.js.es6
index d74410e89b..fdda11db1a 100644
--- a/app/assets/javascripts/discourse/components/combo-box.js.es6
+++ b/app/assets/javascripts/discourse/components/combo-box.js.es6
@@ -32,7 +32,8 @@ export default Ember.Component.extend({
     if (this.get('content')) {
       const self = this;
       this.get('content').forEach(function(o) {
-        let val = o[self.get('valueAttribute')] || o;
+        let val = o[self.get('valueAttribute')];
+        if (typeof val === "undefined") { val = o; }
         if (!Em.isNone(val)) { val = val.toString(); }
 
         const selectedText = (val === selected) ? "selected" : "";
diff --git a/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6 b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
new file mode 100644
index 0000000000..5a362280c3
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/desktop-notification-config.js.es6
@@ -0,0 +1,65 @@
+export default Ember.Component.extend({
+  classNames: ['controls'],
+
+  notificationsPermission: function() {
+    if (this.get('isNotSupported')) return '';
+
+    return Notification.permission;
+  }.property(),
+
+  notificationsDisabled: function(_, value) {
+    if (arguments.length > 1) {
+      localStorage.setItem('notifications-disabled', value);
+    }
+    return localStorage.getItem('notifications-disabled');
+  }.property(),
+
+
+  isNotSupported: function() {
+    return !window['Notification'];
+  }.property(),
+
+  isDefaultPermission: function() {
+    if (this.get('isNotSupported')) return false;
+
+    return Notification.permission === "default";
+  }.property('isNotSupported', 'notificationsPermission'),
+
+  isDeniedPermission: function() {
+    if (this.get('isNotSupported')) return false;
+
+    return Notification.permission === "denied";
+  }.property('isNotSupported', 'notificationsPermission'),
+
+  isGrantedPermission: function() {
+    if (this.get('isNotSupported')) return false;
+
+    return Notification.permission === "granted";
+  }.property('isNotSupported', 'notificationsPermission'),
+
+  isEnabled: function() {
+    if (!this.get('isGrantedPermission')) return false;
+
+    return !this.get('notificationsDisabled');
+  }.property('isGrantedPermission', 'notificationsDisabled'),
+
+  actions: {
+    requestPermission() {
+      const self = this;
+      Notification.requestPermission(function() {
+        self.propertyDidChange('notificationsPermission');
+      });
+    },
+    recheckPermission() {
+      this.propertyDidChange('notificationsPermission');
+    },
+    turnoff() {
+      this.set('notificationsDisabled', 'disabled');
+      this.propertyDidChange('notificationsPermission');
+    },
+    turnon() {
+      this.set('notificationsDisabled', '');
+      this.propertyDidChange('notificationsPermission');
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js.es6
index c50741820e..87ab1007a8 100644
--- a/app/assets/javascripts/discourse/components/nav-item.js.es6
+++ b/app/assets/javascripts/discourse/components/nav-item.js.es6
@@ -1,3 +1,5 @@
+/* You might be looking for navigation-item. */
+
 export default Ember.Component.extend({
   tagName: 'li',
   classNameBindings: ['active'],
diff --git a/app/assets/javascripts/discourse/components/small-action.js.es6 b/app/assets/javascripts/discourse/components/small-action.js.es6
index 50e42f19ab..4457c6fb49 100644
--- a/app/assets/javascripts/discourse/components/small-action.js.es6
+++ b/app/assets/javascripts/discourse/components/small-action.js.es6
@@ -10,30 +10,26 @@ const icons = {
   'pinned_globally.enabled': 'thumb-tack',
   'pinned_globally.disabled': 'thumb-tack unpinned',
   'visible.enabled': 'eye',
-  'visible.disabled': 'eye-slash'
+  'visible.disabled': 'eye-slash',
+  'split_topic': 'sign-out'
 };
 
+export function actionDescription(actionCode, createdAt) {
+  return function() {
+    const ac = this.get(actionCode);
+    if (ac) {
+      const dt = new Date(this.get(createdAt));
+      const when =  Discourse.Formatter.relativeAge(dt, {format: 'medium-with-ago'});
+      return I18n.t(`action_codes.${ac}`, {when}).htmlSafe();
+    }
+  }.property(actionCode, createdAt);
+}
+
 export default Ember.Component.extend({
   layoutName: 'components/small-action', // needed because `time-gap` inherits from this
   classNames: ['small-action'],
 
-  description: function() {
-    const actionCode = this.get('actionCode');
-    if (actionCode) {
-      const dt = new Date(this.get('post.created_at'));
-      const when =  Discourse.Formatter.relativeAge(dt, {format: 'medium-with-ago'});
-      var result = I18n.t(`action_codes.${actionCode}`, {when});
-      var cooked = this.get('post.cooked');
-
-      result = "<p>" + result + "</p>";
-
-      if (!Em.isEmpty(cooked)) {
-        result += "<div class='custom-message'>" + cooked + "</div>";
-      }
-
-      return result;
-    }
-  }.property('actionCode', 'post.created_at', 'post.cooked'),
+  description: actionDescription('actionCode', 'post.created_at'),
 
   icon: function() {
     return icons[this.get('actionCode')] || 'exclamation';
diff --git a/app/assets/javascripts/discourse/components/stream-item.js.es6 b/app/assets/javascripts/discourse/components/stream-item.js.es6
new file mode 100644
index 0000000000..9a29d87438
--- /dev/null
+++ b/app/assets/javascripts/discourse/components/stream-item.js.es6
@@ -0,0 +1,13 @@
+import { actionDescription } from "discourse/components/small-action";
+
+export default Ember.Component.extend({
+  classNameBindings: [":item", "item.hidden", "item.deleted", "moderatorAction"],
+  moderatorAction: Discourse.computed.propertyEqual("item.post_type", "site.post_types.moderator_action"),
+  actionDescription: actionDescription("item.action_code", "item.created_at"),
+
+  actions: {
+    removeBookmark(userAction) {
+      this.sendAction("removeBookmark", userAction);
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 8ad012dd28..c4f1ac21b4 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -413,7 +413,7 @@ export default Ember.ObjectController.extend(Presence, {
       }
 
       // we need a draft sequence for the composer to work
-      if (opts.draftSequence === void 0) {
+      if (opts.draftSequence === undefined) {
         return Discourse.Draft.get(opts.draftKey).then(function(data) {
           opts.draftSequence = data.draft_sequence;
           opts.draft = data.draft;
diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
index a763a94c3d..4f3c38b629 100644
--- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6
@@ -1,32 +1,39 @@
-import DiscourseController from 'discourse/controllers/controller';
-import { translateResults }  from 'discourse/lib/search-for-term';
+import DiscourseController  from "discourse/controllers/controller";
+import { translateResults } from "discourse/lib/search-for-term";
 
 export default DiscourseController.extend({
-  loading: Em.computed.not('model'),
-  queryParams: ['q'],
+  needs: ["application"],
+
+  loading: Em.computed.not("model"),
+  queryParams: ["q"],
   q: null,
-  modelChanged: function(){
-    if (this.get('searchTerm') !== this.get('q')) {
-      this.set('searchTerm', this.get('q'));
-    }
-  }.observes('model'),
 
-  qChanged: function(){
-    var model = this.get('model');
-    if (model && this.get('model.q') !== this.get('q')){
-      this.set('searchTerm', this.get('q'));
-      this.send('search');
+  modelChanged: function() {
+    if (this.get("searchTerm") !== this.get("q")) {
+      this.set("searchTerm", this.get("q"));
     }
-  }.observes('q'),
+  }.observes("model"),
+
+  qChanged: function() {
+    const model = this.get("model");
+    if (model && this.get("model.q") !== this.get("q")) {
+      this.set("searchTerm", this.get("q"));
+      this.send("search");
+    }
+  }.observes("q"),
+
+  _showFooter: function() {
+    this.set("controllers.application.showFooter", !this.get("loading"));
+  }.observes("loading"),
+
   actions: {
-    search: function(){
-      var self = this;
-      this.set('q', this.get('searchTerm'));
-      this.set('model', null);
+    search() {
+      this.set("q", this.get("searchTerm"));
+      this.set("model", null);
 
-      Discourse.ajax('/search', {data: {q: this.get('searchTerm')}}).then(function(results) {
-        self.set('model', translateResults(results) || {});
-        self.set('model.q', self.get('q'));
+      Discourse.ajax("/search", { data: { q: this.get("searchTerm") } }).then(results => {
+        this.set("model", translateResults(results) || {});
+        this.set("model.q", this.get("q"));
       });
     }
   }
diff --git a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6 b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
index c923aaf2da..44f374ddbf 100644
--- a/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/merge-topic.js.es6
@@ -1,12 +1,15 @@
 import Presence from 'discourse/mixins/presence';
 import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import ObjectController from 'discourse/controllers/object';
+import { movePosts, mergeTopic } from 'discourse/models/topic';
 
 // Modal related to merging of topics
-export default ObjectController.extend(SelectedPostsCount, ModalFunctionality, Presence, {
+export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, Presence, {
   needs: ['topic'],
 
+  saving: false,
+  selectedTopicId: null,
+
   topicController: Em.computed.alias('controllers.topic'),
   selectedPosts: Em.computed.alias('topicController.selectedPosts'),
   selectedReplies: Em.computed.alias('topicController.selectedReplies'),
@@ -22,38 +25,40 @@ export default ObjectController.extend(SelectedPostsCount, ModalFunctionality, P
     return I18n.t('topic.merge_topic.title');
   }.property('saving'),
 
-  onShow: function() {
+  onShow() {
     this.set('controllers.modal.modalClass', 'split-modal');
   },
 
   actions: {
-    movePostsToExistingTopic: function() {
+    movePostsToExistingTopic() {
+      const topicId = this.get('model.id');
+
       this.set('saving', true);
 
-      var promise = null;
+      let promise = null;
       if (this.get('allPostsSelected')) {
-        promise = Discourse.Topic.mergeTopic(this.get('id'), this.get('selectedTopicId'));
+        promise = mergeTopic(topicId, this.get('selectedTopicId'));
       } else {
-        var postIds = this.get('selectedPosts').map(function(p) { return p.get('id'); }),
-            replyPostIds = this.get('selectedReplies').map(function(p) { return p.get('id'); });
+        const postIds = this.get('selectedPosts').map(function(p) { return p.get('id'); });
+        const replyPostIds = this.get('selectedReplies').map(function(p) { return p.get('id'); });
 
-        promise = Discourse.Topic.movePosts(this.get('id'), {
+        promise = movePosts(topicId, {
           destination_topic_id: this.get('selectedTopicId'),
           post_ids: postIds,
           reply_post_ids: replyPostIds
         });
       }
 
-      var mergeTopicController = this;
+      const self = this;
       promise.then(function(result) {
         // Posts moved
-        mergeTopicController.send('closeModal');
-        mergeTopicController.get('topicController').send('toggleMultiSelect');
+        self.send('closeModal');
+        self.get('topicController').send('toggleMultiSelect');
         Em.run.next(function() { Discourse.URL.routeTo(result.url); });
-      }, function() {
-        // Error moving posts
-        mergeTopicController.flash(I18n.t('topic.merge_topic.error'));
-        mergeTopicController.set('saving', false);
+      }).catch(function() {
+        self.flash(I18n.t('topic.merge_topic.error'));
+      }).finally(function() {
+        self.set('saving', false);
       });
       return false;
     }
diff --git a/app/assets/javascripts/discourse/controllers/split-topic.js.es6 b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
index 98aed2dcce..0c75ae3503 100644
--- a/app/assets/javascripts/discourse/controllers/split-topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/split-topic.js.es6
@@ -1,15 +1,20 @@
 import Presence from 'discourse/mixins/presence';
 import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
 import ModalFunctionality from 'discourse/mixins/modal-functionality';
-import ObjectController from 'discourse/controllers/object';
+import { extractError } from 'discourse/lib/ajax-error';
+import { movePosts } from 'discourse/models/topic';
 
 // Modal related to auto closing of topics
-export default ObjectController.extend(SelectedPostsCount, ModalFunctionality, Presence, {
+export default Ember.Controller.extend(SelectedPostsCount, ModalFunctionality, Presence, {
   needs: ['topic'],
+  topicName: null,
+  saving: false,
+  categoryId: null,
 
   topicController: Em.computed.alias('controllers.topic'),
   selectedPosts: Em.computed.alias('topicController.selectedPosts'),
   selectedReplies: Em.computed.alias('topicController.selectedReplies'),
+  allPostsSelected: Em.computed.alias('topicController.allPostsSelected'),
 
   buttonDisabled: function() {
     if (this.get('saving')) return true;
@@ -21,7 +26,7 @@ export default ObjectController.extend(SelectedPostsCount, ModalFunctionality, P
     return I18n.t('topic.split_topic.action');
   }.property('saving'),
 
-  onShow: function() {
+  onShow() {
     this.setProperties({
       'controllers.modal.modalClass': 'split-modal',
       saving: false,
@@ -31,39 +36,29 @@ export default ObjectController.extend(SelectedPostsCount, ModalFunctionality, P
   },
 
   actions: {
-    movePostsToNewTopic: function() {
+    movePostsToNewTopic() {
       this.set('saving', true);
 
-      var postIds = this.get('selectedPosts').map(function(p) { return p.get('id'); }),
-          replyPostIds = this.get('selectedReplies').map(function(p) { return p.get('id'); }),
-          self = this,
-          categoryId = this.get('categoryId'),
-          saveOpts = {
-            title: this.get('topicName'),
-            post_ids: postIds,
-            reply_post_ids: replyPostIds
-          };
+      const postIds = this.get('selectedPosts').map(function(p) { return p.get('id'); }),
+            replyPostIds = this.get('selectedReplies').map(function(p) { return p.get('id'); }),
+            self = this,
+            categoryId = this.get('categoryId'),
+            saveOpts = {
+              title: this.get('topicName'),
+              post_ids: postIds,
+              reply_post_ids: replyPostIds
+            };
 
       if (!Ember.isNone(categoryId)) { saveOpts.category_id = categoryId; }
 
-      Discourse.Topic.movePosts(this.get('id'), saveOpts).then(function(result) {
+      movePosts(this.get('model.id'), saveOpts).then(function(result) {
         // Posts moved
         self.send('closeModal');
         self.get('topicController').send('toggleMultiSelect');
-        Em.run.next(function() { Discourse.URL.routeTo(result.url); });
+        Ember.run.next(function() { Discourse.URL.routeTo(result.url); });
       }).catch(function(xhr) {
-
-        var error = I18n.t('topic.split_topic.error');
-
-        if (xhr) {
-          var json = xhr.responseJSON;
-          if (json && json.errors) {
-            error = json.errors[0];
-          }
-        }
-
-        // Error moving posts
-        self.flash(error);
+        self.flash(extractError(xhr, I18n.t('topic.split_topic.error')));
+      }).finally(function() {
         self.set('saving', false);
       });
       return false;
diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6
index 2e9050b2d5..c22ce3c26d 100644
--- a/app/assets/javascripts/discourse/controllers/static.js.es6
+++ b/app/assets/javascripts/discourse/controllers/static.js.es6
@@ -1,8 +1,8 @@
 export default Ember.Controller.extend({
-  showLoginButton: Em.computed.equal('model.path', 'login'),
+  showLoginButton: Em.computed.equal("model.path", "login"),
 
   actions: {
-    markFaqRead: function() {
+    markFaqRead() {
       if (this.currentUser) {
         Discourse.ajax("/users/read-faq", { method: "POST" });
       }
diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6
index aace6f8e0f..7dbce6dbb4 100644
--- a/app/assets/javascripts/discourse/controllers/topic.js.es6
+++ b/app/assets/javascripts/discourse/controllers/topic.js.es6
@@ -725,7 +725,8 @@ export default ObjectController.extend(SelectedPostsCount, BufferedContent, {
   },
 
   _showFooter: function() {
-    this.set("controllers.application.showFooter", this.get("model.postStream.loadedAllPosts"));
-  }.observes("model.postStream.loadedAllPosts")
+    const showFooter = this.get("model.postStream.loaded") && this.get("model.postStream.loadedAllPosts");
+    this.set("controllers.application.showFooter", showFooter);
+  }.observes("model.postStream.{loaded,loadedAllPosts}")
 
 });
diff --git a/app/assets/javascripts/discourse/controllers/user-activity.js.es6 b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
index 6113cedff3..7e4ec2db92 100644
--- a/app/assets/javascripts/discourse/controllers/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/controllers/user-activity.js.es6
@@ -5,7 +5,7 @@ export default Ember.ObjectController.extend({
   _showFooter: function() {
     var showFooter;
     if (this.get("userActionType")) {
-      var stat = _.find(this.get("model.stats"), { action_type: this.get("userActionType") });
+      const stat = _.find(this.get("model.stats"), { action_type: this.get("userActionType") });
       showFooter = stat && stat.count <= this.get("model.stream.itemsLoaded");
     } else {
       showFooter = this.get("model.statsCountNonPM") <= this.get("model.stream.itemsLoaded");
diff --git a/app/assets/javascripts/discourse/controllers/users.js.es6 b/app/assets/javascripts/discourse/controllers/users.js.es6
index 8ff6e6e498..8705fb850b 100644
--- a/app/assets/javascripts/discourse/controllers/users.js.es6
+++ b/app/assets/javascripts/discourse/controllers/users.js.es6
@@ -1,19 +1,24 @@
 export default Ember.Controller.extend({
-  queryParams: ['period', 'order', 'asc', 'name'],
-  period: 'weekly',
-  order: 'likes_received',
+  needs: ["application"],
+  queryParams: ["period", "order", "asc", "name"],
+  period: "weekly",
+  order: "likes_received",
   asc: null,
-  name: '',
+  name: "",
 
-  showTimeRead: Ember.computed.equal('period', 'all'),
+  showTimeRead: Ember.computed.equal("period", "all"),
 
   _setName: Discourse.debounce(function() {
-    this.set('name', this.get('nameInput'));
-  }, 500).observes('nameInput'),
+    this.set("name", this.get("nameInput"));
+  }, 500).observes("nameInput"),
+
+  _showFooter: function() {
+    this.set("controllers.application.showFooter", !this.get("model.canLoadMore"));
+  }.observes("model.canLoadMore"),
 
   actions: {
     loadMore() {
-      this.get('model').loadMore();
+      this.get("model").loadMore();
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/dialects/dialect.js b/app/assets/javascripts/discourse/dialects/dialect.js
index 62febca1a7..e80e5e9671 100644
--- a/app/assets/javascripts/discourse/dialects/dialect.js
+++ b/app/assets/javascripts/discourse/dialects/dialect.js
@@ -188,15 +188,8 @@ function hoistCodeBlocksAndSpans(text) {
 
   // /!\ the order is important /!\
 
-  // <pre>...</pre> code blocks
-  text = text.replace(/(^\n*|\n\n)<pre>([\s\S]*?)<\/pre>/ig, function(_, before, content) {
-    var hash = md5(content);
-    hoisted[hash] = escape(showBackslashEscapedCharacters(removeEmptyLines(content)));
-    return before + "<pre>" + hash + "</pre>";
-  });
-
   // fenced code blocks (AKA GitHub code blocks)
-  text = text.replace(/(^\n*|\n\n)```([a-z0-9\-]*)\n([\s\S]*?)\n```/g, function(_, before, language, content) {
+  text = text.replace(/(^\n*|\n)```([a-z0-9\-]*)\n([\s\S]*?)\n```/g, function(_, before, language, content) {
     var hash = md5(content);
     hoisted[hash] = escape(showBackslashEscapedCharacters(removeEmptyLines(content)));
     return before + "```" + language + "\n" + hash + "\n```";
@@ -218,6 +211,13 @@ function hoistCodeBlocksAndSpans(text) {
     return before + "    " + hash + "\n";
   });
 
+  // <pre>...</pre> code blocks
+  text = text.replace(/(\s|^)<pre>([\s\S]*?)<\/pre>/ig, function(_, before, content) {
+    var hash = md5(content);
+    hoisted[hash] = escape(showBackslashEscapedCharacters(removeEmptyLines(content)));
+    return before + "<pre>" + hash + "</pre>";
+  });
+
   // code spans (double & single `)
   ["``", "`"].forEach(function(delimiter) {
     var regexp = new RegExp("(^|[^`])" + delimiter + "([^`\\n]+?)" + delimiter + "([^`]|$)", "g");
@@ -277,11 +277,19 @@ Discourse.Dialect = {
     // If we hoisted out anything, put it back
     var keys = Object.keys(hoisted);
     if (keys.length) {
-      keys.forEach(function(key) {
+      var found = true;
+
+      var unhoist = function(key) {
         result = result.replace(new RegExp(key, "g"), function() {
+          found = true;
           return hoisted[key];
         });
-      });
+      };
+
+      while(found) {
+        found = false;
+        keys.forEach(unhoist);
+      }
     }
 
     return result.trim();
diff --git a/app/assets/javascripts/discourse/dialects/quote_dialect.js b/app/assets/javascripts/discourse/dialects/quote_dialect.js
index 3c50598cfc..28f8de131c 100644
--- a/app/assets/javascripts/discourse/dialects/quote_dialect.js
+++ b/app/assets/javascripts/discourse/dialects/quote_dialect.js
@@ -26,7 +26,9 @@ Discourse.BBCode.register('quote', {noWrap: true, singlePara: true}, function(co
   if (options.lookupAvatarByPostNumber) {
     // client-side, we can retrieve the avatar from the post
     var postNumber = parseInt(params['data-post'], 10);
-    avatarImg = options.lookupAvatarByPostNumber(postNumber);
+    var topicId = parseInt(params['data-topic'], 10);
+
+    avatarImg = options.lookupAvatarByPostNumber(postNumber, topicId);
   } else if (options.lookupAvatar) {
     // server-side, we need to lookup the avatar from the username
     avatarImg = options.lookupAvatar(username);
diff --git a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6 b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
index 1492a11bea..13acb784e9 100644
--- a/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
+++ b/app/assets/javascripts/discourse/helpers/plugin-outlet.js.es6
@@ -47,7 +47,7 @@
 
 **/
 
-let _connectorCache;
+let _connectorCache, _rawCache;
 
 function findOutlets(collection, callback) {
 
@@ -73,6 +73,7 @@ function findOutlets(collection, callback) {
 
 function buildConnectorCache() {
   _connectorCache = {};
+  _rawCache = {};
 
   const uniqueViews = {};
   findOutlets(requirejs._eak_seen, function(outletName, resource, uniqueName) {
@@ -93,10 +94,23 @@ function buildConnectorCache() {
       // We are going to add it back with the proper template
       _connectorCache[outletName].removeObject(viewClass);
     } else {
-      viewClass = Em.View.extend({ classNames: [outletName + '-outlet', uniqueName] });
+      if (!/\.raw$/.test(uniqueName)) {
+        viewClass = Em.View.extend({ classNames: [outletName + '-outlet', uniqueName] });
+      }
+    }
+
+    if (viewClass) {
+      _connectorCache[outletName].pushObject(viewClass.extend(mixin));
+    } else {
+      // we have a raw template
+      if (!_rawCache[outletName]) {
+        _rawCache[outletName] = [];
+      }
+
+      _rawCache[outletName].push(Ember.TEMPLATES[resource]);
     }
-    _connectorCache[outletName].pushObject(viewClass.extend(mixin));
   });
+
 }
 
 var _viewInjections;
@@ -113,6 +127,24 @@ function viewInjections(container) {
   return _viewInjections;
 }
 
+// unbound version of outlets, only has a template
+Handlebars.registerHelper('plugin-outlet', function(name){
+
+  if (!_rawCache) { buildConnectorCache(); }
+
+  const functions = _rawCache[name];
+  if (functions) {
+    var output = [];
+
+    for(var i=0; i<functions.length; i++){
+      output.push(functions[i]({context: this}));
+    }
+
+    return new Handlebars.SafeString(output.join(""));
+  }
+
+});
+
 Ember.HTMLBars._registerHelper('plugin-outlet', function(params, hash, options, env) {
   const connectionName = params[0];
 
@@ -139,3 +171,5 @@ Ember.HTMLBars._registerHelper('plugin-outlet', function(params, hash, options,
     }
   }
 });
+
+
diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
index 9c2a73870e..579aecf4df 100644
--- a/app/assets/javascripts/discourse/helpers/topic-link.js.es6
+++ b/app/assets/javascripts/discourse/helpers/topic-link.js.es6
@@ -5,5 +5,7 @@ registerUnbound('topic-link', function(topic) {
   var url = topic.linked_post_number ? topic.urlForPostNumber(topic.linked_post_number) : topic.get('lastUnreadUrl');
 
   var extraClass = topic.get('last_read_post_number') === topic.get('highest_post_number') ? " visited" : "";
-  return new Handlebars.SafeString("<a href='" + url + "' class='title" + extraClass + "'>" + title + "</a>");
+  var string = "<a href='" + url + "' class='title" + extraClass + "'>" + title + "</a>";
+
+  return new Handlebars.SafeString(string);
 });
diff --git a/app/assets/javascripts/discourse/initializers/show-footer.js.es6 b/app/assets/javascripts/discourse/initializers/show-footer.js.es6
new file mode 100644
index 0000000000..ce58457774
--- /dev/null
+++ b/app/assets/javascripts/discourse/initializers/show-footer.js.es6
@@ -0,0 +1,15 @@
+export default {
+  name: "show-footer",
+
+  initialize(container) {
+    const router = container.lookup("router:main");
+    const application = container.lookup("controller:application");
+
+    // only take care of hiding the footer here
+    // controllers MUST take care of displaying it
+    router.on("willTransition", () => {
+      application.set("showFooter", false);
+      return true;
+    });
+  }
+};
diff --git a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6 b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
index a45a5a3585..f833aa1c09 100644
--- a/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
@@ -35,6 +35,9 @@ export default {
         });
         bus.subscribe('/queue_counts', (data) => {
           user.set('post_queue_new_count', data.post_queue_new_count);
+          if (data.post_queue_new_count > 0) {
+            user.set('show_queued_posts', 1);
+          }
         });
       }
 
diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
index 04d6d0dbc7..bb2a915727 100644
--- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6
+++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6
@@ -1,4 +1,4 @@
-function extractError(error) {
+export function extractError(error, defaultMessage) {
   if (error instanceof Error) {
     Ember.Logger.error(error.stack);
   }
@@ -42,7 +42,7 @@ function extractError(error) {
     }
   }
 
-  return parsedError || I18n.t('generic_error');
+  return parsedError || defaultMessage || I18n.t('generic_error');
 }
 
 export function throwAjaxError(undoCallback) {
diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
index 5d7b18db0f..ce67ff9dfd 100644
--- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
+++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
@@ -94,6 +94,7 @@ function onNotification(data) {
   if (!liveEnabled) { return; }
   if (!primaryTab) { return; }
   if (!isIdle()) { return; }
+  if (localStorage.getItem('notifications-disabled')) { return; }
 
   const notificationTitle = I18n.t(i18nKey(data.notification_type), {
      site_title: Discourse.SiteSettings.title,
diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6
index 00287b21a5..c5b731da09 100644
--- a/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6
+++ b/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6
@@ -11,7 +11,7 @@ var groups = [
   {
     name: "nature",
     fullname: "Nature",
-    tabicon: "leaves",
+    tabicon: "evergreen_tree",
     icons: ["seedling", "evergreen_tree", "deciduous_tree", "palm_tree", "cactus", "tulip", "cherry_blossom", "rose", "hibiscus", "sunflower", "blossom", "bouquet", "ear_of_rice", "herb", "four_leaf_clover", "maple_leaf", "fallen_leaf", "leaves", "mushroom", "chestnut", "rat", "mouse2", "mouse", "hamster", "ox", "water_buffalo", "cow2", "cow", "tiger2", "leopard", "tiger", "rabbit2", "rabbit", "cat2", "cat", "racehorse", "horse", "ram", "sheep", "goat", "rooster", "chicken", "baby_chick", "hatching_chick", "hatched_chick", "bird", "penguin", "elephant", "dromedary_camel", "camel", "boar", "pig2", "pig", "pig_nose", "dog2", "poodle", "dog", "wolf", "bear", "koala", "panda_face", "monkey_face", "see_no_evil", "hear_no_evil", "speak_no_evil", "monkey", "dragon", "dragon_face", "crocodile", "snake", "turtle", "frog", "whale2", "whale", "dolphin", "octopus", "fish", "tropical_fish", "blowfish", "shell", "snail", "bug", "ant", "bee", "beetle", "feet", "zap", "fire", "crescent_moon", "sunny", "partly_sunny", "cloud", "droplet", "sweat_drops", "umbrella", "dash", "snowflake", "star2", "star", "stars", "sunrise_over_mountains", "sunrise", "rainbow", "ocean", "volcano", "milky_way", "mount_fuji", "japan", "globe_with_meridians", "earth_africa", "earth_americas", "earth_asia", "new_moon", "waxing_crescent_moon", "first_quarter_moon", "moon", "full_moon", "waning_gibbous_moon", "last_quarter_moon", "waning_crescent_moon", "new_moon_with_face", "full_moon_with_face", "first_quarter_moon_with_face", "last_quarter_moon_with_face", "sun_with_face"]
   },
   {
@@ -144,7 +144,7 @@ var toolbar = function(selected){
     var icon = g.tabicon;
     var title = g.fullname;
     if (g.name === "recent") {
-      icon = "star2";
+      icon = "star";
       title = "Recent";
     } else if (g.name === "ungrouped") {
       icon = g.icons[0];
diff --git a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6 b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
index 79365f4655..09ef6736c2 100644
--- a/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
+++ b/app/assets/javascripts/discourse/lib/static-route-builder.js.es6
@@ -1,39 +1,42 @@
-import ShowFooter from "discourse/mixins/show-footer";
-
-var configs = {
-  'faq': 'faq_url',
-  'tos': 'tos_url',
-  'privacy': 'privacy_policy_url'
+const configs = {
+  "faq": "faq_url",
+  "tos": "tos_url",
+  "privacy": "privacy_policy_url"
 };
 
-export default function(page) {
-  return Discourse.Route.extend(ShowFooter, {
-    renderTemplate: function() {
-      this.render('static');
+export default (page) => {
+  return Discourse.Route.extend({
+    renderTemplate() {
+      this.render("static");
     },
 
-    beforeModel: function(transition) {
-      var configKey = configs[page];
+    beforeModel(transition) {
+      const configKey = configs[page];
       if (configKey && Discourse.SiteSettings[configKey].length > 0) {
         transition.abort();
         Discourse.URL.redirectTo(Discourse.SiteSettings[configKey]);
       }
     },
 
-    activate: function() {
+    activate() {
       this._super();
-
       // Scroll to an element if exists
       Discourse.URL.scrollToId(document.location.hash);
     },
 
-    model: function() {
+    model() {
       return Discourse.StaticPage.find(page);
     },
 
-    setupController: function(controller, model) {
-      this.controllerFor('static').set('model', model);
+    setupController(controller, model) {
+      this.controllerFor("static").set("model", model);
+    },
+
+    actions: {
+      didTransition() {
+        this.controllerFor("application").set("showFooter", true);
+        return true;
+      }
     }
   });
-}
-
+};
diff --git a/app/assets/javascripts/discourse/mixins/ajax.js b/app/assets/javascripts/discourse/mixins/ajax.js
index a659ed57be..6817150d51 100644
--- a/app/assets/javascripts/discourse/mixins/ajax.js
+++ b/app/assets/javascripts/discourse/mixins/ajax.js
@@ -47,7 +47,8 @@ Discourse.Ajax = Em.Mixin.create({
 
       if (_trackView && (!args.type || args.type === "GET")) {
         _trackView = false;
-        args.headers['Discourse-Track-View'] = true;
+        // DON'T CHANGE: rack is prepending "HTTP_" in the header's name
+        args.headers['DISCOURSE_TRACK_VIEW'] = true;
       }
 
       args.success = function(data, textStatus, xhr) {
diff --git a/app/assets/javascripts/discourse/mixins/scrolling.js b/app/assets/javascripts/discourse/mixins/scrolling.js
index 6178e46a33..c9473c155e 100644
--- a/app/assets/javascripts/discourse/mixins/scrolling.js
+++ b/app/assets/javascripts/discourse/mixins/scrolling.js
@@ -33,6 +33,7 @@ Discourse.Scrolling = Em.Mixin.create({
     }
 
     Discourse.ScrollingDOMMethods.bindOnScroll(onScrollMethod, opts.name);
+    Em.run.scheduleOnce('afterRender', onScrollMethod);
   },
 
   /**
diff --git a/app/assets/javascripts/discourse/mixins/show-footer.js.es6 b/app/assets/javascripts/discourse/mixins/show-footer.js.es6
deleted file mode 100644
index b97014153a..0000000000
--- a/app/assets/javascripts/discourse/mixins/show-footer.js.es6
+++ /dev/null
@@ -1,15 +0,0 @@
-export default Em.Mixin.create({
-  actions: {
-    didTransition() {
-      Em.run.schedule("afterRender", () => {
-        this.controllerFor("application").set("showFooter", true);
-      });
-      return true;
-    },
-
-    willTransition() {
-      this.controllerFor("application").set("showFooter", false);
-      return true;
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6
index 49838fdf72..edde5df3c6 100644
--- a/app/assets/javascripts/discourse/models/composer.js.es6
+++ b/app/assets/javascripts/discourse/models/composer.js.es6
@@ -22,7 +22,9 @@ const CLOSED = 'closed',
         topic_id: 'topic.id',
         is_warning: 'isWarning',
         archetype: 'archetypeId',
-        target_usernames: 'targetUsernames'
+        target_usernames: 'targetUsernames',
+        typing_duration_msecs: 'typingTime',
+        composer_open_duration_msecs: 'composerTime'
       },
 
       _edit_topic_serializer = {
@@ -52,6 +54,31 @@ const Composer = RestModel.extend({
   viewOpen: Em.computed.equal('composeState', OPEN),
   viewDraft: Em.computed.equal('composeState', DRAFT),
 
+  composeStateChanged: function() {
+    var oldOpen = this.get('composerOpened');
+
+    if (this.get('composeState') === OPEN) {
+      this.set('composerOpened', oldOpen || new Date());
+    } else {
+      if (oldOpen) {
+        var oldTotal = this.get('composerTotalOpened') || 0;
+        this.set('composerTotalOpened', oldTotal + (new Date() - oldOpen));
+      }
+      this.set('composerOpened', null);
+    }
+  }.observes('composeState'),
+
+  composerTime: function() {
+    var total = this.get('composerTotalOpened') || 0;
+
+    var oldOpen = this.get('composerOpened');
+    if (oldOpen) {
+      total += (new Date() - oldOpen);
+    }
+
+    return total;
+  }.property().volatile(),
+
   archetype: function() {
     return this.get('archetypes').findProperty('id', this.get('archetypeId'));
   }.property('archetypeId'),
@@ -60,6 +87,12 @@ const Composer = RestModel.extend({
     return this.set('metaData', Em.Object.create());
   }.observes('archetype'),
 
+  // view detected user is typing
+  typing: _.throttle(function(){
+    var typingTime = this.get("typingTime") || 0;
+    this.set("typingTime", typingTime + 100);
+  }, 100, {leading: false, trailing: true}),
+
   editingFirstPost: Em.computed.and('editingPost', 'post.firstPost'),
   canEditTitle: Em.computed.or('creatingTopic', 'creatingPrivateMessage', 'editingFirstPost'),
   canCategorize: Em.computed.and('canEditTitle', 'notCreatingPrivateMessage'),
@@ -349,7 +382,9 @@ const Composer = RestModel.extend({
       composeState: opts.composerState || OPEN,
       action: opts.action,
       topic: opts.topic,
-      targetUsernames: opts.usernames
+      targetUsernames: opts.usernames,
+      composerTotalOpened: opts.composerTime,
+      typingTime: opts.typingTime
     });
 
     if (opts.post) {
@@ -420,7 +455,10 @@ const Composer = RestModel.extend({
       post: null,
       title: null,
       editReason: null,
-      stagedPost: false
+      stagedPost: false,
+      typingTime: 0,
+      composerOpened: null,
+      composerTotalOpened: 0
     });
   },
 
@@ -502,7 +540,9 @@ const Composer = RestModel.extend({
       admin: user.get('admin'),
       yours: true,
       read: true,
-      wiki: false
+      wiki: false,
+      typingTime: this.get('typingTime'),
+      composerTime: this.get('composerTime')
     });
 
     this.serialize(_create_serializer, createdPost);
@@ -603,13 +643,20 @@ const Composer = RestModel.extend({
       postId: this.get('post.id'),
       archetypeId: this.get('archetypeId'),
       metaData: this.get('metaData'),
-      usernames: this.get('targetUsernames')
+      usernames: this.get('targetUsernames'),
+      composerTime: this.get('composerTime'),
+      typingTime: this.get('typingTime')
     };
 
     this.set('draftStatus', I18n.t('composer.saving_draft_tip'));
 
     const composer = this;
 
+    if (this._clearingStatus) {
+      Em.run.cancel(this._clearingStatus);
+      this._clearingStatus = null;
+    }
+
     // try to save the draft
     return Discourse.Draft.save(this.get('draftKey'), this.get('draftSequence'), data)
       .then(function() {
@@ -617,7 +664,20 @@ const Composer = RestModel.extend({
       }).catch(function() {
         composer.set('draftStatus', I18n.t('composer.drafts_offline'));
       });
-  }
+  },
+
+  dataChanged: function(){
+    const draftStatus = this.get('draftStatus');
+    const self = this;
+
+    if (draftStatus && !this._clearingStatus) {
+
+      this._clearingStatus = Em.run.later(this, function(){
+        self.set('draftStatus', null);
+        self._clearingStatus = null;
+      }, 1000);
+    }
+  }.observes('title','reply')
 
 });
 
@@ -657,7 +717,9 @@ Composer.reopenClass({
         metaData: draft.metaData,
         usernames: draft.usernames,
         draft: true,
-        composerState: DRAFT
+        composerState: DRAFT,
+        composerTime: draft.composerTime,
+        typingTime: draft.typingTime
       });
     }
   },
diff --git a/app/assets/javascripts/discourse/models/nav_item.js b/app/assets/javascripts/discourse/models/nav-item.js.es6
similarity index 79%
rename from app/assets/javascripts/discourse/models/nav_item.js
rename to app/assets/javascripts/discourse/models/nav-item.js.es6
index 0ea27df11e..def6a3430a 100644
--- a/app/assets/javascripts/discourse/models/nav_item.js
+++ b/app/assets/javascripts/discourse/models/nav-item.js.es6
@@ -7,7 +7,7 @@
   @module Discourse
 **/
 
-Discourse.NavItem = Discourse.Model.extend({
+const NavItem = Discourse.Model.extend({
 
   displayName: function() {
     var categoryName = this.get('categoryName'),
@@ -25,7 +25,7 @@ Discourse.NavItem = Discourse.Model.extend({
       extra.categoryName = Discourse.Formatter.toTitleCase(categoryName);
     }
     return I18n.t("filters." + name.replace("/", ".") + ".title", extra);
-  }.property('categoryName,name,count'),
+  }.property('categoryName', 'name', 'count'),
 
   topicTrackingState: function() {
     return Discourse.TopicTrackingState.current();
@@ -45,8 +45,13 @@ Discourse.NavItem = Discourse.Model.extend({
     return null;
   }.property('name'),
 
-  // href from this item
   href: function() {
+    var customHref = null;
+    _.each(NavItem.customNavItemHrefs, function(cb) {
+      customHref = cb.call(this, this);
+      if (customHref) { return false; }
+    }, this);
+    if (customHref) { return customHref; }
     return Discourse.getURL("/") + this.get('filterMode');
   }.property('filterMode'),
 
@@ -79,10 +84,13 @@ Discourse.NavItem = Discourse.Model.extend({
 
 });
 
-Discourse.NavItem.reopenClass({
+NavItem.reopenClass({
+
+  extraArgsCallbacks: [],
+  customNavItemHrefs: [],
 
   // create a nav item from the text, will return null if there is not valid nav item for this particular text
-  fromText: function(text, opts) {
+  fromText(text, opts) {
     var split = text.split(","),
         name = split[0],
         testName = name.split("/")[0],
@@ -92,13 +100,17 @@ Discourse.NavItem.reopenClass({
     if (!Discourse.Category.list() && testName === "categories") return null;
     if (!Discourse.Site.currentProp('top_menu_items').contains(testName)) return null;
 
-    var args = { name: name, hasIcon: name === "unread" };
+    var args = { name: name, hasIcon: name === "unread" }, extra = null, self = this;
     if (opts.category) { args.category = opts.category; }
     if (opts.noSubcategories) { args.noSubcategories = true; }
+    _.each(NavItem.extraArgsCallbacks, function(cb) {
+      extra = cb.call(self, text, opts);
+      _.merge(args, extra);
+    });
     return Discourse.NavItem.create(args);
   },
 
-  buildList: function(category, args) {
+  buildList(category, args) {
     args = args || {};
     if (category) { args.category = category }
 
@@ -118,3 +130,11 @@ Discourse.NavItem.reopenClass({
   }
 
 });
+
+export default NavItem;
+export function extraNavItemProperties(cb) {
+  NavItem.extraArgsCallbacks.push(cb);
+}
+export function customNavItemHref(cb) {
+  NavItem.customNavItemHrefs.push(cb);
+}
diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6
index d685b2f60c..782cb9fd06 100644
--- a/app/assets/javascripts/discourse/models/topic-list.js.es6
+++ b/app/assets/javascripts/discourse/models/topic-list.js.es6
@@ -1,7 +1,6 @@
 import RestModel from 'discourse/models/rest';
 import Model from 'discourse/models/model';
 
-
 function topicsFrom(result, store) {
   if (!result) { return; }
 
diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6
index 0f06dc4847..2455087411 100644
--- a/app/assets/javascripts/discourse/models/topic.js.es6
+++ b/app/assets/javascripts/discourse/models/topic.js.es6
@@ -1,3 +1,4 @@
+import { flushMap } from 'discourse/models/store';
 import RestModel from 'discourse/models/rest';
 
 const Topic = RestModel.extend({
@@ -462,28 +463,6 @@ Topic.reopenClass({
     return Discourse.ajax(url + ".json", {data: data});
   },
 
-  mergeTopic(topicId, destinationTopicId) {
-    const promise = Discourse.ajax("/t/" + topicId + "/merge-topic", {
-      type: 'POST',
-      data: {destination_topic_id: destinationTopicId}
-    }).then(function (result) {
-      if (result.success) return result;
-      promise.reject(new Error("error merging topic"));
-    });
-    return promise;
-  },
-
-  movePosts(topicId, opts) {
-    const promise = Discourse.ajax("/t/" + topicId + "/move-posts", {
-      type: 'POST',
-      data: opts
-    }).then(function (result) {
-      if (result.success) return result;
-      promise.reject(new Error("error moving posts topic"));
-    });
-    return promise;
-  },
-
   changeOwners(topicId, opts) {
     const promise = Discourse.ajax("/t/" + topicId + "/change-owner", {
       type: 'POST',
@@ -523,4 +502,24 @@ Topic.reopenClass({
   }
 });
 
+function moveResult(result) {
+  if (result.success) {
+    // We should be hesitant to flush the map but moving ids is one rare case
+    flushMap();
+    return result;
+  }
+  throw "error moving posts topic";
+}
+
+export function movePosts(topicId, data) {
+  return Discourse.ajax("/t/" + topicId + "/move-posts", { type: 'POST', data }).then(moveResult);
+}
+
+export function mergeTopic(topicId, destinationTopicId) {
+  return Discourse.ajax("/t/" + topicId + "/merge-topic", {
+    type: 'POST',
+    data: {destination_topic_id: destinationTopicId}
+  }).then(moveResult);
+}
+
 export default Topic;
diff --git a/app/assets/javascripts/discourse/routes/about.js.es6 b/app/assets/javascripts/discourse/routes/about.js.es6
index 5258ea7fbd..f25d64387b 100644
--- a/app/assets/javascripts/discourse/routes/about.js.es6
+++ b/app/assets/javascripts/discourse/routes/about.js.es6
@@ -1,13 +1,16 @@
-import ShowFooter from "discourse/mixins/show-footer";
-
-export default Discourse.Route.extend(ShowFooter, {
-  model: function() {
-    return Discourse.ajax("/about.json").then(function(result) {
-      return result.about;
-    });
+export default Discourse.Route.extend({
+  model() {
+    return Discourse.ajax("/about.json").then(result => result.about);
   },
 
-  titleToken: function() {
+  titleToken() {
     return I18n.t('about.simple_title');
+  },
+
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index b2c58f4fc8..f0af569b02 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -53,7 +53,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
     error(err, transition) {
       if (err.status === 404) {
         // 404
-        this.intermediateTransitionTo('unknown');
+        this.transitionTo('unknown');
         return;
       }
 
@@ -74,7 +74,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
       }
       exceptionController.setProperties({ lastTransition: transition, thrown: err });
 
-      this.intermediateTransitionTo('exception');
+      this.transitionTo('exception');
     },
 
     showLogin: unlessReadOnly('handleShowLogin'),
diff --git a/app/assets/javascripts/discourse/routes/badges-index.js.es6 b/app/assets/javascripts/discourse/routes/badges-index.js.es6
index 67af4625f2..dfb207391f 100644
--- a/app/assets/javascripts/discourse/routes/badges-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-index.js.es6
@@ -1,17 +1,20 @@
-import ShowFooter from "discourse/mixins/show-footer";
-
-export default Discourse.Route.extend(ShowFooter, {
-  model: function() {
-    if (PreloadStore.get('badges')) {
-      return PreloadStore.getAndRemove('badges').then(function(json) {
-        return Discourse.Badge.createFromJson(json);
-      });
+export default Discourse.Route.extend({
+  model() {
+    if (PreloadStore.get("badges")) {
+      return PreloadStore.getAndRemove("badges").then(json => Discourse.Badge.createFromJson(json));
     } else {
-      return Discourse.Badge.findAll({onlyListable: true});
+      return Discourse.Badge.findAll({ onlyListable: true });
     }
   },
 
-  titleToken: function() {
-    return I18n.t('badges.title');
+  titleToken() {
+    return I18n.t("badges.title");
+  },
+
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/badges-show.js.es6 b/app/assets/javascripts/discourse/routes/badges-show.js.es6
index 7b897f03bf..cc4cf0eaa9 100644
--- a/app/assets/javascripts/discourse/routes/badges-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/badges-show.js.es6
@@ -1,43 +1,41 @@
-import ShowFooter from "discourse/mixins/show-footer";
-
-export default Discourse.Route.extend(ShowFooter, {
+export default Discourse.Route.extend({
   actions: {
-    didTransition: function() {
+    didTransition() {
       this.controllerFor("badges/show")._showFooter();
       return true;
     }
   },
 
-  serialize: function(model) {
-    return {id: model.get('id'), slug: model.get('name').replace(/[^A-Za-z0-9_]+/g, '-').toLowerCase()};
+  serialize(model) {
+    return {
+      id: model.get("id"),
+      slug: model.get("name").replace(/[^A-Za-z0-9_]+/g, "-").toLowerCase()
+    };
   },
 
-  model: function(params) {
-    if (PreloadStore.get('badge')) {
-      return PreloadStore.getAndRemove('badge').then(function(json) {
-        return Discourse.Badge.createFromJson(json);
-      });
+  model(params) {
+    if (PreloadStore.get("badge")) {
+      return PreloadStore.getAndRemove("badge").then(json => Discourse.Badge.createFromJson(json));
     } else {
       return Discourse.Badge.findById(params.id);
     }
   },
 
-  afterModel: function(model) {
-    var self = this;
-    return Discourse.UserBadge.findByBadgeId(model.get('id')).then(function(userBadges) {
-      self.userBadges = userBadges;
+  afterModel(model) {
+    return Discourse.UserBadge.findByBadgeId(model.get("id")).then(userBadges => {
+      this.userBadges = userBadges;
     });
   },
 
-  titleToken: function() {
-    var model = this.modelFor('badges.show');
+  titleToken() {
+    const model = this.modelFor("badges.show");
     if (model) {
-      return model.get('displayName');
+      return model.get("displayName");
     }
   },
 
-  setupController: function(controller, model) {
-    controller.set('model', model);
-    controller.set('userBadges', this.userBadges);
+  setupController(controller, model) {
+    controller.set("model", model);
+    controller.set("userBadges", this.userBadges);
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6 b/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
index 6d79b3b487..1615cdaca8 100644
--- a/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/build-admin-user-posts-route.js.es6
@@ -1,31 +1,29 @@
-import ShowFooter from "discourse/mixins/show-footer";
-
 export default function (filter) {
-  return Discourse.Route.extend(ShowFooter, {
+  return Discourse.Route.extend({
     actions: {
-      didTransition: function() {
-        this.controllerFor('user').set('indexStream', true);
+      didTransition() {
+        this.controllerFor("user").set("indexStream", true);
         this.controllerFor("user-posts")._showFooter();
         return true;
       }
     },
 
-    model: function () {
+    model() {
       return this.modelFor("user").get("postsStream");
     },
 
-    afterModel: function () {
+    afterModel() {
       return this.modelFor("user").get("postsStream").filterBy(filter);
     },
 
-    setupController: function(controller, model) {
+    setupController(controller, model) {
       // initialize "canLoadMore"
       model.set("canLoadMore", model.get("itemsLoaded") === 60);
 
       this.controllerFor("user-posts").set("model", model);
     },
 
-    renderTemplate: function() {
+    renderTemplate() {
       this.render("user/posts", { into: "user" });
     }
   });
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 b5a83808d1..c14174fae7 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
@@ -1,36 +1,35 @@
 import UserTopicListRoute from "discourse/routes/user-topic-list";
-import ShowFooter from "discourse/mixins/show-footer";
 
 // A helper to build a user topic list route
-export default function (viewName, path) {
-  return UserTopicListRoute.extend(ShowFooter, {
+export default (viewName, path) => {
+  return UserTopicListRoute.extend({
     userActionType: Discourse.UserAction.TYPES.messages_received,
 
     actions: {
-      didTransition: function() {
+      didTransition() {
         this.controllerFor("user-topics-list")._showFooter();
         return true;
       }
     },
 
-    model: function() {
-      return this.store.findFiltered('topicList', {filter: 'topics/' + path + '/' + this.modelFor('user').get('username_lower')});
+    model() {
+      return this.store.findFiltered("topicList", { filter: "topics/" + path + "/" + this.modelFor("user").get("username_lower") });
     },
 
-    setupController: function() {
+    setupController() {
       this._super.apply(this, arguments);
 
-      this.controllerFor('user-topics-list').setProperties({
+      this.controllerFor("user-topics-list").setProperties({
         hideCategory: true,
         showParticipants: true
       });
 
-      this.controllerFor('user').set('pmView', viewName);
-      this.controllerFor('search').set('contextType', 'private_messages');
+      this.controllerFor("user").set("pmView", viewName);
+      this.controllerFor("search").set("contextType", "private_messages");
     },
 
-    deactivate: function(){
-      this.controllerFor('search').set('contextType', 'user');
+    deactivate() {
+      this.controllerFor("search").set("contextType", "user");
     }
   });
-}
+};
diff --git a/app/assets/javascripts/discourse/routes/discourse.js.es6 b/app/assets/javascripts/discourse/routes/discourse.js.es6
index 2a26642805..a6bba2cb6a 100644
--- a/app/assets/javascripts/discourse/routes/discourse.js.es6
+++ b/app/assets/javascripts/discourse/routes/discourse.js.es6
@@ -4,7 +4,7 @@ const DiscourseRoute = Ember.Route.extend({
   // changes
   resfreshQueryWithoutTransition: false,
 
-  refresh: function() {
+  refresh() {
     if (!this.refreshQueryWithoutTransition) { return this._super(); }
 
     if (!this.router.router.activeTransition) {
@@ -17,13 +17,13 @@ const DiscourseRoute = Ember.Route.extend({
     }
   },
 
-  _refreshTitleOnce: function() {
+  _refreshTitleOnce() {
     this.send('_collectTitleTokens', []);
   },
 
   actions: {
 
-    _collectTitleTokens: function(tokens) {
+    _collectTitleTokens(tokens) {
       // If there's a title token method, call it and get the token
       if (this.titleToken) {
         const t = this.titleToken();
@@ -40,19 +40,19 @@ const DiscourseRoute = Ember.Route.extend({
       return true;
     },
 
-    refreshTitle: function() {
+    refreshTitle() {
       Ember.run.once(this, this._refreshTitleOnce);
     }
   },
 
-  redirectIfLoginRequired: function() {
+  redirectIfLoginRequired() {
     const app = this.controllerFor('application');
     if (app.get('loginRequired')) {
       this.replaceWith('login');
     }
   },
 
-  openTopicDraft: function(model){
+  openTopicDraft(model){
     // If there's a draft, open the create topic composer
     if (model.draft) {
       const composer = this.controllerFor('composer');
@@ -67,7 +67,7 @@ const DiscourseRoute = Ember.Route.extend({
     }
   },
 
-  isPoppedState: function(transition) {
+  isPoppedState(transition) {
     return (!transition._discourse_intercepted) && (!!transition.intent.url);
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6 b/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6
index c46b9b8275..61fd853d10 100644
--- a/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery-categories-route.js.es6
@@ -1,15 +1,14 @@
-import ShowFooter from 'discourse/mixins/show-footer';
-import showModal from 'discourse/lib/show-modal';
+import showModal from "discourse/lib/show-modal";
 import OpenComposer from "discourse/mixins/open-composer";
 
-Discourse.DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, ShowFooter, {
+Discourse.DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, {
   renderTemplate() {
-    this.render('navigation/categories', { outlet: 'navigation-bar' });
-    this.render('discovery/categories', { outlet: 'list-container' });
+    this.render("navigation/categories", { outlet: "navigation-bar" });
+    this.render("discovery/categories", { outlet: "list-container" });
   },
 
   beforeModel() {
-    this.controllerFor('navigation/categories').set('filterMode', 'categories');
+    this.controllerFor("navigation/categories").set("filterMode", "categories");
   },
 
   model() {
@@ -17,11 +16,11 @@ Discourse.DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, ShowFo
     // if default page is categories
     PreloadStore.remove("topic_list");
 
-    return Discourse.CategoryList.list('categories').then(function(list) {
+    return Discourse.CategoryList.list("categories").then(function(list) {
       const tracking = Discourse.TopicTrackingState.current();
       if (tracking) {
-        tracking.sync(list, 'categories');
-        tracking.trackIncoming('categories');
+        tracking.sync(list, "categories");
+        tracking.trackIncoming("categories");
       }
       return list;
     });
@@ -29,15 +28,15 @@ Discourse.DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, ShowFo
 
   titleToken() {
     if (Discourse.Utilities.defaultHomepage() === "categories") { return; }
-    return I18n.t('filters.categories.title');
+    return I18n.t("filters.categories.title");
   },
 
   setupController(controller, model) {
-    controller.set('model', model);
+    controller.set("model", model);
 
     // Only show either the Create Category or Create Topic button
-    this.controllerFor('navigation/categories').set('canCreateCategory', model.get('can_create_category'));
-    this.controllerFor('navigation/categories').set('canCreateTopic', model.get('can_create_topic') && !model.get('can_create_category'));
+    this.controllerFor("navigation/categories").set("canCreateCategory", model.get("can_create_category"));
+    this.controllerFor("navigation/categories").set("canCreateTopic", model.get("can_create_topic") && !model.get("can_create_category"));
 
     this.openTopicDraft(model);
   },
@@ -45,20 +44,25 @@ Discourse.DiscoveryCategoriesRoute = Discourse.Route.extend(OpenComposer, ShowFo
   actions: {
     createCategory() {
       const groups = this.site.groups,
-            everyoneName = groups.findBy('id', 0).name;
+            everyoneName = groups.findBy("id", 0).name;
 
       const model = Discourse.Category.create({
-        color: 'AB9364', text_color: 'FFFFFF', group_permissions: [{group_name: everyoneName, permission_type: 1}],
+        color: "AB9364", text_color: "FFFFFF", group_permissions: [{group_name: everyoneName, permission_type: 1}],
         available_groups: groups.map(g => g.name),
         allow_badges: true
       });
 
-      showModal('editCategory', { model });
-      this.controllerFor('editCategory').set('selectedTab', 'general');
+      showModal("editCategory", { model });
+      this.controllerFor("editCategory").set("selectedTab", "general");
     },
 
     createTopic() {
-      this.openComposer(this.controllerFor('discovery/categories'));
+      this.openComposer(this.controllerFor("discovery/categories"));
+    },
+
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
     }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/discovery.js.es6 b/app/assets/javascripts/discourse/routes/discovery.js.es6
index e5be7da1e3..98d182c42a 100644
--- a/app/assets/javascripts/discourse/routes/discovery.js.es6
+++ b/app/assets/javascripts/discourse/routes/discovery.js.es6
@@ -2,14 +2,15 @@
   The parent route for all discovery routes.
   Handles the logic for showing the loading spinners.
 **/
-import ShowFooter from "discourse/mixins/show-footer";
 import OpenComposer from "discourse/mixins/open-composer";
-import { scrollTop } from 'discourse/mixins/scroll-top';
+import { scrollTop } from "discourse/mixins/scroll-top";
 
-const DiscoveryRoute = Discourse.Route.extend(OpenComposer, ShowFooter, {
-  redirect: function() { return this.redirectIfLoginRequired(); },
+const DiscoveryRoute = Discourse.Route.extend(OpenComposer, {
+  redirect() {
+    return this.redirectIfLoginRequired();
+  },
 
-  beforeModel: function(transition) {
+  beforeModel(transition) {
     if (transition.intent.url === "/" &&
         transition.targetName.indexOf("discovery.top") === -1 &&
         Discourse.User.currentProp("should_be_redirected_to_top")) {
@@ -19,31 +20,31 @@ const DiscoveryRoute = Discourse.Route.extend(OpenComposer, ShowFooter, {
   },
 
   actions: {
-    loading: function() {
-      this.controllerFor('discovery').set("loading", true);
+    loading() {
+      this.controllerFor("discovery").set("loading", true);
       return true;
     },
 
-    loadingComplete: function() {
-      this.controllerFor('discovery').set('loading', false);
-      if (!this.session.get('topicListScrollPosition')) {
+    loadingComplete() {
+      this.controllerFor("discovery").set("loading", false);
+      if (!this.session.get("topicListScrollPosition")) {
         scrollTop();
       }
     },
 
-    didTransition: function() {
+    didTransition() {
       this.controllerFor("discovery")._showFooter();
-      this.send('loadingComplete');
+      this.send("loadingComplete");
       return true;
     },
 
     // clear a pinned topic
-    clearPin: function(topic) {
+    clearPin(topic) {
       topic.clearPin();
     },
 
-    createTopic: function() {
-      this.openComposer(this.controllerFor('discovery/topics'));
+    createTopic() {
+      this.openComposer(this.controllerFor("discovery/topics"));
     }
   }
 
diff --git a/app/assets/javascripts/discourse/routes/exception.js.es6 b/app/assets/javascripts/discourse/routes/exception.js.es6
index a5c5fab878..2c911a989d 100644
--- a/app/assets/javascripts/discourse/routes/exception.js.es6
+++ b/app/assets/javascripts/discourse/routes/exception.js.es6
@@ -1,7 +1,10 @@
-import ShowFooter from "discourse/mixins/show-footer";
+export default Discourse.Route.extend({
+  serialize() { return ""; },
 
-export default Discourse.Route.extend(ShowFooter, {
-  serialize: function() {
-    return "";
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
index b092136ee5..482ebf1fc5 100644
--- a/app/assets/javascripts/discourse/routes/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6
@@ -1,18 +1,23 @@
-import { translateResults }  from 'discourse/lib/search-for-term';
+import { translateResults } from "discourse/lib/search-for-term";
 
 export default Discourse.Route.extend({
-  queryParams: {
-    q: {
-    }
-  },
-  model: function(params) {
+  queryParams: { q: {} },
+
+  model(params) {
     return PreloadStore.getAndRemove("search", function() {
-      return Discourse.ajax('/search', {data: {q: params.q}});
-    }).then(function(results){
-      var model = translateResults(results) || {};
+      return Discourse.ajax("/search", { data: { q: params.q } });
+    }).then(results => {
+      const model = translateResults(results) || {};
       model.q = params.q;
       return model;
     });
+  },
+
+  actions: {
+    didTransition() {
+      this.controllerFor("full-page-search")._showFooter();
+      return true;
+    }
   }
 
 });
diff --git a/app/assets/javascripts/discourse/routes/group-index.js.es6 b/app/assets/javascripts/discourse/routes/group-index.js.es6
index 63a1a23f76..89dec1edd2 100644
--- a/app/assets/javascripts/discourse/routes/group-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-index.js.es6
@@ -1,18 +1,14 @@
-import ShowFooter from "discourse/mixins/show-footer";
-
-export default Discourse.Route.extend(ShowFooter, {
+export default Discourse.Route.extend({
   actions: {
-    didTransition: function() {
-      return true;
-    }
+    didTransition() { return true; }
   },
 
-  model: function() {
-    return this.modelFor('group').findPosts();
+  model() {
+    return this.modelFor("group").findPosts();
   },
 
-  setupController: function(controller, model) {
-    controller.set('model', model);
-    this.controllerFor('group').set('showing', 'index');
+  setupController(controller, model) {
+    controller.set("model", model);
+    this.controllerFor("group").set("showing", "index");
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/group-members.js.es6 b/app/assets/javascripts/discourse/routes/group-members.js.es6
index 4713495d8f..22e328cacf 100644
--- a/app/assets/javascripts/discourse/routes/group-members.js.es6
+++ b/app/assets/javascripts/discourse/routes/group-members.js.es6
@@ -1,12 +1,10 @@
-import ShowFooter from "discourse/mixins/show-footer";
-
-export default Discourse.Route.extend(ShowFooter, {
+export default Discourse.Route.extend({
   model() {
-    return this.modelFor('group');
+    return this.modelFor("group");
   },
 
   setupController(controller, model) {
-    this.controllerFor('group').set('showing', 'members');
+    this.controllerFor("group").set("showing", "members");
     controller.set("model", model);
     model.findMembers();
   }
diff --git a/app/assets/javascripts/discourse/routes/preferences.js.es6 b/app/assets/javascripts/discourse/routes/preferences.js.es6
index 67fd1b923e..d748689f40 100644
--- a/app/assets/javascripts/discourse/routes/preferences.js.es6
+++ b/app/assets/javascripts/discourse/routes/preferences.js.es6
@@ -1,8 +1,7 @@
-import ShowFooter from "discourse/mixins/show-footer";
 import RestrictedUserRoute from "discourse/routes/restricted-user";
 import showModal from 'discourse/lib/show-modal';
 
-export default RestrictedUserRoute.extend(ShowFooter, {
+export default RestrictedUserRoute.extend({
   model() {
     return this.modelFor('user');
   },
diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6
index 63762c7b55..7d5f253341 100644
--- a/app/assets/javascripts/discourse/routes/topic.js.es6
+++ b/app/assets/javascripts/discourse/routes/topic.js.es6
@@ -4,10 +4,9 @@ let isTransitioning = false,
 
 const SCROLL_DELAY = 500;
 
-import ShowFooter from "discourse/mixins/show-footer";
 import showModal from 'discourse/lib/show-modal';
 
-const TopicRoute = Discourse.Route.extend(ShowFooter, {
+const TopicRoute = Discourse.Route.extend({
   redirect() { return this.redirectIfLoginRequired(); },
 
   queryParams: {
diff --git a/app/assets/javascripts/discourse/routes/user-activity-index.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-index.js.es6
index 3f5ae1272a..926ba744e4 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-index.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-index.js.es6
@@ -4,9 +4,9 @@ export default UserActivityStreamRoute.extend({
   userActionType: undefined,
 
   actions: {
-    didTransition: function() {
+    didTransition() {
       this._super();
-      this.controllerFor('user').set('indexStream', true);
+      this.controllerFor("user").set("indexStream", true);
       return true;
     }
   }
diff --git a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
index bec825f849..7447d71217 100644
--- a/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity-stream.js.es6
@@ -1,39 +1,38 @@
-import ShowFooter from "discourse/mixins/show-footer";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
-export default Discourse.Route.extend(ShowFooter, ViewingActionType, {
-  model: function() {
-    return this.modelFor('user').get('stream');
+export default Discourse.Route.extend(ViewingActionType, {
+  model() {
+    return this.modelFor("user").get("stream");
   },
 
-  afterModel: function() {
-    return this.modelFor('user').get('stream').filterBy(this.get('userActionType'));
+  afterModel() {
+    return this.modelFor("user").get("stream").filterBy(this.get("userActionType"));
   },
 
-  renderTemplate: function() {
-    this.render('user_stream');
+  renderTemplate() {
+    this.render("user_stream");
   },
 
-  setupController: function(controller, model) {
-    controller.set('model', model);
-    this.viewingActionType(this.get('userActionType'));
+  setupController(controller, model) {
+    controller.set("model", model);
+    this.viewingActionType(this.get("userActionType"));
   },
 
   actions: {
 
-    didTransition: function() {
+    didTransition() {
       this.controllerFor("user-activity")._showFooter();
       return true;
     },
 
-    removeBookmark: function(userAction) {
-      var user = this.modelFor('user');
-      Discourse.Post.updateBookmark(userAction.get('post_id'), false)
+    removeBookmark(userAction) {
+      var user = this.modelFor("user");
+      Discourse.Post.updateBookmark(userAction.get("post_id"), false)
         .then(function() {
           // remove the user action from the stream
-          user.get('stream').remove(userAction);
+          user.get("stream").remove(userAction);
           // update the counts
-          user.get('stats').forEach(function (stat) {
+          user.get("stats").forEach(function (stat) {
             if (stat.get("action_type") === userAction.action_type) {
               stat.decrementProperty("count");
             }
diff --git a/app/assets/javascripts/discourse/routes/user-activity.js.es6 b/app/assets/javascripts/discourse/routes/user-activity.js.es6
index ca4bd71feb..e654ac9b2c 100644
--- a/app/assets/javascripts/discourse/routes/user-activity.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-activity.js.es6
@@ -1,20 +1,20 @@
 export default Discourse.Route.extend({
-  model: function() {
-    return this.modelFor('user');
+  model() {
+    return this.modelFor("user");
   },
 
-  setupController: function(controller, user) {
-    this.controllerFor('user-activity').set('model', user);
+  setupController(controller, user) {
+    this.controllerFor("user-activity").set("model", user);
 
     // Bring up a draft
-    const composerController = this.controllerFor('composer');
-    controller.set('model', user);
+    const composerController = this.controllerFor("composer");
+    controller.set("model", user);
     if (this.currentUser) {
-      Discourse.Draft.get('new_private_message').then(function(data) {
+      Discourse.Draft.get("new_private_message").then(function(data) {
         if (data.draft) {
           composerController.open({
             draft: data.draft,
-            draftKey: 'new_private_message',
+            draftKey: "new_private_message",
             ignoreIfChanged: true,
             draftSequence: data.draft_sequence
           });
diff --git a/app/assets/javascripts/discourse/routes/user-badges.js.es6 b/app/assets/javascripts/discourse/routes/user-badges.js.es6
index d3b39a3b93..fcd099d765 100644
--- a/app/assets/javascripts/discourse/routes/user-badges.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-badges.js.es6
@@ -1,17 +1,23 @@
-import ShowFooter from "discourse/mixins/show-footer";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
-export default Discourse.Route.extend(ShowFooter, ViewingActionType, {
-  model: function() {
-    return Discourse.UserBadge.findByUsername(this.modelFor('user').get('username_lower'), {grouped: true});
+export default Discourse.Route.extend(ViewingActionType, {
+  model() {
+    return Discourse.UserBadge.findByUsername(this.modelFor("user").get("username_lower"), { grouped: true });
   },
 
-  setupController: function(controller, model) {
+  setupController(controller, model) {
     this.viewingActionType(-1);
-    controller.set('model', model);
+    controller.set("model", model);
   },
 
-  renderTemplate: function() {
-    this.render('user/badges', {into: 'user'});
+  renderTemplate() {
+    this.render("user/badges", {into: "user"});
+  },
+
+  actions: {
+    didTransition() {
+      this.controllerFor("application").set("showFooter", true);
+      return true;
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
index 6c42105dd6..21317f3090 100644
--- a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6
@@ -1,33 +1,32 @@
-import ShowFooter from 'discourse/mixins/show-footer';
-import showModal from 'discourse/lib/show-modal';
+import showModal from "discourse/lib/show-modal";
 
-export default Discourse.Route.extend(ShowFooter, {
+export default Discourse.Route.extend({
 
-  model: function(params) {
+  model(params) {
     this.inviteFilter = params.filter;
-    return Discourse.Invite.findInvitedBy(this.modelFor('user'), params.filter);
+    return Discourse.Invite.findInvitedBy(this.modelFor("user"), params.filter);
   },
 
-  afterModel: function(model) {
+  afterModel(model) {
     if (!model.can_see_invite_details) {
-      this.replaceWith('userInvited.show', 'redeemed');
+      this.replaceWith("userInvited.show", "redeemed");
     }
   },
 
   setupController(controller, model) {
     controller.setProperties({
       model: model,
-      user: this.controllerFor('user').get('model'),
+      user: this.controllerFor("user").get("model"),
       filter: this.inviteFilter,
-      searchTerm: '',
+      searchTerm: "",
       totalInvites: model.invites.length
     });
   },
 
   actions: {
     showInvite() {
-      showModal('invite', { model: this.currentUser });
-      this.controllerFor('invite').reset();
+      showModal("invite", { model: this.currentUser });
+      this.controllerFor("invite").reset();
     },
 
     uploadSuccess(filename) {
diff --git a/app/assets/javascripts/discourse/routes/user-notifications.js.es6 b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
index a90c131af2..7c2384db01 100644
--- a/app/assets/javascripts/discourse/routes/user-notifications.js.es6
+++ b/app/assets/javascripts/discourse/routes/user-notifications.js.es6
@@ -1,7 +1,6 @@
-import ShowFooter from "discourse/mixins/show-footer";
 import ViewingActionType from "discourse/mixins/viewing-action-type";
 
-export default Discourse.Route.extend(ShowFooter, ViewingActionType, {
+export default Discourse.Route.extend(ViewingActionType, {
   actions: {
     didTransition() {
       this.controllerFor("user-notifications")._showFooter();
@@ -10,13 +9,12 @@ export default Discourse.Route.extend(ShowFooter, ViewingActionType, {
   },
 
   model() {
-    var user = this.modelFor('user');
-    return this.store.find('notification', {username: user.get('username')});
+    return this.store.find("notification", { username: this.modelFor("user").get("username") });
   },
 
   setupController(controller, model) {
-    controller.set('model', model);
-    controller.set('user', this.modelFor('user'));
+    controller.set("model", model);
+    controller.set("user", this.modelFor("user"));
     this.viewingActionType(-1);
   }
 });
diff --git a/app/assets/javascripts/discourse/routes/users.js.es6 b/app/assets/javascripts/discourse/routes/users.js.es6
index e9d516543f..beb25276fc 100644
--- a/app/assets/javascripts/discourse/routes/users.js.es6
+++ b/app/assets/javascripts/discourse/routes/users.js.es6
@@ -9,16 +9,16 @@ export default Discourse.Route.extend({
   refreshQueryWithoutTransition: true,
 
   titleToken() {
-    return I18n.t('directory.title');
+    return I18n.t("directory.title");
   },
 
   resetController(controller, isExiting) {
     if (isExiting) {
       controller.setProperties({
-        period: 'weekly',
-        order: 'likes_received',
+        period: "weekly",
+        order: "likes_received",
         asc: null,
-        name: ''
+        name: ""
       });
     }
   },
@@ -26,11 +26,18 @@ export default Discourse.Route.extend({
   model(params) {
     // If we refresh via `refreshModel` set the old model to loading
     this._params = params;
-    return this.store.find('directoryItem', params);
+    return this.store.find("directoryItem", params);
   },
 
   setupController(controller, model) {
     const params = this._params;
     controller.setProperties({ model, period: params.period, nameInput: params.name });
+  },
+
+  actions: {
+    didTransition() {
+      this.controllerFor("users")._showFooter();
+      return true;
+    }
   }
 });
diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs
index 23822e0f40..7eb87f79e3 100644
--- a/app/assets/javascripts/discourse/templates/application.hbs
+++ b/app/assets/javascripts/discourse/templates/application.hbs
@@ -1,6 +1,10 @@
 {{render "header"}}
 
-<div id='main-outlet' class='wrap'>
+<div id="main-outlet" class="wrap">
+  <div class="container">
+    {{custom-html "top"}}
+    {{global-notice}}
+  </div>
   {{outlet}}
   {{render "user-card"}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/badge-button.hbs b/app/assets/javascripts/discourse/templates/components/badge-button.hbs
index 7c0469791e..4886147389 100644
--- a/app/assets/javascripts/discourse/templates/components/badge-button.hbs
+++ b/app/assets/javascripts/discourse/templates/components/badge-button.hbs
@@ -1,3 +1,3 @@
 {{icon-or-image badge.icon}}
-{{badge.displayName}}
+<span class="badge-display-name">{{badge.displayName}}</span>
 {{yield}}
diff --git a/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
new file mode 100644
index 0000000000..3bc0db1c51
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/desktop-notification-config.hbs
@@ -0,0 +1,20 @@
+
+{{#if isNotSupported}}
+  {{d-button icon="bell-slash" label="user.desktop_notifications.not_supported" disabled="true"}}
+{{/if}}
+{{#if isDefaultPermission}}
+  {{d-button icon="bell-slash" label="user.desktop_notifications.perm_default" action="requestPermission"}}
+{{/if}}
+{{#if isDeniedPermission}}
+  {{d-button icon="bell-slash" label="user.desktop_notifications.perm_denied_btn" action="recheckPermission"}}
+  {{i18n "user.desktop_notifications.perm_denied_expl"}}
+{{/if}}
+{{#if isGrantedPermission}}
+  {{#if isEnabled}}
+    {{d-button icon="bell-slash-o" label="user.desktop_notifications.disable" action="turnoff"}}
+    {{i18n "user.desktop_notifications.currently_enabled"}}
+  {{else}}
+    {{d-button icon="bell-o" label="user.desktop_notifications.enable" action="turnon"}}
+    {{i18n "user.desktop_notifications.currently_disabled"}}
+  {{/if}}
+{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs b/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs
index c092bcaa6e..01d100b718 100644
--- a/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs
@@ -2,7 +2,7 @@
   <li>
     <a class='search-link' href='{{unbound result.url}}'>
       <span class='topic'>
-        {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{unbound result.topic.title}}</span>{{category-badge result.topic.category}}
+        {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{unbound result.topic.title}}</span>{{category-badge result.topic.category}}{{plugin-outlet "search-category"}}
       </span>
       {{#unless site.mobileView}}
         <span class='blurb'>
diff --git a/app/assets/javascripts/discourse/templates/components/small-action.hbs b/app/assets/javascripts/discourse/templates/components/small-action.hbs
index b05c658088..091f0e07df 100644
--- a/app/assets/javascripts/discourse/templates/components/small-action.hbs
+++ b/app/assets/javascripts/discourse/templates/components/small-action.hbs
@@ -11,5 +11,8 @@
       {{avatar post imageSize="small"}}
     </a>
   {{/if}}
-  {{{description}}}
+  <p>{{description}}</p>
+  {{#if post.cooked}}
+    <div class='custom-message'>{{{post.cooked}}}</div>
+  {{/if}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/components/stream-item.hbs b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
new file mode 100644
index 0000000000..c84082519b
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/stream-item.hbs
@@ -0,0 +1,31 @@
+<div class='clearfix info'>
+  <a href={{item.userUrl}} data-user-card={{item.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
+  <span class='time'>{{format-date item.created_at}}</span>
+  {{topic-status topic=item disableActions=true}}
+  <span class="title">
+    <a href={{item.postUrl}}>{{{item.title}}}</a>
+  </span>
+  <div class="category">{{category-link item.category}}</div>
+</div>
+
+{{#if actionDescription}}
+  <p class='excerpt'>{{actionDescription}}</p>
+{{/if}}
+
+<p class='excerpt'>{{{item.excerpt}}}</p>
+
+{{#each item.children as |child|}}
+  <div class='child-actions'>
+    <i class="icon {{child.icon}}"></i>
+    {{#each child.items as |grandChild|}}
+      {{#if grandChild.removableBookmark}}
+        <button class="btn btn-default remove-bookmark" {{action "removeBookmark" grandChild}}>
+          {{fa-icon 'times'}} {{i18n "bookmarks.remove"}}
+        </button>
+      {{else}}
+          <a href={{grandChild.userUrl}} data-user-card={{grandChild.username}} class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}</div></a>
+          {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{grandChild.edit_reason}}</span>{{/if}}
+      {{/if}}
+    {{/each}}
+  </div>
+{{/each}}
diff --git a/app/assets/javascripts/discourse/templates/discovery.hbs b/app/assets/javascripts/discourse/templates/discovery.hbs
index 195db18b2e..1e4548bbe2 100644
--- a/app/assets/javascripts/discourse/templates/discovery.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery.hbs
@@ -1,10 +1,8 @@
-<div class='container'>
-  {{custom-html "top"}}
-  {{global-notice}}
+<div class="container">
   {{discourse-banner user=currentUser banner=site.banner}}
 </div>
 
-<div class='list-controls'>
+<div class="list-controls">
   <div class="container">
     {{outlet "navigation-bar"}}
   </div>
@@ -12,17 +10,17 @@
 
 {{conditional-loading-spinner condition=loading}}
 
-<div class="container list-container {{if loading 'hidden'}}">
+<div class="container list-container {{if loading "hidden"}}">
   <div class="row">
     <div class="full-width">
-      <div id='header-list-area'>
+      <div id="header-list-area">
         {{outlet "header-list-container"}}
       </div>
     </div>
   </div>
   <div class="row">
     <div class="full-width">
-      <div id='list-area'>
+      <div id="list-area">
         {{plugin-outlet "discovery-list-container-top"}}
         {{outlet "list-container"}}
       </div>
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs
index 848215c73e..b04d1e5937 100644
--- a/app/assets/javascripts/discourse/templates/full-page-search.hbs
+++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs
@@ -1,45 +1,49 @@
 <div class="search row">
   {{input type="text" value=searchTerm class="input-xxlarge search no-blur" action="search"}}
-  <button {{action "search"}} class="btn btn-primary"><i class='fa fa-search'></i></button>
+  {{d-button action="search" icon="search" class="btn-primary"}}
 </div>
 
 {{#conditional-loading-spinner condition=loading}}
 
-{{#unless model.posts}}
-<h3>{{i18n "search.no_results"}} <a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a>
-</h3>
-{{/unless}}
+  {{#unless model.posts}}
+    <h3>
+      {{i18n "search.no_results"}} <a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a>
+    </h3>
+  {{/unless}}
 
-{{#each model.posts as |result|}}
-  <div class='fps-result'>
-      <div class='topic'>
-        {{avatar result imageSize="tiny"}}
-        <a class='search-link' href='{{unbound result.url}}'>
-          {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{unbound result.topic.title}}</span>
-        </a>{{category-link result.topic.category}}
-      </div>
-      <div class='blurb container'>
-        <span class='date'>
-        {{format-age result.created_at}}
-        {{#if result.blurb}}
-        -
-        {{/if}}
-        </span>
-        {{#if result.blurb}}
-        {{#highlight-text highlight=controller.q}}
-          {{{unbound result.blurb}}}
-        {{/highlight-text}}
-        {{/if}}
-      </div>
-  </div>
-{{/each}}
+  {{#each model.posts as |result|}}
+    <div class='fps-result'>
+        <div class='topic'>
+          {{avatar result imageSize="tiny"}}
+          <a class='search-link' href='{{unbound result.url}}'>
+            {{topic-status topic=result.topic disableActions=true}}<span class='topic-title'>{{unbound result.topic.title}}</span>
+          </a>
+          <div class='search-category'>
+            {{category-link result.topic.category}}
+            {{plugin-outlet "full-page-search-category"}}
+          </div>
+        </div>
+        <div class='blurb container'>
+          <span class='date'>
+          {{format-age result.created_at}}
+          {{#if result.blurb}}
+          -
+          {{/if}}
+          </span>
+          {{#if result.blurb}}
+            {{#highlight-text highlight=controller.q}}
+              {{{unbound result.blurb}}}
+            {{/highlight-text}}
+          {{/if}}
+        </div>
+    </div>
+  {{/each}}
 
-{{#if model.posts}}
-<h3 class="search-footer">
-  {{i18n "search.no_more_results"}}
-  <a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a>
-</h3>
-{{/if}}
+  {{#if model.posts}}
+  <h3 class="search-footer">
+    {{i18n "search.no_more_results"}}
+    <a href class="show-help" {{action "showSearchHelp" bubbles=false}}>{{i18n "search.search_help"}}</a>
+  </h3>
+  {{/if}}
 
 {{/conditional-loading-spinner}}
-
diff --git a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
index 92f0bd68e9..26c958c4ec 100644
--- a/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs
@@ -10,6 +10,7 @@
   {{#if controller.showTopicPostBadges}}
     {{raw "topic-post-badges" unread=topic.unread newPosts=topic.displayNewPosts unseen=topic.unseen url=topic.lastUnreadUrl}}
   {{/if}}
+  {{plugin-outlet "topic-list-tags"}}
   {{#if expandPinned}}
     {{raw "list/topic-excerpt" topic=topic}}
   {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
index a05ac14f22..e4bf364fc2 100644
--- a/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/merge-topic.hbs
@@ -1,10 +1,4 @@
 <div id='move-selected' class="modal-body">
-  {{#if error}}
-    <div class="alert alert-error">
-      <button class="close" data-dismiss="alert">×</button>
-    </div>
-  {{/if}}
-
   <p>{{{i18n 'topic.merge_topic.instructions' count=selectedPostsCount}}}</p>
 
   <form>
@@ -13,5 +7,7 @@
 </div>
 
 <div class="modal-footer">
-  <button class='btn btn-primary' {{bind-attr disabled="buttonDisabled"}} {{action "movePostsToExistingTopic"}}><i class="fa fa-sign-out"></i>{{buttonTitle}}</button>
+  {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToExistingTopic"}}
+    {{fa-icon 'sign-out'}} {{buttonTitle}}
+  {{/d-button}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
similarity index 59%
rename from app/assets/javascripts/discourse/templates/modal/split_topic.hbs
rename to app/assets/javascripts/discourse/templates/modal/split-topic.hbs
index ff72aab89c..fe80f88174 100644
--- a/app/assets/javascripts/discourse/templates/modal/split_topic.hbs
+++ b/app/assets/javascripts/discourse/templates/modal/split-topic.hbs
@@ -1,10 +1,4 @@
 <div id='move-selected' class="modal-body">
-  {{#if error}}
-    <div class="alert alert-error">
-      <button class="close" data-dismiss="alert">×</button>
-    </div>
-  {{/if}}
-
   {{{i18n 'topic.split_topic.instructions' count=selectedPostsCount}}}
 
   <form>
@@ -18,5 +12,7 @@
 </div>
 
 <div class="modal-footer">
-  <button class='btn btn-primary' {{bind-attr disabled="buttonDisabled"}} {{action "movePostsToNewTopic"}}><i class='fa fa-sign-out'></i>{{buttonTitle}}</button>
+  {{#d-button class="btn-primary" disabled=buttonDisabled action="movePostsToNewTopic"}}
+    {{fa-icon 'sign-out'}} {{buttonTitle}}
+  {{/d-button}}
 </div>
diff --git a/app/assets/javascripts/discourse/templates/queued-posts.hbs b/app/assets/javascripts/discourse/templates/queued-posts.hbs
index 400937caf5..5fc07e042b 100644
--- a/app/assets/javascripts/discourse/templates/queued-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/queued-posts.hbs
@@ -6,7 +6,6 @@
           {{#user-link user=ctrl.post.user}}
             {{avatar ctrl.post.user imageSize="large"}}
           {{/user-link}}
-
         </div>
         <div class='cooked'>
           <div class='names'>
@@ -14,6 +13,9 @@
               {{#user-link user=ctrl.post.user}}
                 {{ctrl.post.user.username}}
               {{/user-link}}
+              {{#if ctrl.post.user.blocked}}
+              <i class='fa fa-ban' title='{{i18n "user.blocked_tooltip"}}'></i>
+              {{/if}}
             </span>
           </div>
           <div class='post-info'>
diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs
index 5267a9febc..c3fd2fdc48 100644
--- a/app/assets/javascripts/discourse/templates/topic.hbs
+++ b/app/assets/javascripts/discourse/templates/topic.hbs
@@ -1,25 +1,23 @@
-<div class='container'>
-  {{custom-html "top"}}
-  {{global-notice}}
-  {{#if model}}
+{{#if model}}
+  <div class="container">
     {{discourse-banner user=currentUser banner=site.banner overlay=view.hasScrolled hide=model.errorLoading}}
-  {{/if}}
-</div>
+  </div>
+{{/if}}
 
 {{plugin-outlet "topic-above-post-stream"}}
 
 {{#if model.postStream.loaded}}
   {{#if model.postStream.firstPostPresent}}
-    <div id='topic-title'>
-      <div class='container'>
+    <div id="topic-title">
+      <div class="container">
 
         <div class="title-wrapper">
           {{#if editingTopic}}
             {{#if model.isPrivateMessage}}
               <span class="private-message-glyph">{{fa-icon "envelope"}}</span>
-              {{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}}
+              {{autofocus-text-field id="edit-title" value=buffered.title maxLength=maxTitleLength}}
             {{else}}
-              {{autofocus-text-field id='edit-title' value=buffered.title maxLength=maxTitleLength}}
+              {{autofocus-text-field id="edit-title" value=buffered.title maxLength=maxTitleLength}}
               <br>
               {{category-chooser valueAttribute="id" value=buffered.category_id source=buffered.category_id}}
             {{/if}}
@@ -36,13 +34,13 @@
 
               {{#if model.details.loaded}}
                 {{topic-status topic=model}}
-                <a href='{{unbound model.url}}' {{action "jumpTop"}} class='fancy-title'>
+                <a href="{{unbound model.url}}" {{action "jumpTop"}} class="fancy-title">
                   {{{model.fancyTitle}}}
                 </a>
               {{/if}}
 
               {{#if model.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>
 
@@ -61,10 +59,10 @@
     {{view "selected-posts"}}
 
     <div class="row">
-      <section class="topic-area" id='topic' data-topic-id='{{unbound model.id}}'>
-        <div class='posts-wrapper'>
+      <section class="topic-area" id="topic" data-topic-id="{{unbound model.id}}">
+        <div class="posts-wrapper">
 
-          {{render 'topic-progress'}}
+          {{render "topic-progress"}}
 
           {{conditional-loading-spinner condition=model.postStream.loadingAbove}}
 
@@ -83,21 +81,21 @@
 
           {{conditional-loading-spinner condition=model.postStream.loadingBelow}}
         </div>
-        <div id='topic-bottom'></div>
+        <div id="topic-bottom"></div>
 
         {{#conditional-loading-spinner condition=model.postStream.loadingFilter}}
           {{#if loadedAllPosts}}
 
-            {{view 'topic-closing' topic=model}}
-            {{view 'topic-footer-buttons' topic=model}}
+            {{view "topic-closing" topic=model}}
+            {{view "topic-footer-buttons" topic=model}}
 
             {{#if model.pending_posts_count}}
-              <div class='has-pending-posts'>
+              <div class="has-pending-posts">
                 {{{i18n "queue.has_pending_posts" count=model.pending_posts_count}}}
 
-                {{#link-to 'queued-posts'}}
-                  {{fa-icon 'check'}}
-                  {{i18n 'queue.view_pending'}}
+                {{#link-to "queued-posts"}}
+                  {{fa-icon "check"}}
+                  {{i18n "queue.view_pending"}}
                 {{/link-to}}
               </div>
             {{/if}}
@@ -105,9 +103,9 @@
             {{plugin-outlet "topic-above-suggested"}}
 
             {{#if model.details.suggested_topics.length}}
-              <div id='suggested-topics'>
-                <h3>{{i18n 'suggested_topics.title'}}</h3>
-                <div class='topics'>
+              <div id="suggested-topics">
+                <h3>{{i18n "suggested_topics.title"}}</h3>
+                <div class="topics">
                   {{basic-topic-list topics=model.details.suggested_topics postsAction="showTopicEntrance"}}
                 </div>
                 <h3>{{{view.browseMoreMessage}}}</h3>
@@ -122,10 +120,10 @@
 
   </div>
 {{else}}
-  <div class='container'>
+  <div class="container">
     {{#conditional-loading-spinner condition=noErrorYet}}
       {{#if model.notFoundHtml}}
-        <div class='not-found'>{{{model.notFoundHtml}}}</div>
+        <div class="not-found">{{{model.notFoundHtml}}}</div>
       {{else}}
         <div class="topic-error">
           <div>{{model.message}}</div>
diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
index 29c5f62bf4..32ad817159 100644
--- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs
+++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs
@@ -76,7 +76,7 @@
                 {{#if invite.reinvited}}
                   {{i18n 'user.invited.reinvited'}}
                 {{else}}
-                  {{d-button icon="user-plus" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}}
+                  {{d-button icon="refresh" action="reinvite" actionParam=invite class="btn" label="user.invited.reinvite"}}
                 {{/if}}
               </td>
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index 9a29f36a87..44d59c94c7 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -189,6 +189,12 @@
       </div>
     </div>
 
+    <div class="control-group notifications">
+      <label class="control-label">{{i18n 'user.desktop_notifications.label'}}</label>
+      {{desktop-notification-config}}
+      <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
+    </div>
+
     <div class="control-group other">
       <label class="control-label">{{i18n 'user.other_settings'}}</label>
 
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index 96e96c8376..c7b3114470 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -1,29 +1,3 @@
-{{#each item in model.content}}
-  <div {{bind-attr class=":item item.hidden item.deleted item.moderator_action"}}>
-    <div class='clearfix info'>
-      <a href="{{unbound item.userUrl}}" data-user-card="{{unbound item.username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a>
-      <span class='time'>{{format-date item.created_at}}</span>
-      {{topic-status topic=item disableActions=true}}
-      <span class="title">
-        <a href="{{unbound item.postUrl}}">{{{unbound item.title}}}</a>
-      </span>
-      <div class="category">{{category-link item.category}}</div>
-    </div>
-    <p class='excerpt'>{{{unbound item.excerpt}}}</p>
-    {{#each child in item.children}}
-      <div class='child-actions'>
-        <i class="icon {{unbound child.icon}}"></i>
-        {{#each grandChild in child.items}}
-          {{#if grandChild.removableBookmark}}
-            <button class="btn btn-default remove-bookmark" {{action "removeBookmark" grandChild}}>
-              {{fa-icon 'times'}} {{i18n "bookmarks.remove"}}
-            </button>
-          {{else}}
-              <a href="{{unbound grandChild.userUrl}}" data-user-card="{{unbound grandChild.username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar grandChild imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}</div></a>
-              {{#if grandChild.edit_reason}} &mdash; <span class="edit-reason">{{unbound grandChild.edit_reason}}</span>{{/if}}
-          {{/if}}
-        {{/each}}
-      </div>
-    {{/each}}
-  </div>
+{{#each model.content as |item|}}
+  {{stream-item item=item removeBookmark="removeBookmark"}}
 {{/each}}
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index f042fa2635..a21b59dd92 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -1,8 +1,3 @@
-<div class='container'>
-  {{custom-html "top"}}
-  {{global-notice}}
-</div>
-
 <div class="container">
   <section class='user-main'>
     <section {{bind-attr class="collapsedInfo :about model.profileBackground:has-background:no-background"}}  style={{model.profileBackground}}>
diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6
index 36a4777933..6c3047ba8f 100644
--- a/app/assets/javascripts/discourse/views/composer.js.es6
+++ b/app/assets/javascripts/discourse/views/composer.js.es6
@@ -85,6 +85,8 @@ const ComposerView = Discourse.View.extend(Ember.Evented, {
     const controller = this.get('controller');
     controller.checkReplyLength();
 
+    this.get('controller.model').typing();
+
     const lastKeyUp = new Date();
     this.set('lastKeyUp', lastKeyUp);
 
@@ -258,9 +260,9 @@ const ComposerView = Discourse.View.extend(Ember.Evented, {
 
     this.editor = editor = Discourse.Markdown.createEditor({
       containerElement: this.element,
-      lookupAvatarByPostNumber(postNumber) {
+      lookupAvatarByPostNumber(postNumber, topicId) {
         const posts = self.get('controller.controllers.topic.model.postStream.posts');
-        if (posts) {
+        if (posts && topicId === self.get('controller.controllers.topic.model.id')) {
           const quotedPost = posts.findProperty("post_number", postNumber);
           if (quotedPost) {
             const username = quotedPost.get('username'),
@@ -543,8 +545,11 @@ const ComposerView = Discourse.View.extend(Ember.Evented, {
 
     this.$('.wmd-preview').off('click.preview');
 
+    const self = this;
+
     Em.run.next(() => {
-      $('#main-outlet').css('padding-bottom', 0);
+      const sizePx = self.get('composeState') === Discourse.Composer.CLOSED ? 0 : $('#reply-control').height();
+      $('#main-outlet').css('padding-bottom', sizePx);
       // need to wait a bit for the "slide down" transition of the composer
       Em.run.later(() => {
         this.appEvents.trigger("composer:closed");
diff --git a/app/assets/javascripts/discourse/views/full-page-search.js.es6 b/app/assets/javascripts/discourse/views/full-page-search.js.es6
index b05aa16848..98225e4f79 100644
--- a/app/assets/javascripts/discourse/views/full-page-search.js.es6
+++ b/app/assets/javascripts/discourse/views/full-page-search.js.es6
@@ -1,5 +1,3 @@
-import ScrollTop from 'discourse/mixins/scroll-top';
+import ScrollTop from "discourse/mixins/scroll-top";
 
-export default Ember.View.extend(ScrollTop, {
-
-});
+export default Ember.View.extend(ScrollTop, {});
diff --git a/app/assets/javascripts/discourse/views/split-topic.js.es6 b/app/assets/javascripts/discourse/views/split-topic.js.es6
index 5ee0d76554..9291495adc 100644
--- a/app/assets/javascripts/discourse/views/split-topic.js.es6
+++ b/app/assets/javascripts/discourse/views/split-topic.js.es6
@@ -2,6 +2,6 @@ import SelectedPostsCount from 'discourse/mixins/selected-posts-count';
 import ModalBodyView from "discourse/views/modal-body";
 
 export default ModalBodyView.extend(SelectedPostsCount, {
-  templateName: 'modal/split_topic',
+  templateName: 'modal/split-topic',
   title: I18n.t('topic.split_topic.title')
 });
diff --git a/app/assets/javascripts/discourse/views/user-activity-stream.js.es6 b/app/assets/javascripts/discourse/views/user-activity-stream.js.es6
new file mode 100644
index 0000000000..86fbaefd8f
--- /dev/null
+++ b/app/assets/javascripts/discourse/views/user-activity-stream.js.es6
@@ -0,0 +1,27 @@
+import LoadMore from "discourse/mixins/load-more";
+
+export default Ember.View.extend(LoadMore, {
+  loading: false,
+  eyelineSelector: '.user-stream .item',
+  classNames: ['user-stream'],
+
+  _scrollTopOnModelChange: function() {
+    Em.run.schedule('afterRender', function() {
+      $(document).scrollTop(0);
+    });
+  }.observes('controller.model.user.id'),
+
+  actions: {
+    loadMore() {
+      const self = this;
+      if (this.get('loading')) { return; }
+
+      this.set('loading', true);
+      const stream = this.get('controller.model');
+      stream.findItems().then(function() {
+        self.set('loading', false);
+        self.get('eyeline').flushRest();
+      });
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/views/user-stream.js.es6 b/app/assets/javascripts/discourse/views/user-stream.js.es6
index 367c089ed0..86fbaefd8f 100644
--- a/app/assets/javascripts/discourse/views/user-stream.js.es6
+++ b/app/assets/javascripts/discourse/views/user-stream.js.es6
@@ -12,12 +12,12 @@ export default Ember.View.extend(LoadMore, {
   }.observes('controller.model.user.id'),
 
   actions: {
-    loadMore: function() {
-      var self = this;
+    loadMore() {
+      const self = this;
       if (this.get('loading')) { return; }
 
       this.set('loading', true);
-      var stream = this.get('controller.model');
+      const stream = this.get('controller.model');
       stream.findItems().then(function() {
         self.set('loading', false);
         self.get('eyeline').flushRest();
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index 668234d4fa..8338d7921f 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -28,6 +28,8 @@
 //= require_tree ./discourse/adapters
 //= require ./discourse/models/rest
 //= require ./discourse/models/model
+//= require ./discourse/models/result-set
+//= require ./discourse/models/store
 //= require ./discourse/models/post-action-type
 //= require ./discourse/models/action-summary
 //= require ./discourse/models/post
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 166829bb16..30a83703ca 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -3,6 +3,24 @@
 @import "common/foundation/mixins";
 @import "common/foundation/helpers";
 
+$mobile-breakpoint: 700px;
+
+// Change the box model for .admin-content
+@media (max-width: $mobile-breakpoint) {
+  .admin-content {
+    box-sizing: border-box;
+    *, *:before, *:after {
+      box-sizing: inherit;
+    }
+
+    input[type="text"] {
+      // Desktop/_discourse.scss sets a height on text-input elements. Using `box-sizing: border-box`
+      // this value either needs to be increased or set to auto. `mobile.css` seems to not set a height on text-inputs.
+      height: auto;
+    }
+  }
+}
+
 .admin-contents table {
   width: 100%;
   tr {text-align: left;}
@@ -32,7 +50,7 @@ td.flaggers td {
 .admin-content {
   margin-bottom: 50px;
   .admin-contents {
-    padding: 8px;
+    padding: 8px 0;
     @include clearfix();
   }
 
@@ -96,6 +114,10 @@ td.flaggers td {
   margin-top: 20px;
 }
 
+.admin-container .controls {
+  @include clearfix;
+}
+
 .admin-title {
   height: 45px;
 }
@@ -103,7 +125,7 @@ td.flaggers td {
 .admin-controls {
   background-color: dark-light-diff($primary, $secondary, 90%, -75%);
   padding: 10px 10px 3px 0;
-  height: 35px;
+  @include clearfix;
   .nav.nav-pills {
     li.active {
       a {
@@ -147,6 +169,14 @@ td.flaggers td {
     label {
       margin-top: 5px;
     }
+    .controls {
+      margin-left: 0;
+    }
+    // Hide the search checkbox for very small screens
+    // Todo: find somewhere to display it - probably requires switching its order in the html
+    @media (max-width: 450px) {
+      display: none;
+    }
   }
   .toggle {
     margin-top: 8px;
@@ -184,6 +214,9 @@ td.flaggers td {
 
 .admin-nav {
   width: 18.018%;
+  @media (max-width: $mobile-breakpoint) {
+    width: 33%;
+  }
   margin-top: 30px;
   .nav-stacked {
     border-right: none;
@@ -196,10 +229,16 @@ td.flaggers td {
 
 .admin-detail {
   width: 76.5765%;
+  @media (max-width: $mobile-breakpoint) {
+    width: 67%;
+  }
   min-height: 800px;
   margin-left: 0;
   border-left: solid 1px dark-light-diff($primary, $secondary, 90%, -60%);
   padding: 30px 0 30px 30px;
+  @media (max-width: $mobile-breakpoint) {
+    padding: 30px 0 30px 16px;
+  }
 }
 
 .settings {
@@ -210,13 +249,27 @@ td.flaggers td {
       float: left;
       width: 17.6576%;
       margin-right: 12px;
+      @media (max-width: $mobile-breakpoint) {
+        float: none;
+        margin-right: 0;
+        width: 100%;
+        h3 {
+          margin-bottom: 6px;
+        }
+      }
     }
     .setting-value {
       float: left;
       width: 53%;
-      .select2-container {
+      @media (max-width: $mobile-breakpoint) {
         width: 100%;
       }
+      .select2-container {
+        width: 100% !important; // Needs !important to override hard-coded value
+        @media (max-width: $mobile-breakpoint) {
+          width: 100% !important; // !important overrides hard-coded mobile width of 68px
+        }
+      }
       .select2-container-multi .select2-choices {
         border: none;
       }
@@ -227,10 +280,15 @@ td.flaggers td {
     .input-setting-string {
       width: 404px;
       @include medium-width { width: 314px; }
-      @include small-width  { width: 284px; }
+      @media (max-width: $mobile-breakpoint) {
+        width: 100%;
+      }
     }
     .input-setting-list {
       width: 408px;
+      @media (max-width: $mobile-breakpoint) {
+        width: 100%;
+      }
       padding: 1px;
       background-color: $secondary;
       border: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
@@ -255,7 +313,7 @@ td.flaggers td {
         border-radius: 3px;
         background-clip: padding-box;
         -moz-user-select: none;
-        background-color: none;
+        background-color: transparent;
         width: 3em;
         height: 1em;
       }
@@ -553,6 +611,8 @@ section.details {
     .style-name {
       width: 350px;
       height: 25px;
+      // Remove height to for `box-sizing: border-box`
+      height: auto;
     }
     .ace-wrapper {
       position: relative;
@@ -698,10 +758,13 @@ section.details {
 
 .version-check {
 
+  th {
+    text-align: left !important;
+  }
+
   .version-number {
     font-size: 1.286em;
     font-weight: bold;
-    text-align: center;
   }
 
   .face {
@@ -1143,6 +1206,7 @@ table.api-keys {
 
 .staff-actions {
   width: 100%;
+  min-width: 990px;
   .action {
     width: 10.810%;
   }
@@ -1532,3 +1596,19 @@ table#user-badges {
 .permalink-title {
   margin-bottom: 10px;
 }
+
+// Mobile specific styles
+// Mobile view text-inputs need some padding
+.mobile-view .admin-contents {
+  input[type="text"] {
+    padding: 4px;
+  }
+}
+
+.mobile-view .admin-controls {
+  padding: 10px 10px 9px 0;
+}
+
+.mobile-view .full-width {
+  margin: 0;
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss
index 33b5263269..75de8a32a8 100644
--- a/app/assets/stylesheets/common/base/search.scss
+++ b/app/assets/stylesheets/common/base/search.scss
@@ -4,13 +4,14 @@
     max-width: inherit;
   }
 
+  .search-category {
+    margin-top: 3px;
+  }
+
   margin-bottom: 28px;
   max-width: 675px;
   .topic {
-    a {
-      color: scale-color($primary, $lightness: 10%);
-    }
-    line-height: 20px;
+     padding-bottom: 2px;
   }
   .avatar {
     position: relative;
@@ -19,15 +20,15 @@
   }
   .search-link {
     .topic-statuses, .topic-title {
-      font-size: 1.4em;
+      font-size: 1.25em;
     }
   }
   .blurb {
     font-size: 1.0em;
-    line-height: 24px;
+    line-height: 20px;
     word-wrap: break-word;
     clear: both;
-    color: scale-color($primary, $lightness: 20%);
+    color: scale-color($primary, $lightness: 40%);
     .date {
       color: scale-color($primary, $lightness: 40%);
     }
diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss
index 24691c940e..74b87c8265 100644
--- a/app/assets/stylesheets/common/base/user-badges.scss
+++ b/app/assets/stylesheets/common/base/user-badges.scss
@@ -51,7 +51,9 @@
     }
 
     img {
-      display: inline-block;
+      display: block;
+      margin: auto;
+      margin-bottom: 4px;
       width: 55px;
       height: 55px;
     }
diff --git a/app/assets/stylesheets/common/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss
index 0c05fd1982..2821356313 100644
--- a/app/assets/stylesheets/common/components/buttons.css.scss
+++ b/app/assets/stylesheets/common/components/buttons.css.scss
@@ -128,8 +128,7 @@
   &:before {
     margin-right: 9px;
     font-family: FontAwesome;
-    line-height: 1.6em;
-    font-size: 1.3em;
+    font-size: 17px;
   }
   &.google, &.google_oauth2 {
     background: $google;
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 4ccd4f4d1e..027beaa530 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -168,12 +168,14 @@
 
       th {
         text-align: left;
-        border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
-        padding: 5px;
+        border-bottom: 3px solid dark-light-diff($primary, $secondary, 90%, -60%);
+        padding: 0 0 10px 0;
+        color: scale-color($primary, $lightness: 50%);
+        font-weight: normal;
       }
 
       td {
-        padding: 5px;
+        padding: 10px 0 10px 0;
         border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%);
       }
     }
diff --git a/app/assets/stylesheets/embed.css.scss b/app/assets/stylesheets/embed.css.scss
index 5c02a289d6..8ada6da381 100644
--- a/app/assets/stylesheets/embed.css.scss
+++ b/app/assets/stylesheets/embed.css.scss
@@ -50,6 +50,7 @@ article.post {
 
     img {
       max-width: 45px;
+      border-radius: 50%;
     }
   }
 
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index ae7b0ae823..77b634c92e 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -514,6 +514,9 @@ span.highlighted {
 }
 
 .small-action .small-action-desc {
+  p {
+    padding-top: 0;
+  }
   .custom-message {
     margin-left: -40px;
   }
@@ -521,6 +524,7 @@ span.highlighted {
 
 .small-action .topic-avatar {
   padding: 0;
+  margin: 0;
 }
 
 .small-action.time-gap .topic-avatar {
diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index 0d301b1bbb..ea2c3a08f7 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -88,7 +88,18 @@ class PostsController < ApplicationController
   end
 
   def create
+
+    if !is_api? && current_user.blocked?
+
+      # error has parity with what user would get if they posted when blocked
+      # and it went through post creator
+      render json: {errors: [I18n.t("topic_not_found")]}, status: 422
+      return
+    end
+
     @manager_params = create_params
+    @manager_params[:first_post_checks] = !is_api?
+
     manager = NewPostManager.new(current_user, @manager_params)
 
     if is_api?
@@ -353,7 +364,7 @@ class PostsController < ApplicationController
   # If a param is present it uses that result structure.
   def backwards_compatible_json(json_obj, success)
     json_obj.symbolize_keys!
-    if params[:nested_post].blank? && json_obj[:errors].blank?
+    if params[:nested_post].blank? && json_obj[:errors].blank? && json_obj[:action] != :enqueued
       json_obj = json_obj[:post]
     end
 
@@ -403,7 +414,6 @@ class PostsController < ApplicationController
       # Awful hack, but you can't seem to remove the `default_scope` when joining
       # So instead I grab the topics separately
       topic_ids = posts.dup.pluck(:topic_id)
-      secured_category_ids = guardian.secure_category_ids
       topics = Topic.where(id: topic_ids).with_deleted.where.not(archetype: 'private_message')
       topics = topics.secured(guardian)
 
@@ -422,7 +432,9 @@ class PostsController < ApplicationController
       :category,
       :target_usernames,
       :reply_to_post_number,
-      :auto_track
+      :auto_track,
+      :typing_duration_msecs,
+      :composer_open_duration_msecs
     ]
 
     # param munging for WordPress
diff --git a/app/controllers/user_actions_controller.rb b/app/controllers/user_actions_controller.rb
index e4d4079fec..c20f9c8d23 100644
--- a/app/controllers/user_actions_controller.rb
+++ b/app/controllers/user_actions_controller.rb
@@ -24,7 +24,7 @@ class UserActionsController < ApplicationController
       UserAction.stream(opts)
     end
 
-    render_serialized(stream, UserActionSerializer, root: "user_actions")
+    render_serialized(stream, UserActionSerializer, root: 'user_actions')
   end
 
   def show
diff --git a/app/jobs/scheduled/poll_mailbox.rb b/app/jobs/scheduled/poll_mailbox.rb
index 608559dff6..68a1f98632 100644
--- a/app/jobs/scheduled/poll_mailbox.rb
+++ b/app/jobs/scheduled/poll_mailbox.rb
@@ -31,6 +31,9 @@ module Jobs
     end
 
     def handle_failure(mail_string, e)
+
+      Rails.logger.warn("Email can not be processed: #{e}\n\n#{mail_string}") if SiteSetting.log_mail_processing_failures
+
       template_args = {}
       case e
         when Email::Receiver::UserNotSufficientTrustLevelError
diff --git a/app/models/concerns/has_custom_fields.rb b/app/models/concerns/has_custom_fields.rb
index b97e6cf3fb..1e1f3869a1 100644
--- a/app/models/concerns/has_custom_fields.rb
+++ b/app/models/concerns/has_custom_fields.rb
@@ -45,6 +45,8 @@ module HasCustomFields
     has_many :_custom_fields, dependent: :destroy, :class_name => "#{name}CustomField"
     after_save :save_custom_fields
 
+    attr_accessor :preloaded_custom_fields
+
     # To avoid n+1 queries, use this function to retrieve lots of custom fields in one go
     # and create a "sideloaded" version for easy querying by id.
     def self.custom_fields_for_ids(ids, whitelisted_fields)
@@ -73,6 +75,39 @@ module HasCustomFields
       @custom_field_types[name] = type
     end
 
+    def self.preload_custom_fields(objects, fields)
+      if objects.present?
+        map = {}
+
+        empty = {}
+        fields.each do |field|
+          empty[field] = nil
+        end
+
+        objects.each do |obj|
+          map[obj.id] = obj
+          obj.preloaded_custom_fields = empty.dup
+        end
+
+        fk = (name.underscore << "_id")
+
+        "#{name}CustomField".constantize
+          .where("#{fk} in (?)", map.keys)
+          .where("name in (?)", fields)
+          .pluck(fk, :name, :value).each do |id, name, value|
+
+            preloaded = map[id].preloaded_custom_fields
+
+            if preloaded[name].nil?
+              preloaded.delete(name)
+            end
+
+            HasCustomFields::Helpers.append_field(preloaded, name, value, @custom_field_types)
+        end
+
+      end
+    end
+
   end
 
   def reload(options = nil)
@@ -80,12 +115,36 @@ module HasCustomFields
     super
   end
 
+  def custom_field_preloaded?(name)
+    @preloaded_custom_fields && @preloaded_custom_fields.key?(name)
+  end
+
   def clear_custom_fields
     @custom_fields = nil
     @custom_fields_orig = nil
   end
 
+  class PreloadedProxy
+    def initialize(preloaded)
+      @preloaded = preloaded
+    end
+
+    def [](key)
+      if @preloaded.key?(key)
+        @preloaded[key]
+      else
+        # for now you can not mix preload an non preload, it better just to fail
+        raise StandardError, "Attempting to access a non preloaded custom field, this is disallowed to prevent N+1 queries."
+      end
+    end
+  end
+
   def custom_fields
+
+    if @preloaded_custom_fields
+      return @preloaded_proxy ||= PreloadedProxy.new(@preloaded_custom_fields)
+    end
+
     @custom_fields ||= refresh_custom_fields_from_db.dup
   end
 
diff --git a/app/models/draft.rb b/app/models/draft.rb
index 2a209fd0f1..27378ea05e 100644
--- a/app/models/draft.rb
+++ b/app/models/draft.rb
@@ -7,7 +7,11 @@ class Draft < ActiveRecord::Base
     d = find_draft(user,key)
     if d
       return if d.sequence > sequence
-      d.update_columns(data: data, sequence: sequence)
+      exec_sql("UPDATE drafts
+               SET  data = :data,
+                    sequence = :sequence,
+                    revisions = revisions + 1
+               WHERE id = :id", id: d.id, sequence: sequence, data: data)
     else
       Draft.create!(user_id: user.id, draft_key: key, data: data, sequence: sequence)
     end
diff --git a/app/models/post.rb b/app/models/post.rb
index 7dfe6c3e57..00523e187d 100644
--- a/app/models/post.rb
+++ b/app/models/post.rb
@@ -37,6 +37,7 @@ class Post < ActiveRecord::Base
   has_many :uploads, through: :post_uploads
 
   has_one :post_search_data
+  has_one :post_stat
 
   has_many :post_details
 
diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb
index 77111f6151..272eb1c3f4 100644
--- a/app/models/post_mover.rb
+++ b/app/models/post_mover.rb
@@ -123,11 +123,15 @@ class PostMover
   end
 
   def create_moderator_post_in_original_topic
+    move_type_str = PostMover.move_types[@move_type].to_s
+
     original_topic.add_moderator_post(
       user,
-      I18n.t("move_posts.#{PostMover.move_types[@move_type]}_moderator_post",
+      I18n.t("move_posts.#{move_type_str}_moderator_post",
              count: post_ids.count,
-             topic_link: "[#{destination_topic.title}](#{destination_topic.url})"),
+             topic_link: "[#{destination_topic.title}](#{destination_topic.relative_url})"),
+      post_type: Post.types[:small_action],
+      action_code: "split_topic",
       post_number: @first_post_number_moved
     )
   end
diff --git a/app/models/post_stat.rb b/app/models/post_stat.rb
new file mode 100644
index 0000000000..b9b97acb20
--- /dev/null
+++ b/app/models/post_stat.rb
@@ -0,0 +1,3 @@
+class PostStat < ActiveRecord::Base
+  belongs_to :post
+end
diff --git a/app/models/queued_post.rb b/app/models/queued_post.rb
index 39c51a3544..6bbff2a053 100644
--- a/app/models/queued_post.rb
+++ b/app/models/queued_post.rb
@@ -64,8 +64,17 @@ class QueuedPost < ActiveRecord::Base
     QueuedPost.transaction do
       change_to!(:approved, approved_by)
 
+      if user.blocked?
+        user.update_columns(blocked: false)
+      end
+
       creator = PostCreator.new(user, create_options.merge(skip_validations: true))
       created_post = creator.create
+
+      unless created_post && creator.errors.blank?
+        raise StandardError, "Failed to create post #{raw[0..100]} #{creator.errors}"
+      end
+
     end
 
     DiscourseEvent.trigger(:approved_post, self)
diff --git a/app/models/topic_link_click.rb b/app/models/topic_link_click.rb
index 1f3302988c..4a51ca5200 100644
--- a/app/models/topic_link_click.rb
+++ b/app/models/topic_link_click.rb
@@ -29,6 +29,15 @@ class TopicLinkClick < ActiveRecord::Base
     urls << uri.path if uri.try(:host) == Discourse.current_hostname
     urls << url.sub(/\?.*$/, '') if url.include?('?')
 
+    # add a cdn link
+    if uri && Discourse.asset_host.present?
+      cdn_uri = URI.parse(Discourse.asset_host) rescue nil
+      if cdn_uri && cdn_uri.hostname == uri.hostname && uri.path.starts_with?(cdn_uri.path)
+        is_cdn_link = true
+        urls << uri.path[(cdn_uri.path.length)..-1]
+      end
+    end
+
     link = TopicLink.select([:id, :user_id])
 
     # test for all possible URLs
@@ -54,7 +63,9 @@ class TopicLinkClick < ActiveRecord::Base
       return nil unless uri
 
       # Only redirect to whitelisted hostnames
-      return WHITELISTED_REDIRECT_HOSTNAMES.include?(uri.hostname) ? url : nil
+      return url if WHITELISTED_REDIRECT_HOSTNAMES.include?(uri.hostname) || is_cdn_link
+
+      return nil
     end
 
     return url if args[:user_id] && link.user_id == args[:user_id]
diff --git a/app/models/topic_list.rb b/app/models/topic_list.rb
index d58aa67be3..cce332a6d0 100644
--- a/app/models/topic_list.rb
+++ b/app/models/topic_list.rb
@@ -3,6 +3,9 @@ require_dependency 'avatar_lookup'
 class TopicList
   include ActiveModel::Serialization
 
+  cattr_accessor :preloaded_custom_fields
+  self.preloaded_custom_fields = []
+
   attr_accessor :more_topics_url,
                 :prev_topics_url,
                 :draft,
@@ -78,6 +81,10 @@ class TopicList
       ft.topic_list = self
     end
 
+    if TopicList.preloaded_custom_fields.present?
+      Topic.preload_custom_fields(@topics, TopicList.preloaded_custom_fields)
+    end
+
     @topics
   end
 
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 0d4c661d10..9b72a755de 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -154,6 +154,7 @@ SQL
         CASE WHEN coalesce(p.deleted_at, p2.deleted_at, t.deleted_at) IS NULL THEN false ELSE true END deleted,
         p.hidden,
         p.post_type,
+        p.action_code,
         p.edit_reason,
         t.category_id
       FROM user_actions as a
diff --git a/app/models/user_action_observer.rb b/app/models/user_action_observer.rb
index 665a1efdfc..34e6fcabed 100644
--- a/app/models/user_action_observer.rb
+++ b/app/models/user_action_observer.rb
@@ -29,11 +29,11 @@ class UserActionObserver < ActiveRecord::Observer
     return unless action && post && user && post.id
 
     row = {
-        action_type: action,
-        user_id: user.id,
-        acting_user_id: acting_user_id || post.user_id,
-        target_topic_id: post.topic_id,
-        target_post_id: post.id
+      action_type: action,
+      user_id: user.id,
+      acting_user_id: acting_user_id || post.user_id,
+      target_topic_id: post.topic_id,
+      target_post_id: post.id
     }
 
     if post.deleted_at.nil?
@@ -48,12 +48,12 @@ class UserActionObserver < ActiveRecord::Observer
     return if model.is_first_post?
 
     row = {
-        action_type: UserAction::REPLY,
-        user_id: model.user_id,
-        acting_user_id: model.user_id,
-        target_post_id: model.id,
-        target_topic_id: model.topic_id,
-        created_at: model.created_at
+      action_type: UserAction::REPLY,
+      user_id: model.user_id,
+      acting_user_id: model.user_id,
+      target_post_id: model.id,
+      target_topic_id: model.topic_id,
+      created_at: model.created_at
     }
 
     rows = [row]
@@ -79,12 +79,12 @@ class UserActionObserver < ActiveRecord::Observer
 
   def log_topic(model)
     row = {
-        action_type: model.archetype == Archetype.private_message ? UserAction::NEW_PRIVATE_MESSAGE : UserAction::NEW_TOPIC,
-        user_id: model.user_id,
-        acting_user_id: model.user_id,
-        target_topic_id: model.id,
-        target_post_id: -1,
-        created_at: model.created_at
+      action_type: model.archetype == Archetype.private_message ? UserAction::NEW_PRIVATE_MESSAGE : UserAction::NEW_TOPIC,
+      user_id: model.user_id,
+      acting_user_id: model.user_id,
+      target_topic_id: model.id,
+      target_post_id: -1,
+      created_at: model.created_at
     }
 
     rows = [row]
diff --git a/app/serializers/queued_post_serializer.rb b/app/serializers/queued_post_serializer.rb
index 86b36bbda1..43892fa292 100644
--- a/app/serializers/queued_post_serializer.rb
+++ b/app/serializers/queued_post_serializer.rb
@@ -13,7 +13,7 @@ class QueuedPostSerializer < ApplicationSerializer
              :category_id,
              :can_delete_user
 
-  has_one :user, serializer: BasicUserSerializer
+  has_one :user, serializer: AdminUserListSerializer
   has_one :topic, serializer: BasicTopicSerializer
 
   def category_id
diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb
index f6dcf2b9fb..8b39399639 100644
--- a/app/serializers/user_action_serializer.rb
+++ b/app/serializers/user_action_serializer.rb
@@ -22,7 +22,8 @@ class UserActionSerializer < ApplicationSerializer
              :title,
              :deleted,
              :hidden,
-             :moderator_action,
+             :post_type,
+             :action_code,
              :edit_reason,
              :category_id,
              :uploaded_avatar_id,
@@ -32,7 +33,7 @@ class UserActionSerializer < ApplicationSerializer
 
   def excerpt
     cooked = object.cooked || PrettyText.cook(object.raw)
-    PrettyText.excerpt(cooked, 300, { keep_emojis: true }) if cooked
+    PrettyText.excerpt(cooked, 300, keep_emojis: true) if cooked
   end
 
   def avatar_template
@@ -67,10 +68,6 @@ class UserActionSerializer < ApplicationSerializer
     object.title.present?
   end
 
-  def moderator_action
-    object.post_type == Post.types[:moderator_action] || object.post_type == Post.types[:small_action]
-  end
-
   def include_reply_to_post_number?
     object.action_type == UserAction::REPLY
   end
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 012592f0df..df1977566e 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -24,6 +24,12 @@
     <% end %>
     window.onerror(e && e.message, null,null,null,e);
   });
+
+<% if Rails.env.development? || Rails.env.test? %>
+  Ember.ENV.RAISE_ON_DEPRECATION = true
+  Ember.LOG_STACKTRACE_ON_DEPRECATION = true
+<% end %>
+
 </script>
 
 <script>
diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb
index 2786a25422..e68f58beb2 100644
--- a/app/views/layouts/crawler.html.erb
+++ b/app/views/layouts/crawler.html.erb
@@ -16,7 +16,7 @@
   </head>
   <body>
     <%- unless customization_disabled? %>
-      <%= SiteCustomization.custom_header(session[:preview_style]) %>
+      <%= SiteCustomization.custom_header(session[:preview_style], mobile_view? ? :mobile : :desktop) %>
     <%- end %>
     <header>
       <a href="<%= path "/" %>"><img src="<%=SiteSetting.logo_url%>" alt="<%=SiteSetting.title%>" id="site-logo"></a>
diff --git a/app/views/layouts/no_ember.html.erb b/app/views/layouts/no_ember.html.erb
index 019c83f801..fe12e2df93 100644
--- a/app/views/layouts/no_ember.html.erb
+++ b/app/views/layouts/no_ember.html.erb
@@ -16,7 +16,7 @@
 </head>
 <body>
   <%- unless customization_disabled? %>
-    <%= SiteCustomization.custom_header(session[:preview_style]) %>
+    <%= SiteCustomization.custom_header(session[:preview_style], mobile_view? ? :mobile : :desktop) %>
   <%- end %>
   <section id='main'>
     <%= render partial: 'header' %>
@@ -24,5 +24,8 @@
       <%= yield %>
     </div>
   </section>
+  <%- unless customization_disabled? %>
+    <%= SiteCustomization.custom_footer(session[:preview_style], mobile_view? ? :mobile : :desktop) %>
+  <%- end %>
 </body>
 </html>
diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb
index a7f6516311..61862b0613 100644
--- a/app/views/user_notifications/digest.html.erb
+++ b/app/views/user_notifications/digest.html.erb
@@ -56,7 +56,7 @@
       <%- if @new_by_category.present? %>
         <p><%= t('user_notifications.digest.more_topics_category', last_seen_at: @last_seen_at, new_topics_since_seen: @new_topics_since_seen) %></p>
         <div>
-        <%- @new_by_category.each do |c| %>
+        <%- @new_by_category.first(10).each do |c| %>
           <span style='white-space: nowrap'>
             <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>
diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml
index 91b805ba72..507cf19459 100644
--- a/config/locales/client.ar.yml
+++ b/config/locales/client.ar.yml
@@ -1144,7 +1144,6 @@ ar:
         success_message: 'تم الإبلاغ عن الموضوع'
       feature_topic:
         title: "ترشيح هذا الموضوع"
-        pin: "اجعل هذا الموضوع يظهر في أعلى هذه الفئة {{categoryLink}}."
         confirm_pin: "لديك مسبقاً {{count}} مواضيع معلقة. قد تكون كثرة المواضيع المعلقة عبئاً على لمستخدمين الجدد والزوار. هل أنت متأكد أنك تريد تعليق موضوع آخر في هذه الفئة؟"
         unpin: "ازالة هذا الموضوع من أعلى هذه الفئة {{categoryLink}}."
         pin_note: "المستخدمون يستطعون إزالة تثبيت الموضوع بشكل خاص بهم."
@@ -1152,7 +1151,6 @@ ar:
           zero: "ﻻيوجد مواضيع مثبتة في {{categoryLink}}."
           one: "المواضيع المثيتة حالياً في {{categoryLink}} : \n<strong class='badge badge-notification unread'>1</strong>."
           other: "المواضيع المثبتة حالياً في {{categoryLink}} : \n<strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "جعل الموضوع يظهر في أعلى قائمة المواضيع, حتى يزيل تثبيته أحد الأعضاء العاملين."
         confirm_pin_globally: "لديك بالفعل {{count}} الموضوعات معقود على الصعيد العالمي. قد تكون عدة مواضيع معلقة عبئا للمستخدمين الجدد والمجهولين. هل أنت متأكد أنك تريد يعلقون موضوع آخر على الصعيد العالمي؟"
         unpin_globally: "إزالة هذا الموضوع من أعلى لجميع القوائم الموضوع."
         global_pin_note: "يمكن للمستخدمين بفصل موضوع على حدة لأنفسهم. "
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml
index 6fd47bff08..ce5d3b8655 100644
--- a/config/locales/client.cs.yml
+++ b/config/locales/client.cs.yml
@@ -1025,7 +1025,6 @@ cs:
         success_message: 'Téma úspěšně nahlášeno.'
       feature_topic:
         title: "Povýšit téma"
-        pin: "Zobrazovat toto téma na vrcholu {{categoryLink}} kategorie."
         confirm_pin: "Již máte {{count}} připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma v této kategorii?"
         unpin: "Odstranit toto téma z vrcholu {{categoryLink}} kategorie."
         pin_note: "Uživatelé mohou odepnout téma sami pro sebe."
@@ -1033,7 +1032,6 @@ cs:
           zero: "V {{categoryLink}} nejsou žádná připevněná témata."
           one: "V současnosti připevněná téma v {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "V současnosti připevněná téma v {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Zobrazit toto téma na vrcholu všech seznamů témat, dokud do správce neodepne."
         confirm_pin_globally: "Již máte {{count}} globálně připevněných příspěvků. Příliš mnoho připevněných příspěvků může zatěžovat nové nebo anonymní uživatele. Určitě chcete připevnit další téma globálně?"
         unpin_globally: "Odstranit toto téma z vrcholu všech seznamů s tématy."
         global_pin_note: "Uživatelé mohou odepnout téma sami pro sebe."
diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml
index 27dce6e189..7bada86277 100644
--- a/config/locales/client.da.yml
+++ b/config/locales/client.da.yml
@@ -988,7 +988,6 @@ da:
         success_message: 'Du har nu rapporteret dette emne til administrator.'
       feature_topic:
         title: "Fremhæv dette emne"
-        pin: "Lad dette emne stå i toppen af {{categoryLink}} kategorien."
         confirm_pin: "Du har allerede {{count}} fastgjorte emner. Fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et nyt emne i denne kategori?"
         unpin: "Fjern dette emne fra starten af listen i  {{categoryLink}} kategorien."
         pin_note: "Brugere kan unpinne emnet individuelt."
@@ -996,7 +995,6 @@ da:
           zero: "Der er ingen fastgjorte emner i {{categoryLink}}."
           one: "Emner fastgjorte i {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Fastgjorte emner i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Få dette emne til at stå i toppen af alle emne lister, indtil et medlem af \"staff\" unpinner det."
         confirm_pin_globally: "Du har allerede {{count}} globalt fastgjorte emner. For mange fastgjorte emner kan være irriterende for nye og anonyme brugere. Er du sikker på du vil fastgøre et emne mere globalt?"
         unpin_globally: "Fjern dette emne fra toppen af alle emne lister."
         global_pin_note: "Brugere kan unpinne emnet individuelt."
diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml
index 9bd7efab1e..5b8c23ffe3 100644
--- a/config/locales/client.de.yml
+++ b/config/locales/client.de.yml
@@ -108,6 +108,25 @@ de:
       facebook: 'diesen Link auf Facebook teilen'
       google+: 'diesen Link auf Google+ teilen'
       email: 'diesen Link per E-Mail senden'
+    action_codes:
+      autoclosed:
+        enabled: 'hat das Thema %{when} geschlossen'
+        disabled: 'hat das Thema %{when} geöffnet'
+      closed:
+        enabled: 'hat das Thema %{when} geschlossen'
+        disabled: 'hat das Thema %{when} geöffnet'
+      archived:
+        enabled: 'hat das Thema %{when} archiviert'
+        disabled: 'hat das Thema %{when} aus dem Archiv geholt'
+      pinned:
+        enabled: 'hat das Thema %{when} angeheftet'
+        disabled: 'hat das Thema %{when} losgelöst'
+      pinned_globally:
+        enabled: 'hat das Thema %{when} global angeheftet'
+        disabled: 'hat das Thema %{when} losgelöst'
+      visible:
+        enabled: 'hat das Thema %{when} sichtbar gemacht'
+        disabled: 'hat das Thema %{when} unsichtbar gemacht'
     topic_admin_menu: "Thema administrieren"
     emails_are_disabled: "Die ausgehende E-Mail-Kommunikation wurde von einem Administrator global deaktiviert. Es werden keinerlei Benachrichtigungen per E-Mail verschickt."
     edit: 'Titel und Kategorie dieses Themas ändern'
@@ -334,6 +353,8 @@ de:
       topics_entered: "betrachtete Themen"
       post_count: "# Beiträge"
       confirm_delete_other_accounts: "Bist du sicher, dass du diese Konten löschen willst?"
+    user_fields:
+      none: "(wähle eine Option aus)"
     user:
       said: "{{username}}:"
       profile: "Profil"
@@ -793,6 +814,8 @@ de:
     search:
       title: "suche nach Themen, Beiträgen, Benutzern oder Kategorien"
       no_results: "Keine Ergebnisse gefunden."
+      no_more_results: "Es wurde keine weiteren Ergebnisse gefunden."
+      search_help: Hilfe zur Suche
       searching: "Suche ..."
       post_format: "#{{post_number}} von {{username}}"
       context:
@@ -990,17 +1013,19 @@ de:
         success_message: 'Du hast dieses Thema erfolgreich gemeldet.'
       feature_topic:
         title: "Thema hervorheben"
-        pin: "Das Thema immer am Anfang der {{categoryLink}} Kategorie anzeigen."
+        pin: "Dieses Thema am Anfang der {{categoryLink}} Kategorie anzeigen bis"
         confirm_pin: "Es gibt bereits {{count}} angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema in dieser Kategorie anheften?"
-        unpin: "Das Thema vom Anfang der {{categoryLink}} Kategorie loslösen."
+        unpin: "Dieses Thema vom Anfang der {{categoryLink}} Kategorie loslösen."
+        unpin_until: "Dieses Thema vom Anfang der {{categoryLink}} Kategorie loslösen oder bis <strong>%{until}</strong> warten."
         pin_note: "Benutzer können das Thema für sich selbst loslösen."
         already_pinned:
           zero: "Es sind in {{categoryLink}} keine Themen angeheftet."
           one: "Momentan in {{categoryLink}} angeheftete Themen: <strong class='badge badge-notification unread'>1</strong>"
           other: "Momentan in {{categoryLink}} angeheftete Themen: <strong class='badge badge-notification unread'>{{count}}</strong>"
-        pin_globally: "Das Thema immer am Anfang aller Themenlisten anzeigen, bis ein Mitarbeiter es wieder loslöst."
+        pin_globally: "Dieses Thema am Anfang aller Themenlisten anzeigen bis"
         confirm_pin_globally: "Es gibt bereits {{count}} global angeheftete Themen. Zu viele angeheftete Themen könnten neue und unbekannte Benutzer leicht überwältigen. Willst du wirklich noch ein weiteres Thema global anheften?"
-        unpin_globally: "Das Thema vom Anfang aller Themenlisten loslösen."
+        unpin_globally: "Dieses Thema vom Anfang aller Themenlisten loslösen."
+        unpin_globally_until: "Dieses Thema vom Anfang aller Themenlisten loslösen oder bis <strong>%{until}</strong> warten."
         global_pin_note: "Benutzer können das Thema für sich selbst loslösen."
         already_pinned_globally:
           zero: "Es sind keine Themen global angeheftet."
@@ -1488,6 +1513,8 @@ de:
           title: "Gesamt"
         yearly:
           title: "Jährlich"
+        quarterly:
+          title: "Vierteljährlich"
         monthly:
           title: "Monatlich"
         weekly:
@@ -1496,6 +1523,7 @@ de:
           title: "Täglich"
         all_time: "Gesamt"
         this_year: "Jahr"
+        this_quarter: "Quartal"
         this_month: "Monat"
         this_week: "Woche"
         today: "Heute"
@@ -2126,6 +2154,7 @@ de:
         delete: "Löschen"
         cancel: "Abbrechen"
         delete_confirm: "Bist du dir sicher, dass du dieses Benutzerfeld löschen möchtest?"
+        options: "Optionen"
         required:
           title: "Bei Registrierung erforderlich?"
           enabled: "erforderlich"
@@ -2141,6 +2170,7 @@ de:
         field_types:
           text: 'Textfeld'
           confirm: 'Bestätigung'
+          dropdown: "Dropdown-Liste"
       site_text:
         none: "Wähle einen Inhaltstyp, um mit dem Bearbeiten zu beginnen."
         title: 'Textinhalt'
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index e1c4b3c9eb..844729482e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -120,6 +120,7 @@ en:
       email: 'send this link in an email'
 
     action_codes:
+      split_topic: "split this topic"
       autoclosed:
         enabled: 'closed this topic %{when}'
         disabled: 'opened this topic %{when}'
@@ -413,6 +414,17 @@ en:
       invited_by: "Invited By"
       trust_level: "Trust Level"
       notifications: "Notifications"
+      desktop_notifications:
+        label: "Desktop Notifications"
+        not_supported: "Notifications are not supported on this browser. Sorry."
+        perm_default: "Turn On Notifications"
+        perm_denied_btn: "Permission Denied"
+        perm_denied_expl: "You have denied permission for notifications. Use your browser to enable notifications, then click the button when done. (Desktop: The leftmost icon in the address bar. Mobile: 'Site Info'.)"
+        disable: "Disable Notifications"
+        currently_enabled: "(currently enabled)"
+        enable: "Enable Notifications"
+        currently_disabled: "(currently disabled)"
+        each_browser_note: "Note: You have to change this setting on every browser you use."
       dismiss_notifications: "Mark all as Read"
       dismiss_notifications_tooltip: "Mark all unread notifications as read"
       disable_jump_reply: "Don't jump to my post after I reply"
@@ -425,6 +437,7 @@ en:
       admin: "{{user}} is an admin"
       moderator_tooltip: "This user is a moderator"
       admin_tooltip: "This user is an admin"
+      blocked_tooltip: "This user is blocked"
       suspended_notice: "This user is suspended until {{date}}."
       suspended_reason: "Reason: "
       github_profile: "Github"
@@ -492,7 +505,7 @@ en:
         upload_title: "Upload your picture"
         upload_picture: "Upload Picture"
         image_is_not_a_square: "Warning: we've cropped your image; width and height were not equal."
-        cache_notice: "You've successfully changed your avatar but it might take some time to appear due to browser caching."
+        cache_notice: "You've successfully changed your profile picture but it might take some time to appear due to browser caching."
 
       change_profile_background:
         title: "Profile Background"
diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml
index c6ac0008f1..2af3d85a2f 100644
--- a/config/locales/client.es.yml
+++ b/config/locales/client.es.yml
@@ -108,6 +108,25 @@ es:
       facebook: 'comparte este enlace en Facebook'
       google+: 'comparte este enlace en Google+'
       email: 'comparte este enlace por email'
+    action_codes:
+      autoclosed:
+        enabled: 'cerró este tema %{when}'
+        disabled: 'abrió este tema %{when}'
+      closed:
+        enabled: 'cerró este tema %{when}'
+        disabled: 'abrió este tema %{when}'
+      archived:
+        enabled: 'archivó este tema %{when}'
+        disabled: 'desarchivó este tema %{when}'
+      pinned:
+        enabled: 'puso este tema como destacado %{when}'
+        disabled: 'quitó este tema como destacado %{when}'
+      pinned_globally:
+        enabled: 'puso en destacados este team de forma global %{when}'
+        disabled: 'quitó este tema de destacados  %{when}'
+      visible:
+        enabled: 'puso en lista este tema  %{when}'
+        disabled: 'quitó de la lista este tema %{when}'
     topic_admin_menu: "acciones de administrador para el tema"
     emails_are_disabled: "Todos los emails salientes han sido desactivados por un administrador. No se enviará ninguna notificación por email."
     edit: 'editar el título y la categoría de este tema'
@@ -334,6 +353,8 @@ es:
       topics_entered: "temas vistos"
       post_count: "# posts"
       confirm_delete_other_accounts: "¿Seguro que quieres eliminar estas cuentas?"
+    user_fields:
+      none: "(selecciona una opción)"
     user:
       said: "{{username}}:"
       profile: "Perfil"
@@ -793,6 +814,8 @@ es:
     search:
       title: "buscar temas, posts, usuarios o categorías"
       no_results: "No se ha encontrado ningún resultado."
+      no_more_results: "No se encontraron más resultados."
+      search_help: Ayuda para buscar
       searching: "Buscando ..."
       post_format: "#{{post_number}} por {{username}}"
       context:
@@ -988,17 +1011,19 @@ es:
         success_message: 'Has reportado este tema correctamente.'
       feature_topic:
         title: "Característica de este Tema"
-        pin: "Hacer que este tema aparecerá en la parte superior de la {{categoryLink}} categoría."
+        pin: "Hacer que este tema aparezca en el top de la categoría {{categoryLink}} hasta"
         confirm_pin: "Hay ya {{count}} temas destacados. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Seguro que quieres destacar otro tema en esta categoría?"
         unpin: "Eliminar este tema del top de la categoría {{categoryLink}}."
+        unpin_until: "Quitar este tema del top de la categoría {{categoryLink}} o esperar al <strong>%{until}</strong>."
         pin_note: "Los usuarios pueden desanclar el tema de forma individual por sí mismos."
         already_pinned:
           zero: "No hay temas destacados en {{categoryLink}}."
           one: "Temas anclados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Temas anclados actualmente en {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Haz que este tema aparezca en la parte superior de todas las listas de temas, hasta que un miembro del personal le quite el anclaje."
+        pin_globally: "Hacer que este tema aparezca en el top de todas las listas de temas hasta"
         confirm_pin_globally: "Hay ya {{count}} temas destacados globalmente. Que haya demasiados temas destacados puede resultar engorroso para los usuarios nuevos y anónimos. ¿Seguro que quieres destacar otro tema de forma global?"
         unpin_globally: "Eliminar este tema de la parte superior de todas las listas de temas."
+        unpin_globally_until: "Quitar este tema del top de todas las listas de temas o esperar al <strong>%{until}</strong>."
         global_pin_note: "Los usuarios pueden desanclar el tema de forma individual por sí mismos."
         already_pinned_globally:
           zero: "No hay temas destacados globalmente."
@@ -1490,6 +1515,8 @@ es:
           title: "Siempre"
         yearly:
           title: "Año"
+        quarterly:
+          title: "Trimestral"
         monthly:
           title: "Mes"
         weekly:
@@ -1498,6 +1525,7 @@ es:
           title: "Día"
         all_time: "Siempre"
         this_year: "Año"
+        this_quarter: "Trimestre"
         this_month: "Mes"
         this_week: "Semana"
         today: "Hoy"
@@ -2128,6 +2156,7 @@ es:
         delete: "Borrar"
         cancel: "Cancelar"
         delete_confirm: "Esta seguro que quiere borrar ese campo de usuario?"
+        options: "Opciones"
         required:
           title: "¿Requerido al registrarse?"
           enabled: "requerido"
@@ -2143,6 +2172,7 @@ es:
         field_types:
           text: 'Campo de Texto'
           confirm: 'Confirmación'
+          dropdown: "Lista"
       site_text:
         none: "Elige un tipo de contenido para empezar a editar."
         title: 'Contenido de Texto'
diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml
index 2e80df4fae..affc60f66d 100644
--- a/config/locales/client.fa_IR.yml
+++ b/config/locales/client.fa_IR.yml
@@ -758,6 +758,8 @@ fa_IR:
     search:
       title: "جستجوی موضوعات، نوشته ها، کاربران یا دسته‌ بندی ها"
       no_results: "چیزی یافت نشد."
+      no_more_results: "نتایجی بیشتری یافت نشد."
+      search_help: راهنمای جستجو
       searching: "جستجو کردن..."
       post_format: "#{{post_number}} توسط {{username}}"
       context:
@@ -946,7 +948,6 @@ fa_IR:
         success_message: 'شما باموفقیت این موضوع را پرچم زدید'
       feature_topic:
         title: " ویژگی های این موضوع"
-        pin: "این موضوع را قابل رویت بالای دسته بندی {{categoryLink}} کن."
         confirm_pin: "شما قبلا این  {{count}} موضوع را سنجاق کردید. تعداد زیاد موضوع های سنجاق شده شاید برای کاربران جدید یا ناشناس بار سنگینی ایجاد کند. آیا شما اطمینان دارید از سنجاق کردن یک موضوع دیگر در این دسته بندی ؟"
         unpin: "این موضوع را از لیست بالاترین‌ های دسته بندی {{categoryLink}} حذف کن"
         pin_note: "کاربران می توانند موضوع را بصورت جداگانه برای خود از سنجاق در بیاورند"
@@ -954,7 +955,6 @@ fa_IR:
           zero: "دیگر هیچ موضوعات سنجاق شده وجود ندارد در {{categoryLink}}."
           one: "موضوعات در حال حاضر سنجاق شده اند {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "موضوعات در حال حاضر سنجاق شده اند {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "این موضوع را در بالای موضوعات نشان بده٬‌ تا زمانیکه یکی از کارمندان آن را از سنجاق شدن در بیاورند. "
         confirm_pin_globally: "شما قبلا این موضوع {{count}} را بصورت سراسری سنجاق زده اید. تعداد زیاد موضوع های سنجاق شده برای کاربران جدید و ناشناس می تواند سخت باشد. آیا از سنجاق کردن موضوع ها بصورت سراری اطمینان دارید ؟  "
         unpin_globally: "حذف این موضوع از بالای همه لیست موضوعات."
         global_pin_note: "کاربران می توانند موضوع را بصورت جداگانه برای خود از سنجاق در بیاورند"
diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml
index efd88374fe..5738a25739 100644
--- a/config/locales/client.fi.yml
+++ b/config/locales/client.fi.yml
@@ -988,7 +988,6 @@ fi:
         success_message: 'Ketjun liputus onnistui.'
       feature_topic:
         title: "Nosta tämä ketju"
-        pin: "Näytä ketju {{categoryLink}}-alueen ylimmäisenä."
         confirm_pin: "Olet kiinnittänyt jo {{count}} ketjua. Liian monta kiinnitettyä ketjua voi olla liian suuri taakka uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittä vielä uuden ketjun tällä alueella?"
         unpin: "Älä enää pidä tätä ketjua {{categoryLink}}-aluen ylimmäisenä."
         pin_note: "Käyttäjät voivat poistaa ketjun kiinnityksen itseltään."
@@ -996,7 +995,6 @@ fi:
           zero: "Alueella {{categoryLink}} ei ole kiinnitettyjä ketjuja."
           one: "Kiinnitettyjä ketjuja alueella {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Kiinnitettyjä ketjuja alueella {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Kiinnitä tämä ketju kaikkien ketjulistausten ylimmäiseksi, kunnes henkilökunnan jäsen poistaa kiinnityksen."
         confirm_pin_globally: "Olet kiinnittänyt jo {{count}} ketjua kaikille alueille. Liian monta kiinnitettyä ketjua voi olla liian suuri taakka uusille ja kirjautumattomille käyttäjille. Oletko varma, että haluat kiinnittä vielä uuden ketjun kaikille alueille?"
         unpin_globally: "Älä enää pidä tätä ketjua kaikkien alueiden ylimmäisenä."
         global_pin_note: "Käyttäjät voivat poistaa ketjun kiinnityksen itseltään."
diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml
index 902837454e..ad6eae334a 100644
--- a/config/locales/client.fr.yml
+++ b/config/locales/client.fr.yml
@@ -108,6 +108,25 @@ fr:
       facebook: 'partager ce lien sur Facebook'
       google+: 'partager ce lien sur Google+'
       email: 'envoyer ce lien dans un courriel'
+    action_codes:
+      autoclosed:
+        enabled: 'Ce sujet a été fermé %{when}'
+        disabled: 'Ce sujet a été ouvert %{when}'
+      closed:
+        enabled: 'Ce sujet a été fermé %{when}'
+        disabled: 'Ce sujet a été ouvert %{when}'
+      archived:
+        enabled: 'Ce sujet a été archivé %{when}'
+        disabled: 'Ce sujet a été sorti des archives %{when}'
+      pinned:
+        enabled: 'Ce sujet a été épinglé %{when}'
+        disabled: 'Ce sujet a été désépinglé %{when}'
+      pinned_globally:
+        enabled: 'Ce sujet a été épinglé globalement %{when}'
+        disabled: 'Ce sujet a été désépinglé %{when}'
+      visible:
+        enabled: 'Ce sujet a été listé %{when}'
+        disabled: 'Ce sujet a été sorti de la liste %{when}'
     topic_admin_menu: "actions administrateur pour ce sujet"
     emails_are_disabled: "Le courriel sortant a été désactivé par un administrateur. Aucune notification courriel ne sera envoyée."
     edit: 'éditer le titre et la catégorie de ce sujet'
@@ -334,6 +353,8 @@ fr:
       topics_entered: "sujets visités"
       post_count: "# messages"
       confirm_delete_other_accounts: "Êtes-vous sûr de vouloir supprimer tous ces comptes ?"
+    user_fields:
+      none: "(choisir une option)"
     user:
       said: "{{username}} :"
       profile: "Profil"
@@ -793,6 +814,8 @@ fr:
     search:
       title: "Rechercher les sujets, messages, utilisateurs ou catégories"
       no_results: "Aucun résultat."
+      no_more_results: "Pas davantage de résultats."
+      search_help: Aide pour la recherche
       searching: "Recherche en cours…"
       post_format: "#{{post_number}} par {{username}}"
       context:
@@ -992,17 +1015,19 @@ fr:
         success_message: 'Vous avez signalé ce sujet avec succès.'
       feature_topic:
         title: "Mettre ce sujet en évidence"
-        pin: "Faire apparaître ce sujet en haut de la catégorie {{categoryLink}}."
+        pin: "Faire apparaître ce sujet en haut de la catégorie {{categoryLink}} jusqu'à"
         confirm_pin: "Vous avez déjà {{count}} sujets épinglés. S'il y a trop de sujets épinglés cela peut être lourd pour les nouveaux utilisateurs et utilisateurs anonymes. Êtes-vous sûr de vouloir ajouter un nouveau sujet épinglé dans cette catégorie?"
         unpin: "Enlever ce sujet du haut de la catégorie {{categoryLink}}."
+        unpin_until: "Enlever ce sujet du haut de la catégorie {{categoryLink}} ou attendre jusqu'à <strong>%{until}</strong>."
         pin_note: "Les utilisateurs peuvent enlever l'épingle de ce sujet eux-mêmes."
         already_pinned:
           zero: "Aucun sujet actuellement épinglé dans {{categoryLink}}."
           one: "Sujets actuellement épinglés dans  {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Sujets actuellement épinglés dans  {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Faire apparaître ce sujet en haut de toutes les listes de sujet, jusqu'à ce qu'un responsable l'enlève."
+        pin_globally: "Faire apparaître ce sujet en haut de toutes les listes de sujet jusqu'à "
         confirm_pin_globally: "Vous avez déjà {{count}} sujets épinglés globalement. S'il y a trop de sujets épinglés cela peut être lourd pour les nouveaux utilisateurs et les utilisateurs anonymes. Êtes-vous sûr de vouloir rajouter une sujet épinglé globalement?"
         unpin_globally: "Enlever ce sujet du haut de toutes les listes de sujet."
+        unpin_globally_until: "Enlever ce sujet du haut de toutes les listes de sujet ou attendre jusqu'à <strong>%{until}</strong>."
         global_pin_note: "Les utilisateurs peuvent enlever l'épingle du sujet individuellement."
         already_pinned_globally:
           zero: "Aucun sujet épinglé globalement."
@@ -1494,6 +1519,8 @@ fr:
           title: "depuis toujours"
         yearly:
           title: "Annuel"
+        quarterly:
+          title: "Trimestriel"
         monthly:
           title: "Mensuel"
         weekly:
@@ -1502,6 +1529,7 @@ fr:
           title: "Quotidien"
         all_time: "Depuis toujours"
         this_year: "Année"
+        this_quarter: "Trimestre"
         this_month: "Mois"
         this_week: "Semaine"
         today: "Aujourd'hui"
@@ -1910,7 +1938,7 @@ fr:
             delete_post: "supprimer le message"
             impersonate: "incarner"
             anonymize_user: "rendre l'utilisateur anonyme"
-            roll_up: "bloquer des blocs d'IP"
+            roll_up: "consolider des blocs d'IP"
         screened_emails:
           title: "Courriels affichés"
           description: "Lorsque quelqu'un essaye de créé un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée."
@@ -2132,6 +2160,7 @@ fr:
         delete: "Supprimer"
         cancel: "Annuler"
         delete_confirm: "Etes vous sur de vouloir supprimer ce champ utilisateur ?"
+        options: "Options"
         required:
           title: "Obligatoire à l'inscription ?"
           enabled: "obligatoire"
@@ -2147,6 +2176,7 @@ fr:
         field_types:
           text: 'Zone de texte'
           confirm: 'Confirmation'
+          dropdown: "Menu déroulant"
       site_text:
         none: "Choisissez un type de contenu pour commencer l'édition."
         title: 'Contenu'
@@ -2254,7 +2284,7 @@ fr:
         image: "Image"
         delete_confirm: "Etes vous sûr de vouloir supprimer l'emoji :%{name}: ?"
       permalink:
-        title: "Premaliens"
+        title: "Permaliens"
         url: "URL"
         topic_id: "ID sujet"
         topic_title: "Sujet"
diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml
index 2e168c65cd..d47f6a5a0b 100644
--- a/config/locales/client.he.yml
+++ b/config/locales/client.he.yml
@@ -107,6 +107,25 @@ he:
       facebook: 'שתפו קישור זה בפייסבוק'
       google+: 'שתף קישור זה בגוגל+'
       email: 'שלח קישור בדוא"ל'
+    action_codes:
+      autoclosed:
+        enabled: 'סגר את הנושא %{when}'
+        disabled: 'פתח את הנושא %{when}'
+      closed:
+        enabled: 'סגר את הנושא %{when}'
+        disabled: 'פתח את הנושא %{when}'
+      archived:
+        enabled: 'הוסיף את הנושא לארכיון %{when}'
+        disabled: 'הוציא את הנושא מהארכיון %{when}'
+      pinned:
+        enabled: 'נעץ את הנושא %{when}'
+        disabled: 'הסיר את הנושא מנעיצה %{when}'
+      pinned_globally:
+        enabled: 'נעץ את הנושא גלובלית %{when}'
+        disabled: 'הסיר את הנושא מנעיצה %{when}'
+      visible:
+        enabled: 'הוסיף את הנושא לרשימה %{when}'
+        disabled: 'הוציא את הנושא מהרשימה %{when}'
     topic_admin_menu: "פעולות ניהול לנושא"
     emails_are_disabled: "כל הדוא\"ל היוצא נוטרל באופן גורף על ידי מנהל אתר. שום הודעת דוא\"ל, מכל סוג שהוא, תשלח."
     edit: 'ערוך את הכותרת והקטגוריה של הנושא'
@@ -333,6 +352,8 @@ he:
       topics_entered: "כניסה לנושאים"
       post_count: "# פרסומים"
       confirm_delete_other_accounts: "אתה בטוח שברצונך למחוק חשבונות אלו?"
+    user_fields:
+      none: "(בחר נושא)"
     user:
       said: "{{username}}:"
       profile: "פרופיל"
@@ -792,6 +813,8 @@ he:
     search:
       title: "חיפוש נושאים, פרסומים, משתמשים או קטגוריות"
       no_results: "אין תוצאות."
+      no_more_results: "לא נמצאו עוד תוצאות."
+      search_help: עזרה בחיפוש
       searching: "מחפש ..."
       post_format: "#{{post_number}} מאת {{username}}"
       context:
@@ -890,6 +913,7 @@ he:
       toggle_information: "הצגת פרטי נושא"
       read_more_in_category: "רוצה לקרוא עוד? עיין נושאים אחרים ב {{catLink}} או {{latestLink}}."
       read_more: "רוצה לקרוא עוד? {{catLink}} or {{latestLink}}."
+      read_more_MF: "There { UNREAD, plural, =0 {} one { is <a href='/unread'>1 unread</a> } other { are <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: עיין בכל הקטגוריות
       view_latest_topics: הצגת נושאים מדוברים
       suggest_create_topic: לחץ כאן כדי ליצור נושא חדש.
@@ -986,17 +1010,19 @@ he:
         success_message: 'סמנת נושא זה בהצלחה.'
       feature_topic:
         title: "הצגת נושא זה"
-        pin: "גרמו לנושא זה להופיע בראש הקטגוריה {{categoryLink}}."
+        pin: "גרמו לנושא זה להופיע בראש קטגוריה  {{categoryLink}}  עד"
         confirm_pin: "יש לך כבר {{count}} נושאים נעוצים. מספר גדול מידי של נושאים נעוצים עשויים להכביד על משתמשים חדשים או אנונימיים. האם את/ה בטוחים שאתם רוצים להצמיד נושא נוסף בקטגוריה זו? "
         unpin: "הסרת נושא זה מראש הקטגוריה {{categoryLink}}."
+        unpin_until: "גרמו לנושא זה להופיע בראש הקטגוריה {{categoryLink}} או המתן עד <strong>%{until}</strong>."
         pin_note: "המשתמש/ת יכולים להסיר את הנושא באופן עצמאי עבור עצמם."
         already_pinned:
           zero: "אין נושאים מוצמדים בקטגוריה {{categoryLink}}."
           one: "נושאים שנעוצים ב {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "נושאים שנעוצים ב{{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "גרמו לנושא זה להופיע בראש כל רשימות הנושאים, עד שחבר/ת צוות מסירים אותו."
+        pin_globally: "גרמו לנושא זה להופיע בראש כל רשימות הנושאים עד"
         confirm_pin_globally: "יש לך כבר {{count}} נושאים המוצמדים באופן גלובאלי. עודף נושאים מוצמדים עשוי להכביד על משתמשים חדשים או אנונימיים. האם את/ה בטוחים שאתם מעוניינים להצמיד נושא גלובאלי נוסף?"
         unpin_globally: "הסרת נושא זה מראש כל רשימות הנושאים."
+        unpin_globally_until: "הסרת נושא זה מראש כל רשימות הנושאים או המתינו עד <strong>%{until}</strong>."
         global_pin_note: "משתמשים יכולים להסיר את הצמדת הנושא באופן עצמאי לעצמם."
         already_pinned_globally:
           zero: "אין נושאים המוצמדים באופן גלובלי."
diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml
index 358bc4f4b3..d189ecd81e 100644
--- a/config/locales/client.it.yml
+++ b/config/locales/client.it.yml
@@ -980,7 +980,6 @@ it:
         success_message: 'Hai segnalato questo argomento con successo.'
       feature_topic:
         title: "Poni argomento in primo piano"
-        pin: "Fai apparire questo argomento in cima alla categoria {{categoryLink}}."
         confirm_pin: "Hai già {{count}} argomenti puntati. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento in questa categoria?"
         unpin: "Rimuovi questo argomento dalla cima della categoria {{categoryLink}}."
         pin_note: "Gli utenti possono spuntare gli argomenti individualmente per loro stessi."
@@ -988,7 +987,6 @@ it:
           zero: "Non ci sono argomenti puntati in {{categoryLink}}."
           one: "Argomenti attualmente puntati in {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Argomenti attualmente puntati in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Poni questo argomento in cima a tutti gli altri finché un membro dello staff non lo spunterà."
         confirm_pin_globally: "Hai già {{count}} argomenti puntati globalmente. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento globalmente?"
         unpin_globally: "Togli questo argomento dalla cima degli altri argomenti."
         global_pin_note: "Gli utenti possono spuntare gli argomenti autonomamente per loro stessi."
diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml
index b3f83e4348..09ad995d8b 100644
--- a/config/locales/client.ja.yml
+++ b/config/locales/client.ja.yml
@@ -89,6 +89,25 @@ ja:
       facebook: 'Facebook でこのリンクを共有する'
       google+: 'Google+ でこのリンクを共有する'
       email: 'メールでこのリンクを送る'
+    action_codes:
+      autoclosed:
+        enabled: '%{when} にこのトピックを閉じる'
+        disabled: '%{when} にこのトピックを開く'
+      closed:
+        enabled: '%{when} にこのトピックを閉じる'
+        disabled: '%{when} にこのトピックを開く'
+      archived:
+        enabled: '%{when} にこのトピックをアーカイブする'
+        disabled: '%{when} にこのトピックをアーカイブ解除する'
+      pinned:
+        enabled: '%{when} にこのトピックをピン留めする'
+        disabled: '%{when} にこのトピックのピン留めを解除する'
+      pinned_globally:
+        enabled: '%{when} にこのトピックをグローバルにピン留めする'
+        disabled: '%{when} にこのトピックのピン留めを解除する'
+      visible:
+        enabled: '%{when} にこのトピックをリストする'
+        disabled: '%{when} にこのトピックをリストから外す'
     topic_admin_menu: "トピック管理"
     emails_are_disabled: "全てのメールアドレスの送信が管理者によって無効化されています。全ての種類のメール通知は行われません"
     edit: 'このトピックのタイトルとカテゴリを編集'
@@ -304,6 +323,8 @@ ja:
       topics_entered: "Topics Entered"
       post_count: "# ポスト"
       confirm_delete_other_accounts: "これらのアカウントを削除してよいですか？"
+    user_fields:
+      none: "(オプションを選択)"
     user:
       said: "{{username}}:"
       profile: "プロフィール"
@@ -758,6 +779,8 @@ ja:
     search:
       title: "トピック、ポスト、ユーザ、カテゴリを探す"
       no_results: "何も見つかりませんでした。"
+      no_more_results: "これ以上結果が見つかりませんでした。"
+      search_help: 検索ヘルプ
       searching: "検索中..."
       post_format: "#{{post_number}}  {{username}}から"
       context:
@@ -946,17 +969,19 @@ ja:
         success_message: 'このトピックにフラグを立てました。'
       feature_topic:
         title: "トピックを特集"
-        pin: "このトピックを{{categoryLink}}カテゴリのトップに表示する"
+        pin: "{{categoryLink}} カテゴリのトップに表示する"
         confirm_pin: "既に {{count}} 個ピン留めしています。多すぎるピン留めは新規、及び匿名ユーザの負担になる場合があります。このカテゴリの別のトピックのピン留めを続けますか？"
         unpin: "{{categoryLink}} カテゴリのトップからトピックを削除"
+        unpin_until: "{{categoryLink}} カテゴリのトップからこのトピックを削除するか、<strong>%{until}</strong> まで待つ。"
         pin_note: "ユーザはトピックを個別にピン留め解除することができます"
         already_pinned:
           zero: "{{categoryLink}}にはピン留めされたトピックはありません"
           one: "{{categoryLink}}内のトピックは現在<strong  class='badge badge-notification unread'>1</strong>個ピン留めされています。"
           other: "{{categoryLink}}内のトピックは現在<strong  class='badge badge-notification unread'>{{count}}</strong>個ピン留めされています。"
-        pin_globally: "スタッフメンバーがこのトピックをピン留め解除しない限り、トピック一覧のトップに表示する"
+        pin_globally: "このトピックをすべてのトピックリストのトップに表示する"
         confirm_pin_globally: "既に{{count}} 個ピン留めしています。　多すぎるピン留めは新規ユーザと匿名ユーザの負担になる場合があります。ピン留めを続けますか？"
         unpin_globally: "トピック一覧のトップからこのトピックを削除します"
+        unpin_globally_until: "このトピックをすべてのトピックリストのトップから削除するか、<strong>%{until}</strong> まで待つ。"
         global_pin_note: "ユーザはトピックを個別にピン留め解除することができます"
         already_pinned_globally:
           zero: "現在ピン留めされていません"
@@ -1415,6 +1440,8 @@ ja:
           title: "今まで"
         yearly:
           title: "今年"
+        quarterly:
+          title: "３ヶ月おき"
         monthly:
           title: "今月"
         weekly:
@@ -1423,6 +1450,7 @@ ja:
           title: "毎日"
         all_time: "今まで"
         this_year: "年"
+        this_quarter: "４分の１"
         this_month: "月"
         this_week: "週"
         today: "本日"
@@ -2041,6 +2069,7 @@ ja:
         delete: "削除"
         cancel: "キャンセル"
         delete_confirm: "ユーザフィールドを削除してもよいですか？"
+        options: "オプション"
         required:
           title: "サインアップ時に必須？"
           enabled: "必須"
@@ -2056,6 +2085,7 @@ ja:
         field_types:
           text: 'テキストフィールド'
           confirm: '確認'
+          dropdown: "ドロップダウン"
       site_text:
         none: "コンテンツの種類を選択してください"
         title: 'テキストコンテンツ'
diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml
index e86aaa6677..e2a17f963b 100644
--- a/config/locales/client.ko.yml
+++ b/config/locales/client.ko.yml
@@ -942,7 +942,6 @@ ko:
         success_message: '성공적으로 토픽을 신고 하였습니다.'
       feature_topic:
         title: "Feature 토픽"
-        pin: "이 토픽을 {{categoryLink}} 카테고리 상단에 노출하도록 합니다."
         confirm_pin: "이미 {{count}}개의 고정된 토픽이 있습니다. 너무 많은 토픽이 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 카테고리에 추가적으로 토픽을 고정하시겠습니까?"
         unpin: "이 토픽을 {{categoryLink}} 카테고리 상단에서 제거 합니다."
         pin_note: "개별적으로 사용자가 토픽 고정을 취소할 수 있습니다."
@@ -950,7 +949,6 @@ ko:
           zero: " {{categoryLink}} 카테고리에 고정된 토픽이 없습니다."
           one: "{{categoryLink}} 카테고리에 고정된 토픽: <strong class='badge badge-notification unread'>1</strong>."
           other: "{{categoryLink}} 카테고리에 고정된 토픽: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "이 토픽을 스태프가 고정 취소하기 전까지 모든 토픽 목록 상단에 고정합니다."
         confirm_pin_globally: "이미 {{count}}개의 토픽이 전역적으로 고정되어 있습니다. 너무 많은 토픽이 고정되어 있으면 새로운 사용자나 익명사용자에게 부담이 될 수 있습니다. 정말로 이 토픽을 전역적으로 고정하시겠습니까?"
         unpin_globally: "모든 토픽 목록 상단에서 이 토픽을 제거"
         global_pin_note: "개별적으로 사용자가 토픽 고정을 취소할 수 있습니다."
diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml
index 85165dbd18..c2ecb1e8be 100644
--- a/config/locales/client.nb_NO.yml
+++ b/config/locales/client.nb_NO.yml
@@ -108,6 +108,18 @@ nb_NO:
       facebook: 'del denne lenken på Facebook'
       google+: 'del denne lenken på Google+'
       email: 'del denne lenken i en e-post'
+    action_codes:
+      autoclosed:
+        enabled: 'stengte dette emnet %{when}'
+        disabled: 'åpnet dette emnet %{when}'
+      closed:
+        enabled: 'stengte dette emnet %{when}'
+        disabled: 'åpnet dette emnet %{when}'
+      archived:
+        enabled: 'arkiverte dette emnet %{when}'
+      pinned:
+        enabled: 'festet dette emnet %{when}'
+        disabled: 'løsgjorde dette emnet %{when}'
     topic_admin_menu: "admin-handlinger for emne"
     emails_are_disabled: "All utgående e-post har blitt deaktivert globalt av en administrator. Ingen e-postvarslinger vil bli sendt."
     edit: 'rediger tittelen og kategorien til dette emnet'
@@ -334,6 +346,8 @@ nb_NO:
       topics_entered: "emner laget"
       post_count: "# innlegg"
       confirm_delete_other_accounts: "Er du sikker på at du vil slette disse kontoene?"
+    user_fields:
+      none: "(velg et alternativ)"
     user:
       said: "{{username}}:"
       profile: "Profil"
@@ -793,6 +807,8 @@ nb_NO:
     search:
       title: "søk etter emner, innlegg, brukere eller kategorier"
       no_results: "Ingen resultater funnet."
+      no_more_results: "Ingen flere resultater funnet."
+      search_help: Søkehjelp
       searching: "Søker ..."
       post_format: "#{{post_number}} av {{username}}"
       context:
@@ -988,7 +1004,6 @@ nb_NO:
         success_message: 'Du har rapportert dette emnet'
       feature_topic:
         title: "Fremhev dette emnet"
-        pin: "Plasser dette emnet på toppen av {{categoryLink}} kategorien."
         confirm_pin: "Du har allerede {{count}} låste emner. For mange låste emner kan være et problem for nye og anonyme brukere. Er du sikker på at du ønsker å låse et til emne i denne kategorien?"
         unpin: "Fjern dette emnet fra toppen av {{categoryLink}} kategorien."
         pin_note: "Brukere kan låse opp emnet selv."
@@ -996,7 +1011,6 @@ nb_NO:
           zero: "Det er ingen låste emner i {{categoryLink}}."
           one: "Emner for øyeblikket låst i {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Emner for øyeblikket låst i {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Gjør at dette emnet dukker opp på toppen av alle emnelister frem til en i staben låser det opp. "
         confirm_pin_globally: "Du har allerede {{count}} globalt låste emner. For mange låste emner kan bli en byrde for nye og anonyme brukere. Er du sikker på at du vil låse et til emne globalt? "
         unpin_globally: "Fjern dette emnet fra toppen av alle emnelister. "
         global_pin_note: "Brukere kan låse opp emner for dem selv. "
@@ -1498,6 +1512,7 @@ nb_NO:
           title: "Daglig"
         all_time: "Totalt"
         this_year: "År"
+        this_quarter: "Kvartal"
         this_month: "Måned"
         this_week: "Uke"
         today: "I dag"
@@ -2127,6 +2142,7 @@ nb_NO:
         delete: "Slett"
         cancel: "Avbryt"
         delete_confirm: "Er du sikker på at du vil fjerne brukerfeltet?"
+        options: "Alternativer"
         required:
           title: "Nødvendig ved registrering?"
           enabled: "nødvendig"
@@ -2142,6 +2158,7 @@ nb_NO:
         field_types:
           text: 'Tekstfelt'
           confirm: 'Bekreftelse'
+          dropdown: "Nedtrekk"
       site_text:
         none: "Velg en innholdstype for å starte redigering."
         title: 'Tekstinnhold'
diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml
index 14060b79b5..1d74c06c9b 100644
--- a/config/locales/client.nl.yml
+++ b/config/locales/client.nl.yml
@@ -334,6 +334,8 @@ nl:
       topics_entered: "topics ingevoerd"
       post_count: "# berichten"
       confirm_delete_other_accounts: "Weet je zeker dat je deze accounts wil verwijderen?"
+    user_fields:
+      none: "(selecteer een optie)"
     user:
       said: "{{username}}:"
       profile: "Profiel"
@@ -949,7 +951,7 @@ nl:
           description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou."
         muted_pm:
           title: "Negeren"
-          description: "Je zal geen enkele notificatie ontvangen over dit bericht.,"
+          description: "Je zal geen enkele notificatie ontvangen over dit bericht."
         muted:
           title: "Negeren"
           description: "Je zal geen notificaties krijgen van dit topic en het zal ook niet verschijnen in je lijst ongelezen topics."
@@ -988,15 +990,13 @@ nl:
         success_message: 'Je hebt dit topic gemarkeerd'
       feature_topic:
         title: "Feature dit topic"
-        pin: "Zorg ervoor dat dit topic bovenaan de {{categoryLink}} categorie komt."
         confirm_pin: "Je hebt al {{count}} vastgepinde topics. Teveel vastgepinde topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet je zeker dat je nog een topic wilt vastpinnen in deze categorie?"
         unpin: "Zorg ervoor dat dit topic niet langer bovenaan de {{categoryLink}} categorie komt."
-        pin_note: "Gebruikers kunnen dit topic voor zichzelf ontpinnen."
+        pin_note: "Gebruikers kunnen het vastpinnen voor dit topic voor zichzelf ongedaan maken."
         already_pinned:
           zero: "Er zijn geen topics vastgepind in {{categoryLink}}."
           one: "Topics welke vastgepind zijn in {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Topics welke vastgepind zijn in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Zorg ervoor dat dit topic bovenaan alle all topic lijsten komt, totdat een beheerder deze ontpint."
         confirm_pin_globally: "Je hebt al {{count}} globaal vastgepinde topics. Teveel vastgepinde topics kunnen storend zijn voor nieuwe en anonieme gebruikers. Weet je zeker dat je nog een topic globaal wilt vastpinnen?"
         unpin_globally: "Zorg ervoor dat dit topic niet langer bovenaan alle topic lijsten komt."
         global_pin_note: "Gebruikers kunnen dit topic voor zichzelf ontpinnen."
@@ -1026,12 +1026,12 @@ nl:
         username_placeholder: "gebruikersnaam"
         action: 'Stuur Uitnodiging'
         help: 'nodig anderen uit voor dit topic via email of notificaties'
-        to_forum: "We sturen een kort mailtje waarmee je vriend direct zich kan aanmelden door op een link te klikken, zonder te hoeven inloggen."
+        to_forum: "We sturen een kort mailtje waarmee je vriend zich direct kan aanmelden door op een link te klikken, zonder te hoeven inloggen."
         sso_enabled: "Voer de gebruikersnaam in van de persoon die je uit wil nodigen voor dit topic."
         to_topic_blank: "Voer de gebruikersnaam of het email-adres in van de persoon die je uit wil nodigen voor dit topic."
         to_topic_email: "Je hebt een email-adres ingevuld. We zullen een uitnodiging e-mailen waarmee je vriend direct kan antwoorden op dit topic."
-        to_topic_username: "Je hebt een gebruikersnaam ingevuld. We sturen een notificatie met een link om uit te nodigen voor dit topic."
-        to_username: "Vul de gebruikersnaam in van de persoon die je wilt uitnodigen. We sturen een notificatie met een link om uit te nodigen voor dit topic"
+        to_topic_username: "Je hebt een gebruikersnaam ingevuld. We sturen een notificatie met een link om deel te nemen aan dit topic."
+        to_username: "Vul de gebruikersnaam in van de persoon die je wilt uitnodigen. We sturen een notificatie met een link om deel te nemen aan dit topic"
         email_placeholder: 'naam@voorbeeld.nl'
         success_email: "We hebben een uitnodiging gemaild naar  <b>{{emailOrUsername}}</b>. We stellen je op de hoogte als op de uitnodiging is ingegaan. Controleer de uitnodigingen tab op je gebruikerspagina om een overzicht te hebben van je uitnodigingen."
         success_username: "We hebben die gebruiker uitgenodigd om deel te nemen in dit topic."
@@ -2128,6 +2128,7 @@ nl:
         delete: "Verwijder"
         cancel: "Annuleer"
         delete_confirm: "Weet je zeker dat je dat gebruikersveld wilt verwijderen?"
+        options: "Opties"
         required:
           title: "Verplicht bij inschrijven?"
           enabled: "verplicht"
diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml
index 0bff55a8b5..656624b220 100644
--- a/config/locales/client.pl_PL.yml
+++ b/config/locales/client.pl_PL.yml
@@ -127,6 +127,25 @@ pl_PL:
       facebook: 'udostępnij ten odnośnik na Facebooku'
       google+: 'udostępnij ten odnośnik na Google+'
       email: 'wyślij ten odnośnik przez email'
+    action_codes:
+      autoclosed:
+        enabled: 'zamknięcie tematu %{when}'
+        disabled: 'otworzenie tematu %{when}'
+      closed:
+        enabled: 'zamknięcie tematu %{when}'
+        disabled: 'otwarcie tematu %{when}'
+      archived:
+        enabled: 'archiwizacja tematu %{when}'
+        disabled: 'dearchiwizacja tematu %{when}'
+      pinned:
+        enabled: 'przypięcie tematu %{when}'
+        disabled: 'odpięcie tematu %{when}'
+      pinned_globally:
+        enabled: 'globalne przypięcie tematu %{when}'
+        disabled: 'globalne odprzypięcie tematu %{when}'
+      visible:
+        enabled: 'listowanie tematu %{when}'
+        disabled: 'odlistowanie tematu %{when}'
     topic_admin_menu: "akcje administratora"
     emails_are_disabled: "Wysyłanie e-maili zostało globalnie wyłączone przez administrację. Powiadomienia e-mail nie będą dostarczane."
     edit: 'edytuj tytuł i kategorię tego tematu'
@@ -364,6 +383,8 @@ pl_PL:
       topics_entered: "wprowadzone tematy:"
       post_count: "# wpisów"
       confirm_delete_other_accounts: "Czy na pewno chcesz usunąć wybrane konta?"
+    user_fields:
+      none: "(wybierz opcję)"
     user:
       said: "{{username}}:"
       profile: "Profil"
@@ -828,6 +849,8 @@ pl_PL:
     search:
       title: "szukaj tematów, wpisów, użytkowników lub kategorii"
       no_results: "Brak wyników wyszukiwania"
+      no_more_results: "Nie znaleziono więcej wyników."
+      search_help: Wyszukaj w pomocy
       searching: "Szukam…"
       post_format: "#{{post_number}} za {{username}}"
       context:
@@ -1031,17 +1054,19 @@ pl_PL:
         success_message: 'Ten temat został pomyślnie zgłoszony.'
       feature_topic:
         title: "Wyróżnij ten temat"
-        pin: "Wyróżnij ten temat przypinając go na górze w kategorii {{categoryLink}} "
+        pin: "Wyróżnij ten temat przypinając go na górze w kategorii {{categoryLink}} do"
         confirm_pin: "Czy na pewno przypiąć ten temat w tej kategorii? Masz już {{count}} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów."
         unpin: "Odepnij ten temat z początku kategorii {{categoryLink}}."
+        unpin_until: "Odepnij ten temat z początku kategorii {{categoryLink}} lub poczekaj do <strong>%{until}</strong>."
         pin_note: "Użytkownicy mogą przypinać tematy dla samych siebie."
         already_pinned:
           zero: "Brak przypiętych tematów w {{categoryLink}}."
           one: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Tematy przypięte w {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Wyróżnij ten temat przypinając go na górze wszystkich list."
+        pin_globally: "Wyróżnij ten temat przypinając go na górze wszystkich list do"
         confirm_pin_globally: "Czy na pewno chcesz globalnie przypiąć kolejny temat? Masz już {{count}} przypiętych tematów -- zbyt wiele może obniżyć czytelność innych aktywnych tematów."
         unpin_globally: "Usuń wyróżnienie dla tego tematu odpinając go z początku wszystkich list."
+        unpin_globally_until: "Usuń wyróżnienie dla tego tematu odpinając go z początku wszystkich list lub poczekaj do <strong>%{until}</strong>."
         global_pin_note: "Użytkownicy mogą przypinać tematy dla samych siebie."
         already_pinned_globally:
           zero: "Brak przypiętych globalnie tematów."
@@ -1560,6 +1585,8 @@ pl_PL:
           title: "Cały czas"
         yearly:
           title: "Rocznie"
+        quarterly:
+          title: "Kwartalnie"
         monthly:
           title: "Miesięcznie"
         weekly:
@@ -1568,6 +1595,7 @@ pl_PL:
           title: "Dziennie"
         all_time: "Cały czas"
         this_year: "Rok"
+        this_quarter: "Kwartał"
         this_month: "Miesiąc"
         this_week: "Tydzień"
         today: "Dzisiaj"
@@ -2210,6 +2238,7 @@ pl_PL:
         delete: "Usuń"
         cancel: "Anuluj"
         delete_confirm: "Czy na pewno chcesz usunąć to pole?"
+        options: "Opcje"
         required:
           title: "Wymagane przy rejestracji?"
           enabled: "wymagane"
@@ -2225,6 +2254,7 @@ pl_PL:
         field_types:
           text: 'Pole tekstowe'
           confirm: 'Potwierdzenie'
+          dropdown: "Lista rozwijana"
       site_text:
         none: "Aby rozpocząć edycję, wybierz typ treści. "
         title: 'Kontekst'
diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml
index 7c25a3c880..f77b12696a 100644
--- a/config/locales/client.pt.yml
+++ b/config/locales/client.pt.yml
@@ -108,6 +108,25 @@ pt:
       facebook: 'partilhar esta hiperligação no Facebook'
       google+: 'partilhar esta hiperligação no Google+'
       email: 'enviar esta hiperligação por email'
+    action_codes:
+      autoclosed:
+        enabled: 'fechou este tópico %{when}'
+        disabled: 'abriu este tópico %{when}'
+      closed:
+        enabled: 'fechou este tópico %{when}'
+        disabled: 'abriu este tópico %{when}'
+      archived:
+        enabled: 'arquivou este tópico %{when}'
+        disabled: 'removeu este tópico do arquivo %{when}'
+      pinned:
+        enabled: 'fixou este tópico %{when}'
+        disabled: 'desafixou este tópico %{when}'
+      pinned_globally:
+        enabled: 'fixou este tópico globalmente %{when}'
+        disabled: 'desafixou este tópico %{when}'
+      visible:
+        enabled: 'listou este tópico %{when}'
+        disabled: 'removeu este tópico da lista %{when}'
     topic_admin_menu: "Ações administrativas dos Tópicos"
     emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado."
     edit: 'editar o título e a categoria deste tópico'
@@ -334,6 +353,8 @@ pt:
       topics_entered: "tópicos inseridos"
       post_count: "# mensagens"
       confirm_delete_other_accounts: "Tem a certeza que quer apagar estas contas?"
+    user_fields:
+      none: "(selecione uma opção)"
     user:
       said: "{{username}}:"
       profile: "Perfil"
@@ -793,6 +814,8 @@ pt:
     search:
       title: "pesquisar tópicos, mensagens, utilizadores, ou categorias"
       no_results: "Não foi encontrado nenhum resultado."
+      no_more_results: "Mais nenhum resultado encontrado."
+      search_help: Procurar ajuda
       searching: "A procurar..."
       post_format: "#{{post_number}} de {{username}}"
       context:
@@ -988,17 +1011,19 @@ pt:
         success_message: 'Sinalizou este tópico com sucesso.'
       feature_topic:
         title: "Destacar este tópico"
-        pin: "Fazer com que este tópico apareça no topo da categoria {{categoryLink}}."
+        pin: "Fazer este tópico aparecer no topo da categoria {{categoryLink}} até"
         confirm_pin: "Já tem {{count}} tópicos fixados. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico nesta categoria?"
         unpin: "Remover este tópico do topo da categoria {{categoryLink}}."
+        unpin_until: "Remover este tópico do topo da categoria {{categoryLink}} ou espere até <strong>%{until}</strong>."
         pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios."
         already_pinned:
           zero: "Não há tópicos fixados em {{categoryLink}}."
           one: "Tópicos atualmente fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Tópicos atualmente fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Fazer este tópico aparecer no topo de todas as listas de tópicos, até que um membro do pessoal o desafixe."
+        pin_globally: "Fazer com que este tópico apareça no topo da lista de todos os tópicos até"
         confirm_pin_globally: "Já tem {{count}} tópicos fixados globalmente. Demasiados tópicos fixados podem ser um fardo para utilizadores novos e anónimos. Tem a certeza que deseja fixar outro tópico globalmente?"
         unpin_globally: "Remover este tópico do topo de todas as listas de tópicos."
+        unpin_globally_until: "Remover este tópico do topo da lista de todos os tópicos ou espere até <strong>%{until}</strong>."
         global_pin_note: "Os utilizadores podem desafixar individualmente o tópico por si próprios."
         already_pinned_globally:
           zero: "Não há tópicos fixados globalmente."
@@ -1490,6 +1515,8 @@ pt:
           title: "Em Qualquer Altura"
         yearly:
           title: "Anual"
+        quarterly:
+          title: "Trimestral"
         monthly:
           title: "Mensal"
         weekly:
@@ -1498,6 +1525,7 @@ pt:
           title: "Diário"
         all_time: "Em Qualquer Altura"
         this_year: "Ano"
+        this_quarter: "Trimestre"
         this_month: "Mês"
         this_week: "Semana"
         today: "Hoje"
@@ -2128,6 +2156,7 @@ pt:
         delete: "Eliminar"
         cancel: "Cancelar"
         delete_confirm: "Tem a certeza que quer eliminar esse campo de utilizador?"
+        options: "Opções"
         required:
           title: "Obrigatório na inscrição?"
           enabled: "obrigatório"
@@ -2143,6 +2172,7 @@ pt:
         field_types:
           text: 'Campo de Texto'
           confirm: 'Confirmação'
+          dropdown: "Suspenso"
       site_text:
         none: "Escolha um tipo de conteúdo para começar a editar."
         title: 'Conteúdo do Texto'
diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml
index b0176d3965..8a70884843 100644
--- a/config/locales/client.pt_BR.yml
+++ b/config/locales/client.pt_BR.yml
@@ -981,7 +981,6 @@ pt_BR:
         success_message: 'Você sinalizou com sucesso este tópico.'
       feature_topic:
         title: "Destacar este tópico"
-        pin: "Fazer este tópico aparecer no inicio da {{categoryLink}} categoria."
         confirm_pin: "Você já tem {{count}} tópicos fixos. Muitos tópicos fixados podem atrapalhar usuários novos e anônimos. Tem certeza que quer fixar outro tópico nesta categoria?"
         unpin: "Remover este tópico do inicio da {{categoryLink}} categoria."
         pin_note: "Usuários podem desafixar o tópico individualmente para si."
@@ -989,7 +988,6 @@ pt_BR:
           zero: "Não existem tópicos fixados em {{categoryLink}}."
           one: "Tópicos atualmente fixados em {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Tópicos atualmente fixados {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Fazer este tópico aparecer no inicio de todas as listas de tópicos, até um membro da equipe desafixar ele. "
         confirm_pin_globally: "Você já tem {{count}} tópicos fixados globalmente. Muitos tópicos fixados podem prejudicar usuários novos e anônimos. Tem certeza que quer fixar outro tópico globalmente?"
         unpin_globally: "Remover este tópico do inicio de todas as listas de tópicos."
         global_pin_note: "Usuários podem desafixar o tópico individualmente para si."
diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml
index 8cd8354fc5..94859acfa4 100644
--- a/config/locales/client.ro.yml
+++ b/config/locales/client.ro.yml
@@ -983,7 +983,6 @@ ro:
         success_message: 'Ai marcat cu succes această discuție.'
       feature_topic:
         title: "Promovează această discuţia"
-        pin: "Seateaza că această discuţie să apară la începutul categoriei {{categoryLink}} ."
         confirm_pin: "Aveţi deja {{count}} discuţii promovate. Prea multe discuţii promovate pot fi deveni o problemă pentru utilizatorii noi sau anonimi. Sunteţi sigur că vrei să promovaţi o altă discuţie în această categorie?"
         unpin: "Îndepărtează aceast mesaje din top-ul categoriei {{categoryLink}}"
         pin_note: "Utilizatorii pot anula fixarea unui subiect individual pentru ei înșiși."
@@ -991,7 +990,6 @@ ro:
           zero: "Nu există subiecte fixate în {{categoryLink}}."
           one: "Subiecte fixate în acest moment în {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Subiecte fixate în acest moment în {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Fă ca acest subiect să apară în partea de sus a tuturor listelor de discuţii, până când un membru al personalului anulează fixarea."
         confirm_pin_globally: "Aveţi deja {{count}} discuţii promovate la nivel global. Prea multe discuţii promovate pot fi deveni o problemă pentru utilizatorii noi sau anonimi. Sunteţi sigur că vrei să promovaţi o altă discuţie la nivel global?"
         unpin_globally: "Eliminați acest subiect din partea de sus a tuturor listelor de discuţii."
         global_pin_note: "Utilizatorii pot anula fixarea unui subiect individual pentru ei înșiși."
diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml
index bcfc6ac880..84c00be0a9 100644
--- a/config/locales/client.ru.yml
+++ b/config/locales/client.ru.yml
@@ -1066,7 +1066,6 @@ ru:
         success_message: 'Вы пожаловались на тему.'
       feature_topic:
         title: "Выделить эту тему"
-        pin: "Закрепить эту тему вверху раздела {{categoryLink}}."
         confirm_pin: "У вас уже есть {{count}} закрепленных тем. Слишком большое количество закрепленных тем может стать препятствием для новых и анонимных пользователей. Вы уверены, что хотите закрепить еще одну тему в этом разделе?"
         unpin: "Убрать эту тему из верха раздела {{categoryLink}}."
         pin_note: "Пользователи могут открепить тему для себя."
@@ -1074,7 +1073,6 @@ ru:
           zero: "В разделе {{categoryLink}} нет закрепленных тем."
           one: "Закрепленные темы в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Закрепленные темы в разделе {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Закрепить эту тему вверху всех списков тем, пока кто-нибудь из персонала не открепит ее."
         confirm_pin_globally: "У вас уже есть {{count}} глобально закрепленных тем. Слишком большое количество закрепленных тем может стать препятствием для новых и анонимных пользователей. Вы уверены, что хотите глобально закрепить еще одну тему?"
         unpin_globally: "Убарть эту тему из верха всех списков тем."
         global_pin_note: "Пользователи могут открепить тему для себя."
diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml
index cf564755ae..e545414bd7 100644
--- a/config/locales/client.sq.yml
+++ b/config/locales/client.sq.yml
@@ -937,7 +937,6 @@ sq:
         success_message: 'You successfully flagged this topic.'
       feature_topic:
         title: "Feature this topic"
-        pin: "Make this topic appear at the top of the {{categoryLink}} category."
         confirm_pin: "You already have {{count}} pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic in this category?"
         unpin: "Remove this topic from the top of the {{categoryLink}} category."
         pin_note: "Users can unpin the topic individually for themselves."
@@ -945,7 +944,6 @@ sq:
           zero: "There are no topics pinned in {{categoryLink}}."
           one: "Topics currently pinned in {{categoryLink}}: <strong class='badge badge-notification unread'>1</strong>."
           other: "Topics currently pinned in {{categoryLink}}: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Make this topic appear at the top of all topic lists, until a staff member unpins it."
         confirm_pin_globally: "You already have {{count}} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?"
         unpin_globally: "Remove this topic from the top of all topic lists."
         global_pin_note: "Users can unpin the topic individually for themselves."
diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml
index f6282f7c2c..a68067117d 100644
--- a/config/locales/client.sv.yml
+++ b/config/locales/client.sv.yml
@@ -973,7 +973,6 @@ sv:
         success_message: 'Du flaggade framgångsrikt detta ämne.'
       feature_topic:
         title: "Gör till utvalt ämne"
-        pin: "Gör detta ämne synligt i toppen av kategorin {{categoryLink}}."
         confirm_pin: "Du har redan {{count}} klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne i denna kategori?"
         unpin: "Ta bort detta ämne från toppen av kategorin {{categoryLink}}."
         pin_note: "Användare kan avklistra ämnet individuellt för sig själva."
@@ -981,7 +980,6 @@ sv:
           zero: "Det finns inga klistrade ämnen i {{categoryLink}}."
           one: "Klistrade ämnen i {{categoryLink}} just nu: <strong class='badge badge-notification unread'>1</strong>."
           other: "Klistrade ämnen i {{categoryLink}} just nu: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Gör detta ämne synligt i toppen av alla ämneslistor, tills någon personal oklistrar den."
         confirm_pin_globally: "Du har redan {{count}} globalt klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne globalt?"
         unpin_globally: "Ta bort detta ämne från toppen av alla ämneslistor."
         global_pin_note: "Användare kan avklistra ämnet individuellt för sig själva."
diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml
index b466dffe4d..26bed62f5e 100644
--- a/config/locales/client.tr_TR.yml
+++ b/config/locales/client.tr_TR.yml
@@ -946,7 +946,6 @@ tr_TR:
         success_message: 'Bu konuyu başarıyla bayrakladınız.'
       feature_topic:
         title: "Bu konuyu ön plana çıkar"
-        pin: "Bu konu {{categoryLink}} kategorinin en üstünde görünsün."
         confirm_pin: "Zaten başa tutturulan {{count}} konunuz var. Çok fazla konuyu başa tutturmak yeni ve anonim kullanıcılara sıkıntı çektirebilir. Bu kategoride bir konuyu başa tutturmak istediğinize emin misiniz?"
         unpin: "Bu konuyu {{categoryLink}} kategorisinin en üstünden kaldır."
         pin_note: "Kullanıcılar kendileri için konunun başa tutturulmasını kaldırabilir."
@@ -954,7 +953,6 @@ tr_TR:
           zero: " {{categoryLink}} kategorisinde başa tutturulan herhangi bir konu yok."
           one: "Şu an {{categoryLink}} kategorisinde başa tutturulan konular: <strong class='badge badge-notification unread'>1</strong>."
           other: "Şu an {{categoryLink}} kategorisinde başa tutturulan konular: <strong class='badge badge-notification unread'>{{count}}</strong>."
-        pin_globally: "Bu konu, bir görevli kaldırana kadar, tüm konu listelerinin en üstünde görünsün"
         confirm_pin_globally: "Zaten her yerde başa tutturulan {{count}} konunuz var. Çok fazla konuyu başa tutturmak yeni ve anonim kullanıcılara sıkıntı çektirebilir. Bir konuyu daha her yerde başa tutturmak istediğinizden emin misiniz?"
         unpin_globally: "Bu konuyu tüm konu listelerinin en üstünden kaldır."
         global_pin_note: "Kullanıcılar kendileri için konunun başa tutturulmasını kaldırabilir."
diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml
index 73b993eaa9..1ac235f0f9 100644
--- a/config/locales/client.zh_CN.yml
+++ b/config/locales/client.zh_CN.yml
@@ -89,6 +89,25 @@ zh_CN:
       facebook: '分享这个链接到 Facebook'
       google+: '分享这个链接到 Google+'
       email: '用电子邮件发送这个链接'
+    action_codes:
+      autoclosed:
+        enabled: '主题关闭于 %{when}'
+        disabled: '主题开启于 %{when}'
+      closed:
+        enabled: '主题关闭于 %{when}'
+        disabled: '主题开启于 %{when}'
+      archived:
+        enabled: '主题存档于 %{when}'
+        disabled: '主题解除存档于 %{when}'
+      pinned:
+        enabled: '主题置顶于 %{when}'
+        disabled: '主题接触置顶于 %{when}'
+      pinned_globally:
+        enabled: '主题全局置顶于 %{when}'
+        disabled: '主题接触置顶于 %{when}'
+      visible:
+        enabled: '主题在列表中显示于 %{when}'
+        disabled: '主题在列表中不显示于 %{when}'
     topic_admin_menu: "主题管理操作"
     emails_are_disabled: "所有的出站邮件已经被管理员全局禁用。将不发送任何邮件提醒。"
     edit: '编辑本主题的标题和分类'
@@ -304,6 +323,8 @@ zh_CN:
       topics_entered: "进入的主题"
       post_count: "# 帖子"
       confirm_delete_other_accounts: "你确定你想要删除这些账户吗？"
+    user_fields:
+      none: "（选择一个选项）"
     user:
       said: "{{username}}："
       profile: "个人资料"
@@ -758,6 +779,8 @@ zh_CN:
     search:
       title: "搜索主题、帖子、用户或分类"
       no_results: "没有找到结果。"
+      no_more_results: "没有找到更多结果。"
+      search_help: 搜索帮助
       searching: "搜索中..."
       post_format: "#{{post_number}} 来自于 {{username}}"
       context:
@@ -856,7 +879,7 @@ zh_CN:
       jump_reply_up: 跳转至更早的回复
       jump_reply_down: 跳转至更晚的回复
       deleted: "此主题已被删除"
-      auto_close_notice: "本主题将在 %{timeLeft} 后自动关闭"
+      auto_close_notice: "本主题将在%{timeLeft}后自动关闭。"
       auto_close_notice_based_on_last_post: "在最后一个帖子 %{duration} 无人回复关闭帖子的时间。"
       auto_close_title: '自动关闭设置'
       auto_close_save: "保存"
@@ -946,17 +969,19 @@ zh_CN:
         success_message: '你已成功报告本帖。'
       feature_topic:
         title: "设为精华主题"
-        pin: "将主题置于{{categoryLink}}分类最上方。"
+        pin: "将该主题置于{{categoryLink}}分类最上方至"
         confirm_pin: "你已经有了{{count}}个置顶主题。太多的置顶主题可能会困扰新用户和访客。你确定想要在该分类再置顶一个主题么？"
         unpin: "从{{categoryLink}}分类最上方移除主题。"
+        unpin_until: "从{{categoryLink}}分类最上方移除主题或者延迟至<strong>%{until}</strong>。"
         pin_note: "用户可以给自己解除置顶主题。"
         already_pinned:
           zero: "{{categoryLink}}没有置顶主题。"
           one: "现在置顶在{{categoryLink}}分类的主题：<strong class='badge badge-notification unread'>1</strong>。"
           other: "现在置顶在{{categoryLink}}分类的主题：<strong class='badge badge-notification unread'>{{count}}</strong>。"
-        pin_globally: "将主题置顶在所有主题列表的最上方，直到职员解除置顶。"
+        pin_globally: "将主题置于所有主题列表最上方至"
         confirm_pin_globally: "你已经有了{{count}}个全局置顶主题。太多的置顶主题可能会困扰新用户和访客。你确定想要再全局置顶一个主题么？"
         unpin_globally: "将主题从所有主题列表的最上方移除。"
+        unpin_globally_until: "从所有主题列表最上方移除主题或者延迟至<strong>%{until}</strong>。"
         global_pin_note: "用户可以自己解除主题状态。"
         already_pinned_globally:
           zero: "没有全局置顶的主题。"
@@ -1415,6 +1440,8 @@ zh_CN:
           title: "不限时间"
         yearly:
           title: "年度"
+        quarterly:
+          title: "季度的"
         monthly:
           title: "月度"
         weekly:
@@ -1423,6 +1450,7 @@ zh_CN:
           title: "每天"
         all_time: "不限时间"
         this_year: "年"
+        this_quarter: "季度"
         this_month: "月"
         this_week: "周"
         today: "今天"
@@ -2041,6 +2069,7 @@ zh_CN:
         delete: "删除"
         cancel: "取消"
         delete_confirm: "你确定要删除这个用户字段么？"
+        options: "选项"
         required:
           title: "在注册时需要填写？"
           enabled: "必填"
@@ -2056,6 +2085,7 @@ zh_CN:
         field_types:
           text: '文本字段'
           confirm: '确认'
+          dropdown: "下拉菜单"
       site_text:
         none: "选择一个内容类型开始编辑。"
         title: '文本内容'
diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml
index a8863d509d..99b526856d 100644
--- a/config/locales/client.zh_TW.yml
+++ b/config/locales/client.zh_TW.yml
@@ -889,7 +889,6 @@ zh_TW:
         success_message: '已投訴此討論話題。'
       feature_topic:
         title: "擁有這個話題"
-        pin: "將此討論主題在{{categoryLink}}類別中置頂"
         unpin: "取消此主題在{{categoryLink}}類別的置頂狀態"
         already_banner:
           zero: "沒有頂置的話題。"
diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml
index 1e0c2571e1..387e76f7b0 100644
--- a/config/locales/server.ar.yml
+++ b/config/locales/server.ar.yml
@@ -616,6 +616,8 @@ ar:
     subject_template: "[%{site_name}] يوجد اصدار جديد , تحديث متوفر"
   flags_reminder:
     please_review: "يرجى مراجعة ذلك "
+    post_number: "مشاركة"
+    how_to_disable: 'يمكنك تعطيل أو تغيير تكرار تذكير البريد الإلكتروني عبر "إشعار حول الإعلامات بعد" الإعدادات.'
   flags_dispositions:
     agreed: "شكراً لإعلامنا سننظر في الأمر "
     agreed_and_deleted: "شكراً لإعلامنا سنتحقق من المشكلة ونزيل المشاركة"
@@ -623,7 +625,10 @@ ar:
     deferred: "شكراً لإعلامنا سننظر في ذلك "
     deferred_and_deleted: "شكرا لاعلامنا تم ازالة هذا التعليق "
   system_messages:
+    backup_failed:
+      subject_template: "فشل النسخ الإحتياطي"
     restore_succeeded:
+      subject_template: "أكتملت الإستعادة بنجاح"
       text_body_template: "الاستعادة نجحت"
     restore_failed:
       subject_template: "فشل استعادة"
@@ -660,13 +665,18 @@ ar:
       other_new_topics: "اشهر المواضيع "
       click_here: "أنقر هنا"
       read_more: "قراءة المزيد"
+      more_topics_category: "أكثر المواضيع الجديدة:"
   page_not_found:
     title: "الصفحة المطلوبة غير موجودة او ليس لديك صلاحيات لرؤيتها "
     popular_topics: "شعبي "
     see_more: "المزيد"
     search_title: "البحث في الموقع"
+    search_google: "جوجل"
+  terms_of_service:
+    title: "شروط الخدمة"
   deleted: 'حذف'
   upload:
+    edit_reason: "تحميل نسخ محلية للصور"
     pasted_image_filename: "لصق الصورة "
   email_log:
     anonymous_user: "المستخدم مجهول"
@@ -688,6 +698,22 @@ ar:
     boolean_no: "لا"
   static_topic_first_reply: |
     تعديل محتويات المنشور الاول في هذا الموضوع  %{page_name} page.
+  tos_topic:
+    title: "شروط الخدمة"
+  badges:
+    long_descriptions:
+      nice_post: |
+        هذه الشارة تمنح لوجود رد حصل على 10 إعجابات. عمل جميل!
+      nice_topic: |
+        هذه الشارة تمنح لوجود رد حصل على 10 إعجابات. عمل جميل!
+      good_post: |
+        هذه الشارة تمنح لوجود رد حصل على 25 إعجاب. عمل جيد!
+      good_topic: |
+        هذه الشارة تمنح لوجود رد حصل على 25 إعجاب. عمل جيد!
+      great_post: |
+        هذه الشارة تمنح لوجود رد حصل على 50 إعجاب. ياللعجب!
+      great_topic: |
+        هذه الشارة تمنح لوجود رد حصل على 50 إعجاب. ياللعجب!
   admin_login:
     success: "البريد أُرسل"
     error: "خطأ!"
diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml
index d8279ca9fc..ad62a12a5d 100644
--- a/config/locales/server.bs_BA.yml
+++ b/config/locales/server.bs_BA.yml
@@ -516,7 +516,7 @@ bs_BA:
     summary_posts_required: "Minimum posts in a topic before 'Summarize This Topic' is enabled"
     summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled"
     summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts"
-    enable_private_messages: "Allow trust level 1 users to create personal messages and reply to personal messages"
+    enable_private_messages: "Allow trust level 1 users to create private messages and reply to private messages"
     enable_long_polling: "Message bus used for notification can use long polling"
     long_polling_interval: "Interval before a new long poll is issued in milliseconds "
     polling_interval: "How often should logged in user clients poll in milliseconds"
@@ -1255,7 +1255,6 @@ bs_BA:
 
         Enjoy your stay!
     signup:
-      subject_template: "[%{site_name}] Aktivirajte vaš novi nalog"
       text_body_template: |
         Dobrodošli na %{site_name}!
 
@@ -1287,8 +1286,6 @@ bs_BA:
       too_large: "Sorry, the file you are trying to upload is too big (maximum size is %{max_size_kb}%kb)."
     images:
       too_large: "Sorry, the image you are trying to upload is too big (maximum size is %{max_size_kb}%kb), please resize it and try again."
-      fetch_failure: "Sorry, there has been an error while fetching the image."
-      unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image."
       size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?"
   flag_reason:
     sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting."
@@ -1316,235 +1313,8 @@ bs_BA:
     Edit the first post in this topic to change the contents of the %{page_name} page.
   guidelines_topic:
     title: "FAQ/Guidelines"
-    body: |
-      <a name="civilized"></a>
-
-      ## [This is a Civilized Place for Public Discussion](#civilized)
-
-      Please treat this discussion forum with the same respect you would a public park.  We, too, are a shared community resource &mdash; a place to share skills, knowledge and interests through ongoing conversation.
-
-      These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse.
-
-      <a name="improve"></a>
-
-      ## [Improve the Discussion](#improve)
-
-      Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later.
-
-      The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said.
-
-      One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests.
-
-      <a name="agreeable"></a>
-
-      ## [Be Agreeable, Even When You Disagree](#agreeable)
-
-      You may wish to respond to something by disagreeing with it. That’s fine. But, remember to _criticize ideas, not people_. Please avoid:
-
-      *   Name-calling.
-      *   Ad hominem attacks.
-      *   Responding to a post’s tone instead of its actual content.
-      *   Knee-jerk contradiction.
-
-      Instead, provide reasoned counter-arguments that improve the conversation.
-
-      <a name="participate"></a>
-
-      ## [Your Participation Counts](#participate)
-
-      The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be &mdash; and avoiding those that do not.
-
-      Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too.
-
-      Let’s try to leave our park better than we found it.
-
-      <a name="flag-problems"></a>
-
-      ## [If You See a Problem, Flag It](#flag-problems)
-
-      Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police.
-
-      When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention.
-
-      In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community.
-
-      <a name="be-civil"></a>
-
-      ## [Always Be Civil](#be-civil)
-
-      Nothing sabotages a healthy conversation like rudeness:
-
-      *   Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech.
-      *   Keep it clean. Don’t post anything obscene or sexually explicit.
-      *   Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information.
-      *   Respect our forum. Don’t post spam or otherwise vandalize the forum.
-
-      These are not concrete terms with precise definitions &mdash; avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times.
-
-      This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.
-
-      <a name="keep-tidy"></a>
-
-      ## [Keep It Tidy](#keep-tidy)
-
-      Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So:
-
-      *   Don’t start a topic in the wrong category.
-      *   Don’t cross-post the same thing in multiple topics.
-      *   Don’t post no-content replies.
-      *   Don’t divert a topic by changing it midstream.
-      *   Don’t sign your posts &mdash; every post has your profile information attached to it.
-
-      Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a New Topic.
-
-      <a name="stealing"></a>
-
-      ## [Post Only Your Own Stuff](#stealing)
-
-      You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law.
-
-      <a name="tos"></a>
-
-      ## [Terms of Service](#tos)
-
-      Yes, legalese is boring, but we must protect ourselves &ndash; and by extension, you and your data &ndash; against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos).
   tos_topic:
     title: "Terms of Service"
-    body: |
-      The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement").
-
-      Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old.
-
-      <a name="1"></a>
-
-      ## [1. Your %{company_domain} Account](#1)
-
-      If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions.
-
-      <a name="2"></a>
-
-      ## [2. Responsibility of Contributors](#2)
-
-      If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that:
-
-      *   the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party;
-      *   if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content;
-      *   you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms;
-      *   the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content;
-      *   the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing);
-      *   the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party;
-      *   your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods;
-      *   your content is not named in a manner that misleads your readers into thinking that you are another person or company; and
-      *   you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise.
-
-      <a name="3"></a>
-
-      ## [3. User Content License](#3)
-
-      User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid.
-
-
-      <a name="4"></a>
-
-      ## [4. Payment and Renewal](#4)
-
-      ### General Terms
-
-      Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.
-
-      ### Automatic Renewal
-
-      Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.
-
-      <a name="5"></a>
-
-      ## [5. Services](#5)
-
-      ### Hosting, Support Services
-
-      Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.
-
-      <a name="6"></a>
-
-      ## [6. Responsibility of Website Visitors](#6)
-
-      %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.
-
-      <a name="7"></a>
-
-      ## [7. Content Posted on Other Websites](#7)
-
-      We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.
-
-      <a name="8"></a>
-
-      ## [8. Copyright Infringement and DMCA Policy](#8)
-
-      As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.
-
-      <a name="9"></a>
-
-      ## [9. Intellectual Property](#9)
-
-      This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.
-
-      <a name="10"></a>
-
-      ## [10. Advertisements](#10)
-
-      %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.
-
-      <a name="11"></a>
-
-      ## [11. Attribution](#11)
-
-      %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.
-
-      <a name="12"></a>
-
-      ## [12. Changes](#12)
-
-      %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement.
-
-      <a name="13"></a>
-
-      ## [13. Termination](#13)
-
-      %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.
-
-      <a name="14"></a>
-
-      ## [14. Disclaimer of Warranties](#14)
-
-      The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.
-
-      <a name="15"></a>
-
-      ## [15. Limitation of Liability](#15)
-
-      In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.
-
-      <a name="16"></a>
-
-      ## [16. General Representation and Warranty](#16)
-
-      You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.
-
-      <a name="17"></a>
-
-      ## [17. Indemnification](#17)
-
-      You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.
-
-      <a name="18"></a>
-
-      ## [18. Miscellaneous](#18)
-
-      This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.
-
-      This document is CC-BY-SA. It was last updated May 31, 2013.
-
-      Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/).
   privacy_topic:
     title: "Privacy Policy"
     body: |
diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml
index 6fa6aa84ac..91ff08dc7a 100644
--- a/config/locales/server.de.yml
+++ b/config/locales/server.de.yml
@@ -665,7 +665,7 @@ de:
     max_topic_title_length: "Maximale zulässige Titellänge von Themen in Zeichen."
     min_private_message_title_length: "Minimale zulässige Titellänge von Nachrichten in Zeichen."
     min_search_term_length: "Minimale zulässige Länge der Suche in Zeichen."
-    allow_uncategorized_topics: "Erlaube Themen ohne Kategorie zu erstellen. ACHTUNG: "
+    allow_uncategorized_topics: "Erlaube Themen ohne Kategorie zu erstellen. ACHTUNG: Falls es unkategorisierte Themen gibt, musst du sie neu kategorisieren, bevor du diese Option abschaltest."
     uncategorized_description: "Beschreibung der Kategorie für unkategorisierte Themen. Leer lassen, wenn keine Beschreibung erwünscht ist."
     allow_duplicate_topic_titles: "Erlaube Themen mit identischen und doppelten Titeln."
     unique_posts_mins: "Minuten, nach denen ein Nutzer denselben Inhalt noch einmal posten kann."
@@ -1120,17 +1120,26 @@ de:
   invite_forum_mailer:
     subject_template: "%{invitee_name} hat dich eingeladen %{site_domain_name} beizutreten"
     text_body_template: |
-      %{invitee_name} lädt Dich zum Thema "%{topic_title}" auf %{site_name} ein.
+      %{invitee_name} hat dich zur Teilnahme eingeladen
 
-      Wenn Dich das interessiert, dann klicke bitte auf den folgenden Link, um die Diskussion zu besuchen:
+      > **%{site_title}**
+      >
+      > %{site_description}
 
-      [%{site_name}][1]
+      Falls du Interesse hast, klicke auf den nachfolgenden Link:
 
-      Du wurdest von einem vertrauenswürdigen Nutzer eingeladen, so dass Du direkt und ohne vorherige Anmeldung antworten kannst.
+      %{invite_link}
 
-      [1]: %{invite_link}
+      Dies ist eine Einladung von einem vertrauenswürdigen Benutzer. Du brauchst dich daher nicht anzumelden.
   invite_password_instructions:
-    subject_template: "Legen Sie ein Passwort für Ihr %{site_name}-Konto fest"
+    subject_template: "Lege ein Passwort für dein %{site_name}-Konto fest"
+    text_body_template: |
+      Danke, dass du die Einladung zu %{site_name} angenommen hast -- willkommen!
+
+      Klicke auf diesen Link um jetzt ein Password zu wählen:
+      %{base_url}/users/password-reset/%{email_token}
+
+      (Falls der Link oben nicht mehr gültig ist, wähle "Ich habe mein Password vergessen" sobald du mit Deiner E-Mail-Adresse angemeldet bist.)
   test_mailer:
     subject_template: "[%{site_name}] Test der Mailzustellbarkeit"
   new_version_mailer:
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 9a76fd0bb9..cb285896d9 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -224,13 +224,13 @@ en:
       For more, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}.
 
     avatar: |
-      ### How about a new picture for your account?
+      ### How about a picture for your account?
 
-      You've posted a few topics and replies, but your avatar isn't as unique as you are -- it's the same default avatar all new users have.
+      You've posted a few topics and replies, but your profile picture isn't as unique as you are -- it's just a letter.
 
-      Have you considered **[visiting your user profile](%{profile_path})** and uploading a custom image that represents you?
+      Have you considered **[visiting your user profile](%{profile_path})** and uploading a picture that represents you?
 
-      It's easier to follow community discussions and find interesting people in conversations when everyone has a unique avatar!
+      It's easier to follow discussions and find interesting people in conversations when everyone has a unique profile picture!
 
     sequential_replies: |
       ### Consider replying to several posts at once
@@ -454,7 +454,7 @@ en:
         other: "almost %{count} years ago"
 
   password_reset:
-    no_token: "Sorry, that password change link is too old. Select 'I forgot my password' to get a new link."
+    no_token: "Sorry, that password change link is too old. Select the Log In button and use 'I forgot my password' to get a new link."
     choose_new: "Please choose a new password"
     choose: "Please choose a password"
     update: 'Update Password'
@@ -797,11 +797,11 @@ en:
     post_onebox_maxlength: "Maximum length of a oneboxed Discourse post in characters."
     onebox_domains_whitelist: "A list of domains to allow oneboxing for; these domains should support OpenGraph or oEmbed. Test them at http://iframely.com/debug"
 
-    logo_url: "The logo image at the top left of your site; if left blank, the site title text will be shown."
-    digest_logo_url: "The alternate logo used at the top of your site's email digest. If left blank `logo_url` will be used. eg: http://example.com/logo.png"
-    logo_small_url: "The small logo image at the top left of your site, seen when scrolling down. If left blank, a home glyph will be shown."
+    logo_url: "The logo image at the top left of your site, should be a wide rectangle shape. If left blank site title text will be shown."
+    digest_logo_url: "The alternate logo image used at the top of your site's email digest. Should be a wide rectangle shape. If left blank `logo_url` will be used."
+    logo_small_url: "The small logo image at the top left of your site, should be a square shape, seen when scrolling down. If left blank a home glyph will be shown."
     favicon_url: "A favicon for your site, see http://en.wikipedia.org/wiki/Favicon"
-    mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. If left blank `logo_url` will be used."
+    mobile_logo_url: "The fixed position logo image used at the top left of your mobile site. Should be a square shape. If left blank, `logo_url` will be used. eg: http://example.com/uploads/default/logo.png"
     apple_touch_icon_url: "Icon used for Apple touch devices. Recommended size is 144px by 144px."
 
     notification_email: "The from: email address used when sending all essential system emails. The domain specified here must have SPF, DKIM and reverse PTR records set correctly for email to arrive."
@@ -1077,6 +1077,10 @@ en:
     num_flags_to_close_topic: "Minimum number of active flags that is required to automatically pause a topic for intervention"
 
     auto_respond_to_flag_actions: "Enable automatic reply when disposing a flag."
+    min_first_post_typing_time: "Minimum amount of time in milliseconds a user must type during first post, if threshold is not met post will automatically enter the needs approval queue. Set to 0 to disable (not recommended)"
+    auto_block_fast_typers_on_first_post: "Automatically block users that do not meet min_first_post_typing_time"
+    auto_block_fast_typers_max_trust_level: "Maximum trust level to auto block fast typers"
+    auto_block_first_post_regex: "Case insensitive regex that if passed will cause first post by user to be blocked and sent to approval queue. Example: raging|a[bc]a , will cause all posts containing raging or aba or aca to be blocked on first. Only applies to first post."
 
     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"
@@ -1093,6 +1097,7 @@ en:
     pop3_polling_host: "The host to poll for email via POP3."
     pop3_polling_username: "The username for the POP3 account to poll for email."
     pop3_polling_password: "The password for the POP3 account to poll for email."
+    log_mail_processing_failures: "Log all email processing failures to http://yoursitename.com/logs"
     email_in: "Allow users to post new topics via email (requires pop3 polling). Configure the addresses in the \"Settings\" tab of each category."
     email_in_min_trust: "The minimum trust level a user needs to have to be allowed to post new topics via email."
     email_prefix: "The [label] used in the subject of emails. It will default to 'title' if not set."
@@ -1107,8 +1112,8 @@ en:
     email_editable: "Allow users to change their e-mail address after registration."
     logout_redirect: "Location to redirect browser to after logout EG: (http://somesite.com/logout)"
 
-    allow_uploaded_avatars: "Allow users to upload custom avatars."
-    allow_animated_avatars: "Allow users to use animated gif avatars. WARNING: run the avatars:refresh rake task after changing this setting."
+    allow_uploaded_avatars: "Allow users to upload custom profile pictures."
+    allow_animated_avatars: "Allow users to use animated gif profile pictures. WARNING: run the avatars:refresh rake task after changing this setting."
     allow_animated_thumbnails: "Generates animated thumbnails of animated gifs."
     default_avatars: "URLs to avatars that will be used by default for new users until they change them."
     automatically_download_gravatars: "Download Gravatars for users upon account creation or email change."
@@ -1119,7 +1124,7 @@ en:
     disable_digest_emails: "Disable digest emails for all users."
     default_external_links_in_new_tab: "Open external links in a new tab. Users can change this in their preferences."
 
-    detect_custom_avatars: "Whether or not to check that users have uploaded custom avatars."
+    detect_custom_avatars: "Whether or not to check that users have uploaded custom profile pictures."
     max_daily_gravatar_crawls: "Maximum number of times Discourse will check Gravatar for custom avatars in a day"
     public_user_custom_fields: "A whitelist of custom fields for a user that can be shown publicly."
     staff_user_custom_fields: "A whitelist of custom fields for a user that can be shown to staff."
@@ -1241,11 +1246,11 @@ en:
 
   move_posts:
     new_topic_moderator_post:
-      one: "I moved a post to a new topic: %{topic_link}"
-      other: "I moved %{count} posts to a new topic: %{topic_link}"
+      one: "A post was split to a new topic: %{topic_link}"
+      other: "%{count} posts were split to a new topic: %{topic_link}"
     existing_topic_moderator_post:
-      one: "I moved a post to an existing topic: %{topic_link}"
-      other: "I moved %{count} posts to an existing topic: %{topic_link}"
+      one: "A post was merged into an existing topic: %{topic_link}"
+      other: "%{count} posts were merged into an existing topic: %{topic_link}"
 
   change_owner:
     post_revision_text: "Ownership transferred from %{old_user} to %{new_user}"
@@ -1369,7 +1374,7 @@ en:
       Click this link to choose a password now:
       %{base_url}/users/password-reset/%{email_token}
 
-      If you don't remember your password, or don't have one yet, choose "I forgot my password" when logging in with your email address.
+      (If the link above has expired, choose "I forgot my password" when logging in with your email address.)
 
   test_mailer:
     subject_template: "[%{site_name}] Email Deliverability Test"
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 208323dfff..9f8b35bf04 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -752,6 +752,7 @@ fa_IR:
     login_required: "نیاز به تصدیق است برای خواندن محتوا در سایت٬ دسترسی  ناشناس رد شود."
     min_username_length: "حداقل طول  نام کاربری در کاراکتر. اخطار: هر کاربر موجودی با اسمی کوتاه تر از این٬ دسترسی به سایت نخواهد داشت."
     max_username_length: "حداکثر طول  نام کاربری در کاراکتر. اخطار: هر کاربر موجودی با اسمی طولانی تر از این٬ دسترسی به سایت نخواهد داشت."
+    reserved_usernames: "نام های کاربری غیرمجاز جهت عضویت."
     min_password_length: "حداقل طول رمز عبور"
     block_common_passwords: "رمز عبوری که جزو 10,000 رمز عبور رایج است را قبول نکنید. "
     enable_sso: "اجازه single sign on از طریق سایت‌های دیگر داده شود (هشدار: آدرس ایمیل کاربر *باید* توسط سایت دیگر معتبر تشخیص داده شود!)"
diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml
index c2eac0aaa5..7464fd2a2c 100644
--- a/config/locales/server.fr.yml
+++ b/config/locales/server.fr.yml
@@ -1719,7 +1719,7 @@ fr:
       read_guidelines: |
         Ce badge est accordé après <a href="/guidelines">lecture des règles de la communauté</a>. Respecter et partager ces règles simples permet de construire une communauté sure, agréable et durable.
       reader: |
-        Ce badge est accordé après lecture d'un long sujet. Lire est fondamental. Lire vous aide grandement à suivre une conversation et mène à des réponses meilleures et plus complètes.
+        Ce badge est accordé après lecture d'un long sujet. Lire est fondamental. Lire attentivement vous aide à suivre une conversation et mène à des réponses meilleures et plus complètes.
       editor: |
         Ce badge est accordé après édition d'un de vos messages. N'hésitez pas à éditer vos messages à n'importe quel moment pour les améliorer, corriger de petites erreurs, ou ajouter quelque chose que vous auriez oublié.
       first_flag: |
@@ -1729,7 +1729,7 @@ fr:
       welcome: |
         Ce badge est accordé lorsque vous recevez votre premier "J'aime" sur un de vos messages. Félicitations, vous avez écrit quelque chose que les membres de votre communauté ont trouvé intéressant, cool, ou utile !
       anniversary: |
-        Ce badge est accordé après le partage d'un lien vers un message consulté par 25 visiteurs extérieurs. Bien joué ! Partager des liens vers des discussions intéressantes auprès de vos amis est un excellent moyen de faire grandir votre communauté.
+        Ce badge est accordé après avoir été membre du site pendant une année, avec au moins un message crée. Merci d'être resté avec nous et de contribuer ainsi à notre communauté !
       good_share: |
         Ce badge est accordé après le partage d'un lien vers un message consulté par 300 visiteurs extérieurs. Bon travail ! Vous avez diffusé une discussion intéressante à <i>beaucoup</i> de nouvelles personnes et nous avez aidés à grandir.
       great_share: |
diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml
index 671667c873..854a53e031 100644
--- a/config/locales/server.he.yml
+++ b/config/locales/server.he.yml
@@ -696,6 +696,7 @@ he:
     fixed_category_positions: "אם אפשרות זו מסומנת, תוכלו  לארגן את הקטגוריות כך שיופיעו בסדר קבוע. אם האופציות אינן מסומנות, הקטגוריות יסודרו על פי סדר הפעילות שהתבצעה בהן."
     fixed_category_positions_on_create: "אם האפשרות תסומן, סדר הקטגוריות יוגדר בתפריט יצירת נושא (דורש fixed_category_positions)."
     add_rel_nofollow_to_user_content: "הוספת התווית rel nofollow לכ תוכן ששודר על ידי המשתמש/ת, פרט לקישורים פנימיים (כולל דומיין הורה parent domains). אם תשנו אפשרות זו, עליכם \"לאפות מחדש\" את כל הפרסומים עם: \"rake posts:rebake\""
+    exclude_rel_nofollow_domains: "A list of domains where nofollow should not be added to links. tld.com will automatically allow sub.tld.com as well. As a minimum, you should add the top-level domain of this site to help web crawlers find all content. If other parts of your website are at other domains, add those too."
     post_excerpt_maxlength: "אורך מקסימלי של פרסום קטע / סיכום."
     post_onebox_maxlength: "מספר תוים מקסימאלי מותר כאורך פרסום Discourse אחד בקופסא (oneboxed Discourse post)."
     onebox_domains_whitelist: "רשימת מתחמים (דומיינים) מותרים לאריזה (oneboxing); על דומיינים אלה לתמוך ב-OpenGraph או ב-oEmbed. בדקו אותם ב-http://iframely.com/debug."
@@ -766,6 +767,8 @@ he:
     email_token_grace_period_hours: "סיסמאות שכחת סיסמא / הפעלת חשבון עדיין זמינים לזמן חסד של (n) שעות לאחר שהופקו."
     enable_badges: "הפעלת מערכת התגים (badges)"
     allow_index_in_robots_txt: "פרטו ב-robots.txt שלאתר זה מותר להיות מאונדקס על ידי מנועי חיפוש."
+    email_domains_blacklist: "A pipe-delimited list of email domains that users are not allowed to register accounts with. Example: mailinator.com|trashmail.net"
+    email_domains_whitelist: "A pipe-delimited list of email domains that users MUST register accounts with. WARNING: Users with email domains other than those listed will not be allowed!"
     forgot_password_strict: "אל תעדכנו משתמשים על קיום חשבון כאשר הם משתמשים ב\"שכחתי סיסמא\"."
     log_out_strict: "בהתנתקות, נתקו את כל ההפעלות של המשתמ/ת בכל המכשירים"
     version_checks: "שלחו פינג להאב של Discourse לעדכוני גרסה וכדי להציג מסרים אודות גרסאות בלוח התצוגה של האדמין"
@@ -781,10 +784,15 @@ he:
     reserved_usernames: "שמות משתמש שלא ניתן להירשם איתם."
     min_password_length: "Minimum password length."
     block_common_passwords: "אל תאפשרו סיסמאות מתוך 10,000 הסיסמאות הנפוצות ביותר."
+    enable_sso: "Enable single sign on via an external site (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)"
     enable_sso_provider: "הטמיעו את פרוטוקול הספק Discourse SSO בנקודת הקצה /session/sso_provider, דורש כיוון של sso_secret"
     sso_url: "URL of single sign on endpoint"
     sso_secret: "מחרוזת סודית המשמשית לאמת באופן קרפיטוגרפי מידע SSO, וודאו שהיא באורך 10 תווים ומעלה"
+    sso_overrides_email: "Overrides local email with external site email from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to normalization of local emails)"
+    sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to differences in username length/requirements)"
+    sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes."
     sso_overrides_avatar: "מעקף אווטאר של משתמש בעזרת אווטר אתרחיצוני מ-SSO Payload. אם אפשרות זו מופעלת, מומלץ מאוד לבטל את האפשרות להעלאת אווטר."
+    sso_not_approved_url: "Redirect unapproved SSO accounts to this URL"
     enable_local_logins: "אפשרו שם חשבונות מבוססים על שן משתמש מקומי וסיסמאת התחברות. (שימו לב: אפשרות זו חייבת להיות מותרת כדי שהזמנות להצטרפות יפעלו)"
     allow_new_registrations: "אפשרו הרשמות משתמשים חדשים. בטלו סימון זה כדי למנוע יצירת חשבונות חדשים."
     enable_yahoo_logins: "Enable Yahoo authentication"
@@ -832,9 +840,11 @@ he:
     s3_access_key_id: "מפתח הגישה (access key id) של Amazon S3 שישמש להעלאת התמונות."
     s3_secret_access_key: "מפתח הגישה הסודי (secret access key) של Amazon S3 שישמש להעלאת תמונות."
     s3_region: "שם האזור (region name) של Amazon S3 שישמש להעלאת תמונות."
+    s3_cdn_url: "The CDN URL to use for all s3 assets (for example: https://cdn.somewhere.com). WARNING: after changing this setting you must rebake all old posts."
     avatar_sizes: "רשימה של גדלי אווטרים שנוצרת אוטומטית. "
     enable_flash_video_onebox: "אפשרו הטמעת קישורי swf ו-flv (פלאש של אדובי) בפרסומים. אזהרה: עלול להביא לבעיות בטיחות באתר."
     default_invitee_trust_level: "ברירת מחדל של דרגת אמון (0-4) של משתמשים מוזמנים."
+    default_trust_level: "Default trust level (0-4) for all new users. WARNING! Changing this will put you at serious risk for spam."
     tl1_requires_topics_entered: "כמה נושאים משתמש חדש צריך להתחיל למערכת עד שישודרג לרמת אמון 1."
     tl1_requires_read_posts: "כמה פרסומים משתמש צריך לקרוא לפני שישודרג לרמת אמון 1."
     tl1_requires_time_spent_mins: "כמה דקות משתמש חדש צריך לקרוא פרסומים לפני שישודרג לרמת אמון 1."
@@ -885,6 +895,8 @@ he:
     topic_views_heat_medium: "לאחר כמות צפיות זו, שדה הצפיות יודגש באופן בינוני."
     topic_views_heat_high: "לאחר כמות צפיות זו, שדה הצפיות יודגש באופן בולט."
     cold_age_days_low: "לאחר מספר זה של ימי שיחה, תאריך הפעילות האחרונה מאופר."
+    cold_age_days_medium: "לאחר מספר זה של ימי שיחה, תאריך הפעילות האחרונה מואפר יותר."
+    cold_age_days_high: "לאחר מספר זה של ימי שיחה, תאריך הפעילות האחרונה מאופר ממש."
     history_hours_low: "פרסום שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת קלות."
     history_hours_medium: "פרסום שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת באופן בינוני."
     history_hours_high: "פרסום שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת באופן חזק."
@@ -897,6 +909,7 @@ he:
     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."
     white_listed_spam_host_domains: "רשימה של מתחמים (domain) שיוחרגו מבדיקת הספאם. משתמשים חדשים לעולם לא יוגבלו ביצירת פרסומים חדשים עם קישורים למתחמים אלו."
     staff_like_weight: "כמה משקל עודף יש להעניק ללייקים של הצוות."
+    topic_view_duration_hours: "Count new a topic view once per IP/User every N hours"
     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) ערכים."
@@ -951,18 +964,22 @@ he:
     sequential_replies_threshold: "מספר הפרסומים שעל משתמש להכין ברצף בפרסום לפני שיקבל תזכורת בנוגע ליותר מידי תגובות עוקבות."
     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."
     dominating_topic_minimum_percent: "איזה אחוז מהפרסומים משתמש צריך לייצר בנושא לפני שיקבל תזכורת לגבי שליטת/שתלטנות יתר על הנושא."
+    daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details"
     suppress_uncategorized_badge: "אל תציגו את התג (badge) לנושאים נטולי קטגוריה ברשימת הנושאים."
+    permalink_normalizations: "Apply the following regex before matching permalinks, for example: /(\\/topic.*)\\?.*/\\1 will strip query strings from topic routes. Format is regex+string use \\1 etc. to access captures"
     global_notice: "הציגו הודעת אזהרה דחופה כללית לכל המבקרים, החליפו לריק כדי להסתיר אותה (ניתן להשתמש ב-HTML)."
     disable_edit_notifications: "ביטול התראות עריכה על ידי משתמש המערכת כאשר 'download_remote_images_to_local' פעיל."
     full_name_required: "שם מלא הוא שדה נדרש לפרופיל משתמש/ת."
     enable_names: "הצגת השם המלא של המשתמש/ת בעמודי הפרופיל שלהם, בכרטיסי המשתמ ובדוא\"ל שלהם. נטרול הסתרת השם המלא בכל מקום."
     display_name_on_posts: "הצגת שמם המלא של משתמשים בפרסומיהם, בנוסף ל@שם_המשתמש שלהם."
+    show_time_gap_days: "If two posts are made this many days apart, display the time gap in the topic."
     invites_per_page: "ברירת המחדל, הזמנות המוצגות בעמוד המשתמש."
     short_progress_text_threshold: "After the number of posts in a topic goes above this number, the progress bar will only show the current post number. If you change the progress bar's width, you may need to change this value."
     default_code_lang: "Default programming language syntax highlighting applied to GitHub code blocks (lang-auto, ruby, python etc.)"
     warn_reviving_old_topic_age: "כאשר מישהו/מישהי מתחילים להגיב לנושא שבו התגובה האחרונה היא בת יותר מכמה ימים, אזהרה תוצג. בטלו אפשרות זו באמצעות הזנה של 0."
     autohighlight_all_code: "לחייב שימוש בקוד הדגשה לכל קוד מעוצב מראש (preformatted code blocks) אפילו אם הם אינם מציינים את השפה."
     highlighted_languages: "הכללת הדגשת שגיאות תחביר. (אזהרה: הכללת שפות רבות מידי עשוי להשפיע על הביצוע) ראו: https://highlightjs.org/static/demo/ להדגמה"
+    embeddable_hosts: "Host(s) that can embed the comments from this Discourse forum. Hostname only, do not begin with http://"
     feed_polling_enabled: "הטמעה בלבד: האם לעמבד פידים של  RSS/ATOM כפרסומים."
     feed_polling_url: "הטמעה בלבד: URL של פיד RSS/ATOM להטמעה."
     embed_by_username: "שם המשתמש של המשתמש/ת שיוצר את הנושאים המוטמעים."
@@ -975,11 +992,16 @@ he:
     notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send an email to the contact_email. Set to 0 to disable."
     enable_cdn_js_debugging: "אפשרו ל-/logs להציג שגיאות בצורה נכונה באמצעות הוספת הרשאות לגישה בין אתרים (crossorigin permissions) בכל ה-js הכלולים."
     show_create_topics_notice: "אם לאתר פחות מ-5 נושאים פומביים, הציגו הודעה המבקשת מן המנהלים/מנהלות ליצור עוד נושאים."
+    delete_drafts_older_than_n_days: Delete drafts older than (n) days.
     vacuum_db_days: "הריצו VACUUM FULL ANALYZE כדי להשיב שטח בסיס הנתונים אחרי העברות (כוונו ל-0 כדי לנטרל)"
     prevent_anons_from_downloading_files: "מונע ממשתמשים אנונימיים להוריד צרופות (attachments). אזהרה: דבר זה ימנע מכל משאב שאינו תמונה ופורסם כצרופה לעבוד."
+    slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
     enable_emoji: "אפשרו emoji"
     emoji_set: "איך אתם אוהבים את ה-emoji שלכם?"
     enforce_square_emoji: "חובת מימדי ריבועיים בכל ה-emojis."
+    approve_post_count: "The amount of posts from a new user that must be approved"
+    approve_unless_trust_level: "Posts for users below this trust level must be approved"
+    notify_about_queued_posts_after: "If there are posts that have been waiting to be reviewed for more than this many hours, an email will be sent to the contact email. Set to 0 to disable these emails."
     errors:
       invalid_email: "כתובת דוא\"ל לא קיימת."
       invalid_username: "אין משתמש/ת עם שם משתמש כזה."
@@ -988,10 +1010,12 @@ he:
       invalid_integer_max: "הערך חייב לא יכול להיות גדול מ- %{max}."
       invalid_integer: "הערך חייב להיות מספר שלם."
       regex_mismatch: "הערך אינו תואם את המבנה הנדרש."
+      must_include_latest: "Top menu must include the 'latest' tab."
       invalid_string: "ערך לא תקין."
       invalid_string_min_max: "חייב להיות בין  %{min} ל- %{max} תווים."
       invalid_string_min: "חייב להיות לפחות %{min} תווים."
       invalid_string_max: "נדרשים לא יותר מ-%{max} תווים."
+      invalid_reply_by_email_address: "Value must contain '%{reply_key}' and be different from the notification email."
   notification_types:
     mentioned: "%{display_username} אזכר אותך ב %{link}"
     liked: "%{display_username} נתן לייק להודעה שלך ב %{link}"
@@ -1105,6 +1129,7 @@ he:
       blocked: "לא מורשה."
     ip_address:
       blocked: "הרשמות חדשות אסורות מכתובת ה-IP שלך. "
+      max_new_accounts_per_registration_ip: "הרשמות חדשות אסורות מכתובת ה-IP שלך. (עברת את הסף המותר) צרו קשר עם מנהל."
   invite_mailer:
     subject_template: "הוזמנת על ידי %{invitee_name} ל '%{topic_title}' ב%{site_domain_name}"
     text_body_template: |
diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml
index 0f353a0145..5d164f61a9 100644
--- a/config/locales/server.ja.yml
+++ b/config/locales/server.ja.yml
@@ -766,7 +766,9 @@ ja:
     max_bookmarks_per_day: "ユーザが一日にブックマークできる最大数"
     max_edits_per_day: "ユーザが一日に編集できる最大数"
     max_topics_per_day: "ユーザが一日に作成できるトピックの最大数"
+    max_private_messages_per_day: "ユーザが一日に作成できるメッセージの最大数"
     max_invites_per_day: "ユーザが一日に招待できる最大数"
+    max_topic_invitations_per_day: "ユーザが一日にトピックに招待できる最大数"
     suggested_topics: "トピック下部に表示されるおすすめトピックの数"
     limit_suggested_to_category: "現在参照しているトピックのカテゴリからトピックをサジェストする"
     clean_up_uploads: "不正アップロードを防ぐためにどこからも参照されていないアップロードファイルを削除する。警告: この設定を有効にする前に /uploads ディレクトリのバックアップを取ることをおすすめします"
@@ -814,6 +816,7 @@ ja:
     email_time_window_mins: "ユーザによるポストの最終編集チャンスを与えるために、通知用メール送信までに待つ時間 (分)"
     email_posts_context: "通知メールのコンテンツに含める回答の数"
     flush_timings_secs: "サーバにタイミングデータを送信する頻度 (秒)"
+    title_max_word_length: "トピックタイトルの最大文字数"
     title_min_entropy: "トピックタイトルの最小許容エントロピー (ユニークキャラクターや英語以外の単語を含むとより大きな値になります)"
     body_min_entropy: "ポスト本文の最小許容エントロピー (ユニークキャラクターや英語以外の単語を含むとより大きな値になります)"
     title_fancy_entities: "トピックタイトルの一般的な ASCII 文字をファンシーな HTML エンティティに変換する; SmartyPants http://daringfireball.net/projects/smartypants/"
@@ -829,6 +832,9 @@ ja:
     topic_views_heat_low: "多くの閲覧があると、このフィールドはやや強調されます"
     topic_views_heat_medium: "多くの閲覧があると、このフィールドは適度に強調されます"
     topic_views_heat_high: "多くの閲覧があると、このフィールドは強く強調されます"
+    cold_age_days_low: "議論から日が経つと、更新日がすこし薄く表示されます"
+    cold_age_days_medium: "議論から日が経つと、更新日が適度に薄く表示されます"
+    cold_age_days_high: "議論から日が経つと、更新日が強く淡色表示されます"
     history_hours_low: "数時間以内に編集したポストは、編集インジケーターがやや強調されます"
     history_hours_medium: "数時間以内に編集したポストは、編集インジケーターが適度に強調されます"
     history_hours_high: "数時間以内に編集したポストは、編集インジケーターが強く強調されます"
diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml
index d4ba22529c..706473748d 100644
--- a/config/locales/server.nl.yml
+++ b/config/locales/server.nl.yml
@@ -1187,6 +1187,7 @@ nl:
     spam_hosts: "Deze nieuwe gebruiker probeerde om meerdere berichten met links naar hetzelfde domein te plaatsen. Zie de newuser_spam_host_threshold instelling."
   email_log:
     no_user: "Kan geen gebruiker met id %{user_id} vinden"
+    anonymous_user: "Lid is anoniem"
     seen_recently: "Gebruiker was recentelijk nog online"
     post_not_found: "Kan geen bericht met id %{post_id} vinden"
     notification_already_read: "De notificatie waar deze mail voor is is al gezien"
@@ -1200,6 +1201,7 @@ nl:
     body_blank: "geen tekst"
   color_schemes:
     base_theme_name: "Basis"
+  about: "Over"
   guidelines: "Regels"
   privacy: "Privacy"
   edit_this_page: "Wijzig deze pagina"
@@ -1214,3 +1216,7 @@ nl:
     title: "Algemene Voorwaarden"
   privacy_topic:
     title: "Privacy Voorwaarden"
+  admin_login:
+    success: "E-mail verstuurd"
+    error: "Fout!"
+    submit_button: "E-mail versturen"
diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml
index 47c891872b..a8fc6e11cc 100644
--- a/config/locales/server.tr_TR.yml
+++ b/config/locales/server.tr_TR.yml
@@ -1875,6 +1875,22 @@ tr_TR:
       This document is CC-BY-SA. It was last updated May 31, 2013.
   static:
     search_help: "<h2>Öneriler</h2> \n<p>\n<ul>\n<li>Başlık eşleşmelerine öncelik verilir, emin olmadığınız zaman, başlık için arama yapın </li> \n<li>Her zaman tekil, nadir kelimeler en iyi sonuçları verir </li> \n<li>Mümkünse, aramanızı belirli bir kategori, kullanıcı, veya konuya daraltın </li> \n</ul> \n</p> \n<h2>Seçenekler</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:single_user</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><code>in:private</code></td></tr>\n<code>in:bookmarks</code></td><td><code>in:first</code></td><td colspan=3></td></tr>\n<tr><td><code>posts_count:num</code></td><td><code>min_age:days</code></td><td><code>max_age:days</code></td> <td colspan=2></td></tr>\n</table>\n</p>\n<p>\n<code> gökkuşağı category:parks status:open order:latest <code> \"parklar\" kategorisinde, kapalı veya arşivlenmiş olmayan konular arasında \"gökkuşağı\" kelimesi içerenleri arar ve sonuçları gönderi tarihi sırasına göre gösterir. </p>\n"
+  badges:
+    long_descriptions:
+      autobiographer: |
+        Bu rozet <a href="/my/preferences">profilini</a> doldurduğunda ve profil resmini seçtiğinde verilir. Kim olduğun ve nelerle ilgilendiğin hakkında topluluğa daha fazla bilgi vermen daha iyi ve daha yakın bir topluluğun oluşmasına yardım eder.
+      good_share: |
+        Bu rozet 300 yabancı ziyaretçi tarafından ziyaret edilen bir gönderi bağlantısının paylaşılmasına verilir. İyi iş! <i>Bir sürü</> yeni kişiye ilgi çekici bir tartışma gösterdin ve böylece çoğalmamıza yardımcı oldun.
+      nice_topic: |
+        Bu rozet 10 beğeni alan bir konunun yaratılmasına verilir. İyi iş!
+      good_post: |
+        Bu rozet 25 beğeni alan bir cevabın yazılmasına verilir. İyi iş!
+      good_topic: |
+        Bu rozet 25 beğeni alan bir konunun yaratılmasına verilir. İyi iş!
+      great_post: |
+        Bu rozet 50 beğeni alan bir gönderinin yaratılmasına verilir. Vay be!
+      great_topic: |
+        Bu rozet 50 beğeni alan bir cevabın yazılmasına verilir. Vay be!
   admin_login:
     success: "E-posta Gönderildi"
     error: "Hata!"
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 0329f89bd1..42401150f9 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -491,6 +491,7 @@ email:
   pop3_polling_port: 995
   pop3_polling_username: ''
   pop3_polling_password: ''
+  log_mail_processing_failures: false
   email_in:
     default: false
     client: true
@@ -679,6 +680,10 @@ spam:
   num_flaggers_to_close_topic: 5
   num_flags_to_close_topic: 12
   auto_respond_to_flag_actions: true
+  min_first_post_typing_time: 3000
+  auto_block_fast_typers_on_first_post: true
+  auto_block_fast_typers_max_trust_level: 0
+  auto_block_first_post_regex: ""
 
 rate_limits:
   unique_posts_mins:
@@ -687,7 +692,7 @@ rate_limits:
       default: 5
   rate_limit_create_topic: 15
   rate_limit_create_post: 5
-  rate_limit_new_user_create_topic: 60
+  rate_limit_new_user_create_topic: 120
   rate_limit_new_user_create_post: 30
   max_topics_per_day: 20
   max_private_messages_per_day: 20
@@ -697,7 +702,7 @@ rate_limits:
   max_edits_per_day: 30
   max_invites_per_day: 10
   max_topic_invitations_per_day: 30
-  max_topics_in_first_day: 5
+  max_topics_in_first_day: 3
   max_replies_in_first_day: 10
   tl2_additional_likes_per_day_multiplier: 1.5
   tl3_additional_likes_per_day_multiplier: 2
diff --git a/db/migrate/20150731225331_migrate_old_moved_posts.rb b/db/migrate/20150731225331_migrate_old_moved_posts.rb
new file mode 100644
index 0000000000..73add43ded
--- /dev/null
+++ b/db/migrate/20150731225331_migrate_old_moved_posts.rb
@@ -0,0 +1,6 @@
+class MigrateOldMovedPosts < ActiveRecord::Migration
+  def up
+    execute "UPDATE posts SET post_type = 3, action_code = 'split_topic' WHERE post_type = 2 AND raw ~* '^I moved [a\\d]+ posts? to a new topic:'"
+    execute "UPDATE posts SET post_type = 3, action_code = 'split_topic' WHERE post_type = 2 AND raw ~* '^I moved [a\\d]+ posts? to an existing topic:'"
+  end
+end
diff --git a/db/migrate/20150802233112_add_post_stats.rb b/db/migrate/20150802233112_add_post_stats.rb
new file mode 100644
index 0000000000..0ff42664da
--- /dev/null
+++ b/db/migrate/20150802233112_add_post_stats.rb
@@ -0,0 +1,16 @@
+class AddPostStats < ActiveRecord::Migration
+  def change
+
+    add_column :drafts, :revisions, :int, null: false, default: 1
+
+    create_table :post_stats do |t|
+      t.integer :post_id
+      t.integer :drafts_saved
+      t.integer :typing_duration_msecs
+      t.integer :composer_open_duration_msecs
+      t.timestamps
+    end
+
+    add_index :post_stats, [:post_id]
+  end
+end
diff --git a/lib/cooked_post_processor.rb b/lib/cooked_post_processor.rb
index b7b957a687..233f299d11 100644
--- a/lib/cooked_post_processor.rb
+++ b/lib/cooked_post_processor.rb
@@ -66,6 +66,8 @@ class CookedPostProcessor
     @doc.css("img[src]") -
     # minus, data images
     @doc.css("img[src^='data']") -
+    # minus, emojis
+    @doc.css("img.emoji") -
     # minus, image inside oneboxes
     oneboxed_images -
     # minus, images inside quotes
diff --git a/lib/middleware/request_tracker.rb b/lib/middleware/request_tracker.rb
index 6a0b4d3d0c..7c5ab1ab7b 100644
--- a/lib/middleware/request_tracker.rb
+++ b/lib/middleware/request_tracker.rb
@@ -47,7 +47,6 @@ class Middleware::RequestTracker
   TRACK_VIEW = "HTTP_DISCOURSE_TRACK_VIEW".freeze
   CONTENT_TYPE = "Content-Type".freeze
   def self.get_data(env,result)
-
     status,headers = result
     status = status.to_i
 
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rb
index 7c17135d02..901e7417e6 100644
--- a/lib/new_post_manager.rb
+++ b/lib/new_post_manager.rb
@@ -28,15 +28,69 @@ class NewPostManager
     @sorted_handlers.sort_by! {|h| -h[:priority]}
   end
 
-  def self.user_needs_approval?(user)
+  def self.is_first_post?(manager)
+    user = manager.user
+    args = manager.args
+
+    !!(
+      args[:first_post_checks] &&
+      user.post_count == 0
+    )
+  end
+
+  def self.is_fast_typer?(manager)
+    args = manager.args
+
+    is_first_post?(manager) &&
+    args[:typing_duration_msecs].to_i < SiteSetting.min_first_post_typing_time &&
+    SiteSetting.auto_block_fast_typers_on_first_post &&
+    manager.user.trust_level <= SiteSetting.auto_block_fast_typers_max_trust_level
+  end
+
+  def self.matches_auto_block_regex?(manager)
+    args = manager.args
+
+    pattern = SiteSetting.auto_block_first_post_regex
+
+    return false unless pattern.present?
+    return false unless is_first_post?(manager)
+
+    begin
+      regex = Regexp.new(pattern, Regexp::IGNORECASE)
+    rescue => e
+      Rails.logger.warn "Invalid regex in auto_block_first_post_regex #{e}"
+      return false
+    end
+
+    "#{args[:title]} #{args[:raw]}" =~ regex
+
+  end
+
+  def self.user_needs_approval?(manager)
+    user = manager.user
+
     return false if user.staff?
 
     (user.post_count < SiteSetting.approve_post_count) ||
-      (user.trust_level < SiteSetting.approve_unless_trust_level.to_i)
+    (user.trust_level < SiteSetting.approve_unless_trust_level.to_i) ||
+    is_fast_typer?(manager) ||
+    matches_auto_block_regex?(manager)
   end
 
   def self.default_handler(manager)
-    manager.enqueue('default') if user_needs_approval?(manager.user)
+    if user_needs_approval?(manager)
+
+      result = manager.enqueue('default')
+
+      block = is_fast_typer?(manager)
+
+      block ||= matches_auto_block_regex?(manager)
+
+      manager.user.update_columns(blocked: true) if block
+
+      result
+
+    end
   end
 
   def self.queue_enabled?
diff --git a/lib/post_creator.rb b/lib/post_creator.rb
index 1f17538618..0bd6d9e547 100644
--- a/lib/post_creator.rb
+++ b/lib/post_creator.rb
@@ -113,6 +113,7 @@ class PostCreator
   def create
     if valid?
       transaction do
+        build_post_stats
         create_topic
         save_post
         extract_links
@@ -146,6 +147,14 @@ class PostCreator
     @post
   end
 
+  def self.track_post_stats
+    Rails.env != "test".freeze || @track_post_stats
+  end
+
+  def self.track_post_stats=(val)
+    @track_post_stats = val
+  end
+
   def self.create(user, opts)
     PostCreator.new(user, opts).create
   end
@@ -172,6 +181,23 @@ class PostCreator
 
   protected
 
+  def build_post_stats
+    if PostCreator.track_post_stats
+      draft_key = @topic ? "topic_#{@topic.id}" : "new_topic"
+
+      sequence = DraftSequence.current(@user, draft_key)
+      revisions = Draft.where(sequence: sequence,
+                              user_id: @user.id,
+                              draft_key: draft_key).pluck(:revisions).first || 0
+
+      @post.build_post_stat(
+        drafts_saved: revisions,
+        typing_duration_msecs: @opts[:typing_duration_msecs] || 0,
+        composer_open_duration_msecs: @opts[:composer_open_duration_msecs] || 0
+      )
+    end
+  end
+
   def trigger_after_events(post)
     DiscourseEvent.trigger(:topic_created, post.topic, @opts, @user) unless @opts[:topic_id]
     DiscourseEvent.trigger(:post_created, post, @opts, @user)
diff --git a/lib/version.rb b/lib/version.rb
index c4ede9fe1c..52186db606 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 1
       MINOR = 4
       TINY  = 0
-      PRE   = 'beta7'
+      PRE   = 'beta8'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end
diff --git a/plugins/poll/assets/stylesheets/common/poll.scss b/plugins/poll/assets/stylesheets/common/poll.scss
index 8730ef44c5..b15a657400 100644
--- a/plugins/poll/assets/stylesheets/common/poll.scss
+++ b/plugins/poll/assets/stylesheets/common/poll.scss
@@ -10,6 +10,8 @@ div.poll {
 
   border: 1px solid $border-color;
 
+  @include unselectable;
+
   ul, ol {
     margin: 0;
     padding: 0;
diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml
index 6a4702e0a6..a1f3078317 100644
--- a/plugins/poll/config/locales/client.ar.yml
+++ b/plugins/poll/config/locales/client.ar.yml
@@ -8,14 +8,6 @@
 ar:
   js:
     poll:
-      voters:
-        zero: "المصوتون"
-        one: "المصوت"
-        other: "المصوتون"
-      total_votes:
-        zero: "مجموع الأصوات"
-        one: "مجموع التصويت"
-        other: "مجموع الأصوات"
       average_rating: "متوسط التصنيف: <strong>%{average}</strong> "
       multiple:
         help:
diff --git a/plugins/poll/config/locales/client.fi.yml b/plugins/poll/config/locales/client.fi.yml
index e0484346d9..1b31427f79 100644
--- a/plugins/poll/config/locales/client.fi.yml
+++ b/plugins/poll/config/locales/client.fi.yml
@@ -9,11 +9,9 @@ fi:
   js:
     poll:
       voters:
-        zero: "äänestäjät"
         one: "äänestäjä"
         other: "äänestäjät"
       total_votes:
-        zero: "ääntä"
         one: "ääni"
         other: "ääntä"
       average_rating: "Keskivertoarvio: <strong>%{average}</strong>."
diff --git a/plugins/poll/config/locales/client.ja.yml b/plugins/poll/config/locales/client.ja.yml
index 210dbef704..2d01b7c38e 100644
--- a/plugins/poll/config/locales/client.ja.yml
+++ b/plugins/poll/config/locales/client.ja.yml
@@ -9,13 +9,9 @@ ja:
   js:
     poll:
       voters:
-        zero: "投票者"
-        one: "投票者"
-        other: "投票者"
+        other: "投票者数"
       total_votes:
-        zero: "投票総数"
-        one: "投票総数"
-        other: "投票総数"
+        other: "合計得票数"
       average_rating: "平均評価: <strong>%{average}</strong>."
       multiple:
         help:
diff --git a/plugins/poll/config/locales/client.pt_BR.yml b/plugins/poll/config/locales/client.pt_BR.yml
index 198ebc5412..7fec94ebd8 100644
--- a/plugins/poll/config/locales/client.pt_BR.yml
+++ b/plugins/poll/config/locales/client.pt_BR.yml
@@ -8,14 +8,6 @@
 pt_BR:
   js:
     poll:
-      voters:
-        zero: "votantes"
-        one: "votante"
-        other: "votantes"
-      total_votes:
-        zero: "total de votos"
-        one: "total de voto"
-        other: "total de votos"
       average_rating: "Resultado médio: <strong>%{average}</strong>."
       multiple:
         help:
diff --git a/plugins/poll/config/locales/client.sv.yml b/plugins/poll/config/locales/client.sv.yml
index 1dbe605d42..421ff6218f 100644
--- a/plugins/poll/config/locales/client.sv.yml
+++ b/plugins/poll/config/locales/client.sv.yml
@@ -8,13 +8,6 @@
 sv:
   js:
     poll:
-      voters:
-        zero: "röster"
-        one: "röst"
-        other: "röster"
-      total_votes:
-        zero: "totalt antal röster"
-        other: "totalt antal röster"
       average_rating: "Medelbetyg: <strong>%{average}</strong>."
       multiple:
         help:
diff --git a/plugins/poll/config/locales/server.nb_NO.yml b/plugins/poll/config/locales/server.nb_NO.yml
index 27504ba609..8d5c7e686d 100644
--- a/plugins/poll/config/locales/server.nb_NO.yml
+++ b/plugins/poll/config/locales/server.nb_NO.yml
@@ -10,6 +10,8 @@ nb_NO:
     poll_enabled: "Tillat brukere å opprette spørreundersøkelser"
     poll_maximum_options: "Maksimalt antall alternativer i en spørreundersøkelse som tillates."
   poll:
+    multiple_polls_without_name: "Det er flere spørreundersøkelser uten et navn. Bruk '<code>navn</code>' attributten til å identifisere spørreundersøkelsene dine."
+    multiple_polls_with_same_name: "Det er flere spørreundersøkelser med samme navn: <strong>%{name}</strong>. Bruk '<code>name</code>' attributten til å identifisere spørreundersøkelsene dine."
     default_poll_must_have_at_least_2_options: "Spørrsundersøkelser må inneholde minst 2 alternativer."
     named_poll_must_have_at_least_2_options: "Spørresundersøkelsen <strong>%{name}</strong> må ha minst 2 svaralternativer."
     default_poll_must_have_less_options: "Spørreundersøkelsen må ha mindre enn %{max} svaralternativer."
diff --git a/plugins/poll/spec/controllers/posts_controller_spec.rb b/plugins/poll/spec/controllers/posts_controller_spec.rb
index dd4699345c..a647be1327 100644
--- a/plugins/poll/spec/controllers/posts_controller_spec.rb
+++ b/plugins/poll/spec/controllers/posts_controller_spec.rb
@@ -4,8 +4,13 @@ describe PostsController do
   let!(:user) { log_in }
   let!(:title) { "Testing Poll Plugin" }
 
+  before do
+    SiteSetting.min_first_post_typing_time = 0
+  end
+
   describe "polls" do
 
+
     it "works" do
       xhr :post, :create, { title: title, raw: "[poll]\n- A\n- B\n[/poll]" }
       expect(response).to be_success
diff --git a/public/403.zh_CN.html b/public/403.zh_CN.html
index f65ce67b36..90823fbe79 100644
--- a/public/403.zh_CN.html
+++ b/public/403.zh_CN.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>你不可以这样做（403）</title>
+<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; }
@@ -18,9 +18,9 @@
 <body>
   <div class="dialog">
     <h1>403</h1>
-    <p>你不能查看这个资源！</p>
+    <p>查看资源行为禁止！</p>
 
-    <p>这个将被 Discourse 自定义的 403 页面取代。</p>
+    <p>此将被 Discourse 自定义 403 页面取代。</p>
   </div>
 </body>
 </html>
diff --git a/public/422.zh_CN.html b/public/422.zh_CN.html
index 44c14545c0..c79e1b562a 100644
--- a/public/422.zh_CN.html
+++ b/public/422.zh_CN.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>你的更改操作被拒绝  (422)</title>
+<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; }
@@ -18,8 +18,8 @@
 <body>
   <!-- This file lives in public/422.html -->
   <div class="dialog">
-    <h1>你的更改操作被拒绝。</h1>
-    <p>你可能没有权限更改。</p>
+    <h1>更改操作被拒绝。</h1>
+    <p>无权限修改。</p>
   </div>
 </body>
 </html>
diff --git a/script/import_scripts/lithium.rb b/script/import_scripts/lithium.rb
index c3a1b23d7f..4d7a84366c 100644
--- a/script/import_scripts/lithium.rb
+++ b/script/import_scripts/lithium.rb
@@ -62,8 +62,9 @@ class ImportScripts::Lithium < ImportScripts::Base
     import_likes
     import_accepted_answers
     import_pms
+    close_topics
+    create_permalinks
 
-    # close_topics
     post_process_posts
   end
 
@@ -638,35 +639,26 @@ class ImportScripts::Lithium < ImportScripts::Base
 
   def close_topics
 
-    return "NOT WORKING CAUSE NO WAY TO FIND OUT"
 
-    # puts "\nclosing closed topics..."
-    #
-    # sql = "select unique_id post_id from message2 where (attributes & 0x20000000 ) != 0;"
-    # results = mysql_query(sql)
-    #
-    # # loading post map
-    # existing_map = {}
-    # PostCustomField.where(name: 'import_unique_id').pluck(:post_id, :value).each do |post_id, import_id|
-    #   existing_map[import_id] = post_id
-    # end
-    #
-    # puts "loading data into temp table"
-    # PostAction.transaction do
-    #   results.each do |result|
-    #
-    #
-    #     p  existing_map[result["post_id"].to_s]
-    #
-    #   end
-    # end
-    #
-    # exit
-    #
-    # puts "\nfreezing frozen topics..."
-    #
-    # sql = "select unique_id post_id from message2 where (attributes & 0x2000000 ) != 0;"
-    # results = mysql_query(sql)
+    puts "\nclosing closed topics..."
+
+    sql = "select unique_id post_id from message2 where root_id = id AND (attributes & 0x0002 ) != 0;"
+    results = mysql_query(sql)
+
+    # loading post map
+    existing_map = {}
+    PostCustomField.where(name: 'import_unique_id').pluck(:post_id, :value).each do |post_id, import_id|
+      existing_map[import_id.to_i] = post_id.to_i
+    end
+
+    results.map{|r| r["post_id"]}.each_slice(500) do |ids|
+      mapped = ids.map{|id| existing_map[id]}.compact
+      Topic.exec_sql("
+                     UPDATE topics SET closed = true
+                     WHERE id IN (SELECT topic_id FROM posts where id in (:ids))
+                     ", ids: mapped) if mapped.present?
+    end
+
   end
 
 
@@ -737,16 +729,13 @@ SQL
     return nil
   end
 
-  def to_markdown(html)
-  end
-
   def post_process_posts
     puts "", "Postprocessing posts..."
 
     current = 0
     max = Post.count
 
-    Post.where(topic_id: 164).find_each do |post|
+    Post.all.find_each do |post|
       begin
         new_raw = postprocess_post_raw(post.raw, post.user_id)
         post.raw = new_raw
@@ -770,11 +759,11 @@ SQL
         uri.hostname = nil
       end
 
-      if !uri.hostname
+      if uri && !uri.hostname
         if l["href"]
           l["href"] = uri.path
           # we have an internal link, lets see if we can remap it?
-          permalink = Permalink.find_by_url(uri.path)
+          permalink = Permalink.find_by_url(uri.path) rescue nil
           if l["href"] && permalink && permalink.target_url
             l["href"] = permalink.target_url
           end
@@ -782,15 +771,19 @@ SQL
 
           # we need an upload here
           upload_name = $1 if uri.path =~ /image-id\/([^\/]+)/
+          if upload_name
+            png = UPLOAD_DIR + "/" + upload_name + ".png"
+            jpg = UPLOAD_DIR + "/" + upload_name + ".jpg"
+            gif = UPLOAD_DIR + "/" + upload_name + ".gif"
 
-          png = UPLOAD_DIR + "/" + upload_name + ".png"
-          jpg = UPLOAD_DIR + "/" + upload_name + ".jpg"
-
-          # check to see if we have it
-          if File.exist?(png)
-            image = png
-          elsif File.exists?(jpg)
-            image = jpg
+            # check to see if we have it
+            if File.exist?(png)
+              image = png
+            elsif File.exists?(jpg)
+              image = jpg
+            elsif File.exists?(gif)
+              image = gif
+            end
           end
 
           if image
diff --git a/spec/components/cooked_post_processor_spec.rb b/spec/components/cooked_post_processor_spec.rb
index 130686304d..87e282ab5c 100644
--- a/spec/components/cooked_post_processor_spec.rb
+++ b/spec/components/cooked_post_processor_spec.rb
@@ -173,10 +173,10 @@ describe CookedPostProcessor do
 
   context ".extract_images" do
 
-    let(:post) { build(:post_with_images_in_quote_and_onebox) }
+    let(:post) { build(:post_with_plenty_of_images) }
     let(:cpp) { CookedPostProcessor.new(post) }
 
-    it "does not extract images inside oneboxes or quotes" do
+    it "does not extract emojis or images inside oneboxes or quotes" do
       expect(cpp.extract_images.length).to eq(0)
     end
 
diff --git a/spec/components/new_post_manager_spec.rb b/spec/components/new_post_manager_spec.rb
index f68c606ebd..2c45185c62 100644
--- a/spec/components/new_post_manager_spec.rb
+++ b/spec/components/new_post_manager_spec.rb
@@ -192,4 +192,35 @@ describe NewPostManager do
 
   end
 
+
+  context "user needs approval?" do
+
+    let :user do
+      user = Fabricate.build(:user, trust_level: 0)
+      user_stat = UserStat.new(post_count: 0)
+      user.user_stat = user_stat
+      user
+    end
+
+
+
+    it "handles user_needs_approval? correctly" do
+      u = user
+      default = NewPostManager.new(u,{})
+      expect(NewPostManager.user_needs_approval?(default)).to eq(false)
+
+      with_check = NewPostManager.new(u,{first_post_checks: true})
+      expect(NewPostManager.user_needs_approval?(with_check)).to eq(true)
+
+      u.user_stat.post_count = 1
+      with_check_and_post = NewPostManager.new(u,{first_post_checks: true})
+      expect(NewPostManager.user_needs_approval?(with_check_and_post)).to eq(false)
+
+      u.user_stat.post_count = 0
+      u.trust_level = 1
+      with_check_tl1 = NewPostManager.new(u,{first_post_checks: true})
+      expect(NewPostManager.user_needs_approval?(with_check_tl1)).to eq(false)
+    end
+  end
+
 end
diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb
index 6a5feef97f..4d58fb9fae 100644
--- a/spec/components/post_creator_spec.rb
+++ b/spec/components/post_creator_spec.rb
@@ -213,6 +213,21 @@ describe PostCreator do
         }.to_not change { topic.excerpt }
       end
 
+      it 'creates post stats' do
+
+        Draft.set(user, 'new_topic', 0, "test")
+        Draft.set(user, 'new_topic', 0, "test1")
+
+        begin
+          PostCreator.track_post_stats = true
+          post = creator.create
+          expect(post.post_stat.typing_duration_msecs).to eq(0)
+          expect(post.post_stat.drafts_saved).to eq(2)
+        ensure
+          PostCreator.track_post_stats = false
+        end
+      end
+
       describe "topic's auto close" do
 
         it "doesn't update topic's auto close when it's not based on last post" do
diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb
index 8cffddd192..f9c7333c61 100644
--- a/spec/components/pretty_text_spec.rb
+++ b/spec/components/pretty_text_spec.rb
@@ -322,6 +322,12 @@ describe PrettyText do
     expect(PrettyText.cook("```cpp\ncpp\n```")).to match_html("<p></p><pre><code class='lang-cpp'>cpp</code></pre>")
   end
 
+  it 'indents code correctly' do
+    code = "X\n```\n\n    #\n    x\n```"
+    cooked = PrettyText.cook(code)
+    expect(cooked).to match_html("<p>X<br></p>\n\n<p></p><pre><code class=\"lang-auto\">    #\n    x</code></pre>")
+  end
+
   it 'can substitute s3 cdn correctly' do
     SiteSetting.enable_s3_uploads = true
     SiteSetting.s3_access_key_id = "XXX"
diff --git a/spec/components/topic_query_spec.rb b/spec/components/topic_query_spec.rb
index a961665baf..c06c6623b5 100644
--- a/spec/components/topic_query_spec.rb
+++ b/spec/components/topic_query_spec.rb
@@ -320,21 +320,51 @@ describe TopicQuery do
       end
     end
 
+    context 'preload api' do
+      let(:topics) { }
+
+      it "preloads data correctly" do
+        TopicList.preloaded_custom_fields << "tag"
+        TopicList.preloaded_custom_fields << "age"
+        TopicList.preloaded_custom_fields << "foo"
+
+        topic = Fabricate.build(:topic, user: creator, bumped_at: 10.minutes.ago)
+        topic.custom_fields["tag"] = ["a","b","c"]
+        topic.custom_fields["age"] = 22
+        topic.save
+
+        new_topic = topic_query.list_new.topics.first
+
+        expect(new_topic.custom_fields["tag"].sort).to eq(["a","b","c"])
+        expect(new_topic.custom_fields["age"]).to eq("22")
+
+        expect(new_topic.custom_field_preloaded?("tag")).to eq(true)
+        expect(new_topic.custom_field_preloaded?("age")).to eq(true)
+        expect(new_topic.custom_field_preloaded?("foo")).to eq(true)
+        expect(new_topic.custom_field_preloaded?("bar")).to eq(false)
+
+        TopicList.preloaded_custom_fields.clear
+
+        # if we attempt to access non preloaded fields explode
+        expect{new_topic.custom_fields["boom"]}.to raise_error
+
+      end
+    end
+
     context 'with a new topic' do
       let!(:new_topic) { Fabricate(:topic, user: creator, bumped_at: 10.minutes.ago) }
       let(:topics) { topic_query.list_new.topics }
 
 
-      it "contains the new topic" do
-        expect(topics).to eq([new_topic])
-      end
-
       it "contains no new topics for a user that has missed the window" do
+
+        expect(topic_query.list_new.topics).to eq([new_topic])
+
         user.new_topic_duration_minutes = 5
         user.save
         new_topic.created_at = 10.minutes.ago
         new_topic.save
-        expect(topics).to eq([])
+        expect(topic_query.list_new.topics).to eq([])
       end
 
       context "muted topics" do
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index ce2948fd95..76e76f6f3d 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -446,6 +446,10 @@ describe PostsController do
 
   describe 'creating a post' do
 
+    before do
+      SiteSetting.min_first_post_typing_time = 0
+    end
+
     include_examples 'action requires login', :post, :create
 
     context 'api' do
@@ -477,6 +481,46 @@ describe PostsController do
 	      expect { xhr :post, :create }.to raise_error(ActionController::ParameterMissing)
       end
 
+      it 'queues the post if min_first_post_typing_time is not met' do
+
+        SiteSetting.min_first_post_typing_time = 3000
+        # our logged on user here is tl1
+        SiteSetting.auto_block_fast_typers_max_trust_level = 1
+
+        xhr :post, :create, {raw: 'this is the test content', title: 'this is the test title for the topic'}
+
+        expect(response).to be_success
+        parsed = ::JSON.parse(response.body)
+
+        expect(parsed["action"]).to eq("enqueued")
+
+        user.reload
+        expect(user.blocked).to eq(true)
+
+        qp = QueuedPost.first
+
+        mod = Fabricate(:moderator)
+        qp.approve!(mod)
+
+        user.reload
+        expect(user.blocked).to eq(false)
+
+      end
+
+      it 'blocks correctly based on auto_block_first_post_regex' do
+        SiteSetting.auto_block_first_post_regex = "I love candy|i eat s[1-5]"
+
+        xhr :post, :create, {raw: 'this is the test content', title: 'when I eat s3 sometimes when not looking'}
+
+        expect(response).to be_success
+        parsed = ::JSON.parse(response.body)
+
+        expect(parsed["action"]).to eq("enqueued")
+
+        user.reload
+        expect(user.blocked).to eq(true)
+      end
+
       it 'creates the post' do
         xhr :post, :create, {raw: 'this is the test content', title: 'this is the test title for the topic'}
 
diff --git a/spec/fabricators/post_fabricator.rb b/spec/fabricators/post_fabricator.rb
index cab02e02ed..7628ee4ae3 100644
--- a/spec/fabricators/post_fabricator.rb
+++ b/spec/fabricators/post_fabricator.rb
@@ -42,11 +42,12 @@ Fabricator(:reply, from: :post) do
   '
 end
 
-Fabricator(:post_with_images_in_quote_and_onebox, from: :post) do
+Fabricator(:post_with_plenty_of_images, from: :post) do
   cooked '
 <aside class="quote"><img src="/uploads/default/1/1234567890123456.jpg"></aside>
 <div class="onebox-result"><img src="/uploads/default/1/1234567890123456.jpg"></div>
 <div class="onebox"><img src="/uploads/default/1/1234567890123456.jpg"></div>
+<p>With an emoji! <img src="//cdn.discourse.org/meta/images/emoji/twitter/smile.png?v=0" title=":smile:" class="emoji" alt="smile" width="72" height="72"></p>
 '
 end
 
diff --git a/spec/models/draft_spec.rb b/spec/models/draft_spec.rb
index f0c418e28b..16746ad4ee 100644
--- a/spec/models/draft_spec.rb
+++ b/spec/models/draft_spec.rb
@@ -109,6 +109,12 @@ describe Draft do
       expect(Draft.get(p.user, p.topic.draft_key, s)).to eq nil
     end
 
-    it 'increases the sequence number when a post is revised'
+    it 'increases revision each time you set' do
+      u = User.first
+      Draft.set(u, 'new_topic', 0, 'hello')
+      Draft.set(u, 'new_topic', 0, 'goodbye')
+
+      expect(Draft.find_draft(u, 'new_topic').revisions).to eq(2)
+    end
   end
 end
diff --git a/spec/models/topic_link_click_spec.rb b/spec/models/topic_link_click_spec.rb
index 2330ec3d28..b8c4bb8c7c 100644
--- a/spec/models/topic_link_click_spec.rb
+++ b/spec/models/topic_link_click_spec.rb
@@ -29,41 +29,35 @@ describe TopicLinkClick do
 
       it 'creates the forum topic link click' do
         expect(TopicLinkClick.count).to eq(1)
-      end
 
-      it 'has 0 clicks at first' do
         @topic_link.reload
         expect(@topic_link.clicks).to eq(1)
-      end
 
-      it 'serializes and deserializes the IP' do
         expect(TopicLinkClick.first.ip_address.to_s).to eq('192.168.1.1')
       end
-
     end
 
     context 'create_from' do
 
-      context 'without a url' do
 
-        it "returns nil to prevent redirect exploit" do
-          click = TopicLinkClick.create_from(url: "http://url-that-doesnt-exist.com", post_id: @post.id, ip: '127.0.0.1')
-          expect(click).to eq(nil)
-        end
+      it "works correctly" do
+
+        # returns nil to prevent exploits
+        click = TopicLinkClick.create_from(url: "http://url-that-doesnt-exist.com", post_id: @post.id, ip: '127.0.0.1')
+        expect(click).to eq(nil)
+
+        # redirects if whitelisted
+        click = TopicLinkClick.create_from(url: "https://www.youtube.com/watch?v=jYd_5aggzd4", post_id: @post.id, ip: '127.0.0.1')
+        expect(click).to eq("https://www.youtube.com/watch?v=jYd_5aggzd4")
+
+        # does not change own link
+        expect {
+          TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.0', user_id: @post.user_id)
+        }.not_to change(TopicLinkClick, :count)
 
-        it "redirect to whitelisted hostnames" do
-          click = TopicLinkClick.create_from(url: "https://www.youtube.com/watch?v=jYd_5aggzd4", post_id: @post.id, ip: '127.0.0.1')
-          expect(click).to eq("https://www.youtube.com/watch?v=jYd_5aggzd4")
-        end
       end
 
-      context 'clicking on your own link' do
-        it "should not record the click" do
-          expect {
-            TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.0', user_id: @post.user_id)
-          }.not_to change(TopicLinkClick, :count)
-        end
-      end
+
 
       context 'with a valid url and post_id' do
         before do
@@ -75,13 +69,11 @@ describe TopicLinkClick do
           expect(@click).to be_present
           expect(@click.topic_link).to eq(@topic_link)
           expect(@url).to eq(@topic_link.url)
+
+          # second click should not record
+          expect { TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.1') }.not_to change(TopicLinkClick, :count)
         end
 
-        context "clicking again" do
-          it "should not record the click due to rate limiting" do
-            expect { TopicLinkClick.create_from(url: @topic_link.url, post_id: @post.id, ip: '127.0.0.1') }.not_to change(TopicLinkClick, :count)
-          end
-        end
       end
 
       context "relative urls" do
@@ -103,6 +95,55 @@ describe TopicLinkClick do
           redirect = TopicLinkClick.create_from(url: url)
           expect(redirect).to eq(url)
         end
+
+        context "cdn links" do
+
+          before do
+            Rails.configuration.action_controller.asset_host = "https://cdn.discourse.org/stuff"
+          end
+
+          after do
+            Rails.configuration.action_controller.asset_host = nil
+          end
+
+          it "correctly handles cdn links" do
+
+            url = TopicLinkClick.create_from(
+              url: 'https://cdn.discourse.org/stuff/my_link',
+              topic_id: @topic.id,
+              ip: '127.0.0.3')
+
+            expect(url).to eq('https://cdn.discourse.org/stuff/my_link')
+
+            # cdn exploit
+            url = TopicLinkClick.create_from(
+              url: 'https://cdn.discourse.org/bad/my_link',
+              topic_id: @topic.id,
+              ip: '127.0.0.3')
+
+            expect(url).to eq(nil)
+
+            # cdn better link track
+            path = "/uploads/site/29/5b585f848d8761d5.xls"
+
+            post = Fabricate(:post, topic: @topic, raw: "[test](#{path})")
+            TopicLink.extract_from(post)
+
+            url = TopicLinkClick.create_from(
+              url: "https://cdn.discourse.org/stuff#{path}",
+              topic_id: post.topic_id,
+              post_id: post.id,
+              ip: '127.0.0.3')
+
+            expect(url).to eq("https://cdn.discourse.org/stuff#{path}")
+
+            click = TopicLinkClick.order('id desc').first
+
+            expect(click.topic_link_id).to eq(TopicLink.order('id desc').first.id)
+          end
+
+        end
+
       end
 
       context 'with a HTTPS version of the same URL' do
diff --git a/test/javascripts/adapaters/topic-list-test.js.es6 b/test/javascripts/adapters/topic-list-test.js.es6
similarity index 100%
rename from test/javascripts/adapaters/topic-list-test.js.es6
rename to test/javascripts/adapters/topic-list-test.js.es6
diff --git a/test/javascripts/components/combo-box-test.js.es6 b/test/javascripts/components/combo-box-test.js.es6
index 4badfcd1a6..174905548e 100644
--- a/test/javascripts/components/combo-box-test.js.es6
+++ b/test/javascripts/components/combo-box-test.js.es6
@@ -15,6 +15,19 @@ componentTest('with objects', {
   }
 });
 
+componentTest('with objects and valueAttribute', {
+  template: '{{combo-box content=items valueAttribute="value"}}',
+  setup() {
+    this.set('items', [{value: 0, name: 'hello'}, {value: 1, name: 'world'}]);
+  },
+
+  test(assert) {
+    assert.ok(this.$('.combobox').length);
+    assert.equal(this.$("select option[value='0']").text(), 'hello');
+    assert.equal(this.$("select option[value='1']").text(), 'world');
+  }
+});
+
 componentTest('with an array', {
   template: '{{combo-box content=items value=value}}',
   setup() {
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js.es6
index 7ac9e2c9b9..f66a84bfa6 100644
--- a/test/javascripts/models/report-test.js.es6
+++ b/test/javascripts/models/report-test.js.es6
@@ -14,8 +14,11 @@ test("counts", function() {
 
   equal(report.get('todayCount'), 5);
   equal(report.get('yesterdayCount'), 4);
-  equal(report.sumDays(2, 4), 6, "adds the values for the given range of days, inclusive");
+  equal(report.valueFor(2, 4), 6, "adds the values for the given range of days, inclusive");
   equal(report.get('lastSevenDaysCount'), 307, "sums 7 days excluding today");
+
+  report.set("method", "average");
+  equal(report.valueFor(2, 4), 2, "averages the values for the given range of days");
 });
 
 test("percentChangeString", function() {