discussion: Update hash
revert deprecated block_type change for local_resource_url
mattdrayer/api-orgs-complete-count: New metrics operation
hash - updated hash for group project xblock
Merge pull request #252 from aboudreault/revert-block-type-change

revert deprecated block_type change for local_resource_url
discussion: Update hash
Merge branch 'release' into master

Conflicts:
	requirements/edx/custom.txt
avdenture: Update hash
adventure: update hash
ooyala: Update hash
Merge pull request #244 from edx-solutions/mattdrayer/api-orgs-complete-count

mattdrayer/api-orgs-complete-count: New metrics operation - seems to work, merging to allow QA eyes to get on it
mentoring: update hash
image-explorer: Update hash
xblock: update hash
discussion: Update hash
drag-n-drop-v2: Update hash
mattdrayer/api-progress-org-filter: Added new leaderboard filter
Merge pull request #261 from edx-solutions/mattdrayer/api-progress-org-filter

mattdrayer/api-progress-org-filter: Added new leaderboard filter
initial changes