Merge branch 'feature/arjun/new-discussions' of github.com:MITx/mitx into feature/arjun/new-discussions

lms/static/coffee/src/discussion/discussion.coffee

@@ -18,11 +18,12 @@ if Backbone?
       @current_page < @pages
 
     addThread: (thread, options) ->
-      # TODO: Check for existing thread with same ID?
-      options ||= {}
-      model = new Thread thread
-      @add model
-      model
+      # TODO: Check for existing thread with same ID in a faster way
+      if not @find(thread.id)
+        options ||= {}
+        model = new Thread thread
+        @add model
+        model
 
     retrieveAnotherPage: (search_text="", commentable_ids="", sort_key="")->
       # TODO: I really feel that this belongs in DiscussionThreadListView

lms/static/sass/_discussion.scss

@@ -1039,7 +1039,7 @@ body.discussion {
       }
     }
 
-    .more a {      
+    .more-pages a {
       background: #eee;
       font-size: 12px;
       line-height: 33px;