ooyala: Update hash
Moved imports to startup.py.

Conflicts:
	cms/startup.py
	lms/startup.py
Merge branch 'release' into master
merged with master

move slash base course id logic in get_course_key
Merge pull request #212 from edx-solutions/ziafazal/api-additional-info-course-metrics

added more info to course metrics
mattdrayer/api-course-avg-release: Account for ungraded students
Merge pull request #219 from edx-solutions/mattdrayer/api-course-avg-release

mattdrayer/api-course-avg-release: Account for ungraded students
Merge remote-tracking branch 'origin/release' into solutions-master
Update xblock group project hash
Update xblock group project hash
mattdrayer/add-missing-files
Resolved commit
mentoring: Update hash
mentoring: Update hash
mattdrayer/api - Proforma grading fix
mentoring: Update hash
Merge remote-tracking branch 'origin/release' into solutions-master
Ensure that API calls using anonymous user have the user object containing an attribute 'known', set to False
mattdrayer/api: Fixed NRE corner case for grades leaderboard
mattdrayer/api: Check course average aggregation result before modifying