Tweak to migration in order to accomodate old names for data fields and allow for if data fields were not present

mattdrayer/api-orgdatamigration: Script to copy info from Group to Organization (including relationships)

remove duplicate data

Removed course module migration

mattdrayer/api-coursegrades: Added support for viewing a set of grades for a course.  Includes filters/aggregations.

Generated migration

added is_private field to workgroup model and lookup of workgroup by
users

added organization field to Project

Fixed broken test

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

added lookup of organisation by user

merged with master

switch to APIView to support url conventions

merged with master

add pagination to /api/users

add support of id based filtering

add num_pages field to users api output

add tests for paging data and ability to parse page_size from request

using ListAPIView and DRF filters

Disallow unfiltered lists

Updated docstrings

added avatar url field

muhhshoaib/security-change-user-password-requirements-685: handled password complexity scenarios messages according to Chris Suggestions

muhhshoaib/security-change-user-password-requirements-685: changed the chracteres storage from sets to lists

 muhhshoaib/adding_start_and_end_date_fields_to_course_objects_1302:added start and end date fields in course module

muhhshoaib/adding_start_and_end_date_fields_to_course_objects_1302: changes in the start and end dates

asadiqbal08/add_is_active_flag_to_userlist_in_group:[1291] Added is_active flag to user list in a group

Add logging message

asadiqbal08/api_support_title_field_userprofile: [MCKIN-1241] Added support for title field to edX user profile

fixes

cdodge/get-ip-restriction-list-from-config: change settings name to make clearer and make sure we are getting values from lms.envs.json

cdodge/make-some-middleware-optional: allow for runtimes to specify which pieces of middleware should be removed. This helps with some performance characteristics.

cdodge/fire-progress-on-html-module-render: modify the xmodule HTML to fire a progress event to record the fact that the user visited that content

asadiqbal08/api-address-based-restriction:API Security: IP address based restriction added MCKIN-1108

uncomment the code