Merge branch 'rc/2014-07-02' into testmergemaster

common/djangoapps/student/models.py

common/djangoapps/student/tests/tests.py

lms/djangoapps/certificates/models.py

lms/djangoapps/certificates/tests/__init__.py

lms/djangoapps/certificates/tests/factories.py

lms/djangoapps/certificates/tests/tests.py

lms/djangoapps/instructor/views/instructor_dashboard.py

lms/urls.py

requirements/edx/github.txt