Merge branch 'release' (after release-2014-05-14).

cms/envs/common.py

common/djangoapps/student/firebase_token_generator.py

common/djangoapps/student/tests/test_token_generator.py

common/djangoapps/student/tests/tests.py

common/djangoapps/student/views.py

common/lib/xmodule/xmodule/annotator_token.py

common/lib/xmodule/xmodule/tests/test_annotator_token.py

common/lib/xmodule/xmodule/tests/test_textannotation.py

common/lib/xmodule/xmodule/tests/test_videoannotation.py

common/lib/xmodule/xmodule/textannotation_module.py

common/lib/xmodule/xmodule/videoannotation_module.py

common/static/js/vendor/ova/annotator-full-firebase-auth.js

lms/djangoapps/notes/views.py

lms/envs/common.py

lms/static/js/staff_debug_actions.js

lms/templates/courseware/instructor_dashboard.html

...ructor/instructor_dashboard_2/instructor_dashboard_2.html

...ates/instructor/instructor_dashboard_2/student_admin.html

lms/templates/notes.html

lms/templates/staff_problem_info.html