Merge branch 'feature/alex/poll-storage-model' of github.com:MITx/mitx into…

Merge branch 'feature/alex/poll-storage-model' of github.com:MITx/mitx into feature/alex/poll-storage-model

common/lib/xmodule/xmodule/js/src/poll/poll_main.js

@@ -53,7 +53,7 @@ PollMain.prototype = {
 
             if (_this.wrapperSectionEl !== null) {
                 $(_this.wrapperSectionEl).find('.xmodule_ConditionalModule').each(function (index, value) {
-                    new window.Conditional(value, _this.id);
+                    new window.Conditional(value, _this.id.replace(/^poll_/, ''));
                 });
             }
         }