Merge pull request #1418 from MITx/feature/ichuang/conditional-xmodule-fix-display

fix bug in conditional - videos were not playing, because a js function changed syntax

common/lib/xmodule/xmodule/js/src/conditional/display.coffee

@@ -18,9 +18,9 @@ class @Conditional
   render: (content) ->
     if content
       @el.html(content)
-      XModule.loadModules('display', @el)
+      XModule.loadModules(@el)
     else
       $.postWithPrefix "#{@url}/conditional_get", (response) =>
         @el.html(response.html)
-        XModule.loadModules('display', @el)
+        XModule.loadModules(@el)