mattdrayer/api-points-possible-zero-check: Addressed divide by zero case
Merge pull request #213 from edx-solutions/mattdrayer/api-points-possible-zero-check

mattdrayer/api-points-possible-zero-check: Addressed divide by zero case
mattdrayer/api-points-possible-zero-check: Addressed divide by zero case
Merge remote-tracking branch 'origin/release' into solutions-master
mattdrayer/api-gradebook-generator-fix: Added session dummy to mock
Merge pull request #214 from edx-solutions/mattdrayer/api-gradebook-generator-fix

mattdrayer/api-gradebook-generator-fix: Added session dummy to mock
mattdrayer/api-gradebook-generator-fix: Added session dummy to mock
Merge remote-tracking branch 'origin/release' into solutions-master
mattdrayer/api-test-module-render-fix: Corrected helper logic
Merge pull request #215 from edx-solutions/mattdrayer/api-test-module-render-fix

mattdrayer/api-test-module-render-fix: Corrected helper logic
add unit test to verify password complexity scoring
Merge pull request #216 from edx-solutions/cdodge/add-unit-test-for-password-complexity

add unit test to verify password complexity scoring
ooyala: Update hash
Moved imports to startup.py.

Conflicts:
	cms/startup.py
	lms/startup.py
Merge branch 'release' into master
Merge branch 'ziafazal/api-additional-info-course-metrics' of https://github.com/edx-solutions/edx-platform into ziafazal/api-additional-info-course-metrics