Conflicts: AUTHORS common/static/js/vendor/ova/OpenSeaDragonAnnotation.js common/test/acceptance/pages/lms/dashboard.py
