Merge branch 'feature/tomg/new-discussions' of github.com:MITx/mitx into feature/tomg/new-discussions Conflicts: lms/static/coffee/src/discussion/views/discussion_thread_view.coffee lms/static/coffee/src/discussion/views/thread_list_item_view.coffee
