Merge branch 'leveling'

Conflicts:
	edumed/settings.d/30-apps.py

diff --cc edumed/settings.d/30-apps.py
index f7defa1,ee80ab7..d9eb0e6
--- 1/edumed/settings.d/30-apps.py
--- 2/edumed/settings.d/30-apps.py
+++ b/edumed/settings.d/30-apps.py
@@@ -3,7 -3,7 +3,8 @@@ INSTALLED_APPS = 
      'curriculum',
      'catalogue',
      'comment',
 +    'wtem',
+     'publishers',
  
      'fnpdjango',
      'south',

diff --cc edumed/settings.d/40-middleware.py
Simple merge

diff --cc edumed/settings.d/50-static.py
Simple merge

diff --cc edumed/templates/base_super.html
index 8f2886b,9607254..b3ba9d8
--- 1/edumed/templates/base_super.html
--- 2/edumed/templates/base_super.html
+++ b/edumed/templates/base_super.html
@@@ -96,7 -97,8 +97,7 @@@
          </footer>
  
      <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>
 -    {% compressed_js 'base' %}
      {% block extra_script %}{% endblock %}
-     {{ piwik_tag|safe }}
+     {% tracking_code %}
      </body>
  </html>

diff --cc requirements.txt
Simple merge