Merge pull request #520 from MITx/feature/rocky/discussion

lms/djangoapps/django_comment_client/base/views.py

lms/djangoapps/django_comment_client/forum/views.py

lms/djangoapps/django_comment_client/helpers.py

lms/djangoapps/django_comment_client/mustache_helpers.py

lms/djangoapps/django_comment_client/settings.py

lms/djangoapps/django_comment_client/utils.py

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

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

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

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

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

lms/templates/courseware/courseware.html

lms/templates/discussion/_content_renderer.html

lms/templates/discussion/_similar_posts.html

lms/templates/discussion/_user_active_threads.html

lms/templates/discussion/_user_profile.html

lms/templates/discussion/index.html

lms/templates/discussion/mustache/_content.mustache

lms/templates/discussion/mustache/_new_post.mustache

lms/templates/discussion/single_thread.html