rebase-20140926: Fix errors from conflicts resolution

common/djangoapps/user_api/middleware.py

@@ -7,7 +7,7 @@ from eventtracking import tracker
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey
 
-from track.contexts import COURSE_REGEX
+from util.request import COURSE_REGEX
 from user_api.models import UserCourseTag
 
 

lms/envs/common.py

@@ -1399,7 +1399,7 @@ INSTALLED_APPS = (
     'edx_jsme',    # Molecular Structure
 
     # Country list
-    'django_countries'
+    'django_countries',
     
     # EDX API application
     'api_manager',

pavelib/prereqs.py

@@ -116,6 +116,7 @@ def python_prereqs_installation():
     Installs Python prerequisites
     """
     for req_file in PYTHON_REQ_FILES:
+        sh("rm -rf /edx/app/edxapp/venvs/edxapp/build/*")
         sh("pip install -q --exists-action w -r {req_file}".format(req_file=req_file))