Update hash to discussion xblock
gradebook appears to bomb if there is no data to aggregate
Merge pull request #228 from edx-solutions/cdodge/gradebook-empty-protection

gradebook appears to bomb if there is no data to aggregate
Added new assistant role
Merge pull request #229 from edx-solutions/mjames/course_ta_role

Added new "assistant" role
ziafazal/api-add-company-logo-to-organization-model: added logo_url field
Merge pull request #232 from edx-solutions/ziafazal/api-add-company-logo-to-organization-model

ziafazal/api-add-company-logo-to-organization-model: added logo_url field
ooyala/drag-n-drop: Update hash
Merge branch 'release' into master

Conflicts:
	requirements/edx/custom.txt
Revised fix: prevent unicode errors without changing anonymous ID digest format
Addresses problem when too many excluded users were being excluded
Merge pull request #236 from open-craft/fix-anonymous-digest

Revised fix: prevent unicode errors without changing anonymous ID digest
drag-n-drop: Update hash
Merge pull request #237 from edx-solutions/mjames/course_average

Addresses problem when too many excluded users were being excluded
Merge pull request #238 from edx-solutions/release

Release
adventure: Update hash
update schema for workgroup feedback

relabel migration at 0008
Updated Group Project XBlock hash
Merge remote-tracking branch 'solutions/release' into solutions_master

Conflicts:
	requirements/edx/custom.txt
Merge pull request #240 from edx-solutions/cdodge/make-workgroup-models-bigger

update schema for workgroup feedback