Conflicts: common/test/acceptance/tests/video/test_video_times.py
common ------ This directory contains common code shared between LMS and CMS, such as Mako templates, CSS, and Coffescript.
