Merge branch 'feature/bk_forum_int' of github.com:MITx/mitx into feature/bk_forum_int

Conflicts:
	requirements.txt

lms/djangoapps/course_wiki/plugins/markdownedx/wiki_plugin.py

@@ -2,12 +2,12 @@
 
 from django.core.urlresolvers import reverse_lazy
 
-from wiki.core import plugins_registry, baseplugin
-import wiki
+from wiki.core.plugins.base import BasePlugin
+from wiki.core.plugins import registry as plugin_registry
 
 from course_wiki.plugins.markdownedx import mdx_circuit, mdx_wikipath, mdx_mathjax, mdx_video
 
-class ExtendMarkdownPlugin(baseplugin.BasePlugin):
+class ExtendMarkdownPlugin(BasePlugin):
     """
     This plugin simply loads all of the markdown extensions we use in edX.
     """
@@ -20,5 +20,5 @@ class ExtendMarkdownPlugin(baseplugin.BasePlugin):
                            mdx_mathjax.MathJaxExtension(configs={}) ,
                            mdx_video.VideoExtension(configs={})]
 
-plugins_registry.register(ExtendMarkdownPlugin)
+plugin_registry.register(ExtendMarkdownPlugin)
 

lms/static/css/course/old/marketing-ie.css

-body {
-  margin: 0;
-  padding: 0; }
-
-.wrapper, .subpage, section.copyright, section.tos, section.privacy-policy, section.honor-code, header.announcement div, section.index-content, footer {
-  margin: 0;
-  overflow: hidden; }
-
-div#enroll form {
-  display: none; }

requirements.txt

@@ -44,6 +44,6 @@ django-ses
 django-storages
 django-threaded-multihost
 django-sekizai<0.7
-git+git://github.com/benjaoming/django-wiki.git@97f8413
-git+git://github.com/dementrock/pystache_custom.git
+-e git://github.com/benjaoming/django-wiki.git@c145596#egg=django-wiki
+-e git://github.com/dementrock/pystache_custom.git#egg=pystache_custom
 -r repo-requirements.txt