mattdrayer/rebase-20140926: Repaired faulty keygen logic
update schema for workgroup feedback

relabel migration at 0008
XBlock Discussion changes

Conflicts:
	cms/djangoapps/contentstore/views/helpers.py
	common/static/coffee/src/discussion/content.coffee
	common/static/coffee/src/discussion/discussion_filter.coffee
	common/static/coffee/src/discussion/discussion_module_view.coffee
	common/static/coffee/src/discussion/discussion_router.coffee
	common/static/coffee/src/discussion/views/discussion_content_view.coffee
	common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee
	common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee
	common/static/coffee/src/discussion/views/discussion_thread_view.coffee
	common/static/coffee/src/discussion/views/new_post_view.coffee
	common/static/coffee/src/discussion/views/response_comment_show_view.coffee
	common/static/coffee/src/discussion/views/thread_response_show_view.coffee
	common/static/coffee/src/discussion/views/thread_response_view.coffee
	lms/djangoapps/django_comment_client/forum/views.py
	lms/static/sass/discussion/_discussion.scss
	lms/templates/discussion/_discussion_module.html
	lms/templates/discussion/_filter_dropdown.html
	lms/templates/discussion/_js_head_dependencies.html
	lms/templates/discussion/_thread_list_template.html
	lms/templates/discussion/_underscore_templates.html
	lms/templates/discussion/index.html
	lms/templates/discussion/mustache/_inline_discussion.mustache
	lms/templates/discussion/mustache/_pagination.mustache
	lms/templates/discussion/mustache/_profile_thread.mustache
Add ENABLE_DISCUSSION_EMAIL_DIGEST in api_manager

Conflicts:
	lms/djangoapps/api_manager/users/tests.py
Removed duplicate lines
mattdrayer/rebase-20140926-cherrypicks: Added recent commits to rebase branch
mattdrayer/api-proforma-migration: Added migration file
ziafazal/api-fix-course-image-url: make image url relative

uncomment discussion stats call
rename misnumbered migration
mattdrayer/api-orgs-complete-count: New metrics operation
Merge pull request #258 from aboudreault/cohorts-rebase

Cohorts rebase
Merge pull request #257 from edx-solutions/mattdrayer/rebase-20140926-cherrypicks

Mattdrayer/rebase 20140926 cherrypicks
Merge pull request #256 from open-craft/rebase-20140926-merged-xblock-discussion-changes

Rebase 20140926 merged xblock discussion changes
Merge pull request #251 from edx-solutions/mattdrayer/rebase-20140926-utilrequestfix

mattdrayer/rebase-20140926: Repaired faulty keygen logic
Fix api_manager failing tests about cohorts