Added instructor persmission to _has_access_error_desc() in courseware.access.

TNL-208
rename footer files for wiki
Merge pull request #5252 from edx/adam/fix-wiki-footer

Merging.
Revert "username and email request for lti module"

This reverts commit 3f159ea52bc2bec2de436d25b1c6e61e02c375dd.
Upgrade scipy, lxml, boto
For microsites, since we don't have a footer override yet for django templates, remove the footer all together
Fix tests not using ModuleStoreTestCase

Some tests test were using `CourseFactory` buy not deriving from
`ModuleStoreTestCase`, introducing a course leaks that broke other
unrelated tests.
Modify notification_pref tests to avoid changes to module store

Calling the client root was causing the module store to be modified,
affecting test in other Django applications that rely on the default
state of the module store.
Add edX OAuth2 provider with OpenID Connect support
Merge pull request #5260 from edx/cdodge/remove-edx-footer-for-microsites

For microsites, since we don't have a footer override yet for django tem...
Revert the changes from PR 5152

The changes in 5152 appear to have introduced a
 performance problem on stage, so we're going to
 revert them for now.
Annotation Tools: Adding Try-Catch for anonyous_student_id issue in staging

 - changed message and added i18n
Merge pull request #5263 from rocha/rc-oauth2-provider

Add edX OAuth2 provider with OpenID Connect support
Merge pull request #5267 from lduarte1991/lduarte-harvardx-pr27

Annotation Tools: Adding Try-Catch for anonyous_student_id issue in staging
Merge pull request #5266 from edx/andya/remove-pr-5152

Revert the changes from PR 5152
Upgrade edx-jsme to the latest version.

This fixes a minor layout bug in edx-jsme 1.0. See:
https://github.com/jazkarta/edx-jsme/issues/1

For convenience, the entire diff from the last release is included here:

diff --git a/CHANGES.rst b/CHANGES.rst
new file mode 100644
index 0000000..32e0284
--- /dev/null
+++ b/CHANGES.rst
@@ -0,0 +1,13 @@
+===================
+edX-JSME Change Log
+===================
+
+1.0.1 (2014-09-17)
+------------------
+
+- Fix alignment issue with the correct/incorrect markers. (#1)
+
+1.0 (2014-07-28)
+----------------
+
+- Initial release.
diff --git a/edx_jsme/templates/jsmeinput.html b/edx_jsme/templates/jsmeinput.html
index 861b43f..5ceaf3d 100644
--- a/edx_jsme/templates/jsmeinput.html
+++ b/edx_jsme/templates/jsmeinput.html
@@ -38,6 +38,7 @@
     waitfor=""
     value="${value|h}"/>

+    <br/>
     <p id="answer_${id}" class="answer"></p>

     <p class="status">
Move <HR> inside of template conditional

Otherwise, if `settings.ENABLE_INSTRUCTOR_ANALYTICS` is set to `False`,
two horizontal rules are rendered consecutively.

The <HR> has also been indented to align with surrounding tags.
Merge pull request #5174 from edx/usman/tnl-208-instructor-permissions

Added instructor persmission checking to _has_access_error_desc() in courseware.access
Country and City fields in auth_userprofile

ECOM-128 adds a country dropdown to student registration
Merge pull request #5180 from edx/ahodges/doc/DOC-909

Country and City fields in auth_userprofile