Updating group-project xblock hash
Merge remote-tracking branch 'solutions/release' into solutions_master

Conflicts:
	requirements/edx/custom.txt