diff --git a/client/oc-client.min.js b/client/oc-client.min.js
index 2fc7407c2..925dfd22a 100644
--- a/client/oc-client.min.js
+++ b/client/oc-client.min.js
@@ -1 +1 @@
-!function(e,n){"use strict";function t(){}function r(e,n){if(e){"object"==typeof e&&(e=[].slice.call(e));for(var t=0,r=e.length;r>t;t++)n.call(e,e[t],t)}}function o(e,t){var r=Object.prototype.toString.call(t).slice(8,-1);return t!==n&&null!==t&&r===e}function a(e){return o("Function",e)}function c(e){return o("Array",e)}function i(e){var n=e.split("/"),t=n[n.length-1],r=t.indexOf("?");return-1!==r?t.substring(0,r):t}function u(e){e=e||t,e._done||(e(),e._done=1)}function d(e,n,r,o){var a="object"==typeof e?e:{test:e,success:n?c(n)?n:[n]:!1,failure:r?c(r)?r:[r]:!1,callback:o||t},i=!!a.test;return i&&a.success?(a.success.push(a.callback),S.load.apply(null,a.success)):!i&&a.failure?(a.failure.push(a.callback),S.load.apply(null,a.failure)):o(),S}function l(e){var n={};if("object"==typeof e)for(var t in e)e[t]&&(n={name:t,url:e[t]});else n={name:i(e),url:e};var r=O[n.name];return r&&r.url===n.url?r:(O[n.name]=n,n)}function f(e){e=e||O;for(var n in e)if(e.hasOwnProperty(n)&&e[n].state!==I)return!1;return!0}function s(e){e.state=k,r(e.onpreload,function(e){e.call()})}function m(e,t){e.state===n&&(e.state=A,e.onpreload=[],g({url:e.url,type:"cache"},function(){s(e)}))}function p(){var e=arguments,n=e[e.length-1],t=[].slice.call(e,1),o=t[0];return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(o?(r(t,function(e){!a(e)&&e&&m(l(e))}),y(l(e[0]),a(o)?o:function(){S.load.apply(null,t)})):y(l(e[0])),S)}function v(){var e=arguments,n=e[e.length-1],t={};return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(r(e,function(e,r){e!==n&&(e=l(e),t[e.name]=e)}),r(e,function(e,r){e!==n&&(e=l(e),y(e,function(){f(t)&&u(n)}))}),S)}function y(e,n){return n=n||t,e.state===I?void n():e.state===_?void S.ready(e.name,n):e.state===A?void e.onpreload.push(function(){y(e,n)}):(e.state=_,void g(e,function(){e.state=I,n(),r(x[e.name],function(e){u(e)}),L&&f()&&r(x.ALL,function(e){u(e)})}))}function h(e){e=e||"";var n=e.split("?")[0].split(".");return n[n.length-1].toLowerCase()}function g(n,r){function o(n){n=n||e.event,i.onload=i.onreadystatechange=i.onerror=null,r()}function a(t){t=t||e.event,("load"===t.type||/loaded|complete/.test(i.readyState)&&(!q.documentMode||q.documentMode<9))&&(e.clearTimeout(n.errorTimeout),e.clearTimeout(n.cssTimeout),i.onload=i.onreadystatechange=i.onerror=null,r())}function c(){if(n.state!==I&&n.cssRetries<=20){for(var t=0,r=q.styleSheets.length;r>t;t++)if(q.styleSheets[t].href===i.href)return void a({type:"load"});n.cssRetries++,n.cssTimeout=e.setTimeout(c,250)}}r=r||t;var i,u=h(n.url);"css"===u?(i=q.createElement("link"),i.type="text/"+(n.type||"css"),i.rel="stylesheet",i.href=n.url,n.cssRetries=0,n.cssTimeout=e.setTimeout(c,500)):(i=q.createElement("script"),i.type="text/"+(n.type||"javascript"),i.src=n.url),i.onload=i.onreadystatechange=a,i.onerror=o,i.async=!1,i.defer=!1,n.errorTimeout=e.setTimeout(function(){o({type:"timeout"})},7e3);var d=q.head||q.getElementsByTagName("head")[0];d.insertBefore(i,d.lastChild)}function j(){for(var e=q.getElementsByTagName("script"),n=0,t=e.length;t>n;n++){var r=e[n].getAttribute("data-headjs-load");if(r)return void S.load(r)}}function b(e,n){if(e===q)return L?u(n):C.push(n),S;if(a(e)&&(n=e,e="ALL"),c(e)){var t={};return r(e,function(e){t[e]=O[e],S.ready(e,function(){f(t)&&u(n)})}),S}if("string"!=typeof e||!a(n))return S;var o=O[e];if(o&&o.state===I||"ALL"===e&&f()&&L)return u(n),S;var i=x[e];return i?i.push(n):i=x[e]=[n],S}function T(){return q.body?void(L||(L=!0,j(),r(C,function(e){u(e)}))):(e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(T,50)))}function E(){q.addEventListener?(q.removeEventListener("DOMContentLoaded",E,!1),T()):"complete"===q.readyState&&(q.detachEvent("onreadystatechange",E),T())}var L,q=e.document,C=[],x={},O={},w="async"in q.createElement("script")||"MozAppearance"in q.documentElement.style||e.opera,M=e.head_conf&&e.head_conf.head||"head",S=e[M]=e[M]||function(){S.ready.apply(null,arguments)},A=1,k=2,_=3,I=4;if("complete"===q.readyState)T();else if(q.addEventListener)q.addEventListener("DOMContentLoaded",E,!1),e.addEventListener("load",T,!1);else{q.attachEvent("onreadystatechange",E),e.attachEvent("onload",T);var U=!1;try{U=!e.frameElement&&q.documentElement}catch(B){}U&&U.doScroll&&!function N(){if(!L){try{U.doScroll("left")}catch(n){return e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(N,50))}T()}}()}S.load=S.js=w?v:p,S.test=d,S.ready=b,S.ready(q,function(){f()&&r(x.ALL,function(e){u(e)}),S.feature&&S.feature("domloaded",!0)})}(window);var oc=oc||{};!function(e,n,t){oc.conf=oc.conf||{},oc.cmd=oc.cmd||[],oc.renderedComponents=oc.renderedComponents||{};var r,o="https://cdnjs.cloudflare.com/ajax/libs/",a=o+"jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js",c=o+"handlebars.js/3.0.1/handlebars.runtime.js",i=o+"jade/1.9.2/runtime.min.js",u=o+"jquery/1.11.2/jquery.min.js",d=oc.conf.retryInterval||5e3,l=oc.conf.retryLimit||30,f=oc.conf.retrySendNumber||!0,s=oc.conf.pollingInterval||500,m=oc.conf.tag||"oc-component",p="baseUrl parameter is required",v="Href parameter missing",y="name parameter is required",h="Failed to load {0} component {1} times. Giving up".replace("{1}",l),g="Error getting compiled view: {0}",j="Error rendering component: {0}, error: {1}",b="Failed to retrieve the component. Retrying in {0} seconds...".replace("{0}",d/1e3),T='Error loading component: view engine "{0}" not supported',E="Loading...",L="Component '{0}' correctly rendered",q="Unrendered component found. Trying to retrieve it...",C=oc.conf.debug||!1,x=function(){},O=t.navigator.userAgent,w=!!O.match(/MSIE 8/),M=!!O.match(/MSIE 9/),S=!1,A=!1,k={},_={error:function(e){return console.log(e)},info:function(e){return C?console.log(e):!1}},I=function(e,n,t){return void 0===k[e]&&(k[e]=l),k[e]<=0?t():(setTimeout(function(){n(l-k[e]+1)},d),void k[e]--)},U=function(e,n){if(e&&n){var t=r.param(n);return e.indexOf("?")>-1?e+"&"+t:e+"?"+t}return e};oc.require=function(n,r,o){"function"==typeof r&&(o=r,r=n,n=void 0),"string"==typeof n&&(n=[n]);var a=function(){var e=t;if("undefined"==typeof n)return!0;for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return!0;return!1},c=function(){var e=t;if("undefined"!=typeof n){for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return;return e}};a()?e.load(r,function(){o(c())}):o(c())};var B=function(e,n,t){n.id=Math.floor(9999999999*Math.random()),e.html(n.html),e.attr("id",n.id),e.attr("data-rendered",!0),e.attr("data-rendering",!1),e.attr("data-version",n.version),n.key&&e.attr("data-hash",n.key),n.name&&(e.attr("data-name",n.name),oc.renderedComponents[n.name]=n.version,oc.events.fire("oc:rendered",n)),t()};oc.build=function(e){if(!e.baseUrl)throw p;if(!e.name)throw y;var n=function(e){return e=e||"","/"!==e.slice(-1)&&(e+="/"),e},t=n(e.baseUrl)+n(e.name);if(e.version&&(t+=n(e.version)),e.parameters){t+="?";for(var r in e.parameters)e.parameters.hasOwnProperty(r)&&(t+=r+"="+e.parameters[r]+"&");t=t.slice(0,-1)}return w?'<div data-oc-component="true" href="'+t+'"></div>':"<"+m+' href="'+t+'"></'+m+">"},oc.events={},oc.ready=function(e){if(S)return e();if(A)oc.cmd.push(e);else{A=!0;var n=function(e){!w&&!M||r.IE_POLYFILL_LOADED?e():oc.require(a,e)},t=function(){S=!0,A=!1,oc.events=function(){var e=r({});return{fire:function(n,t){return e.trigger(n,t)},on:function(n,t){return e.on(n,t||x)},reset:function(){return e.off()}}}(),e(),oc.events.fire("oc:ready",oc);for(var n=0;n<oc.cmd.length;n++)oc.cmd[n](oc);oc.cmd={push:function(e){e(oc)}}};oc.require("jQuery",u,function(e){r=e,n(t)})}},oc.render=function(e,n,t){oc.ready(function(){e.type.match(/jade|handlebars/g)?oc.require(["oc","components",e.key],e.src,function(r){r?"handlebars"===e.type?oc.require("Handlebars",c,function(e){var o=e.template(r,[]);t(null,o(n))}):"jade"===e.type&&oc.require("jade",i,function(e){t(null,r(n))}):t(g.replace("{0}",e.src))}):t(T.replace("{0}",e.type))})},oc.renderNestedComponent=function(e,n){oc.ready(function(){var t=e.attr("data-rendering"),r=e.attr("data-rendered"),o="boolean"==typeof t?t:"true"===t,a="boolean"==typeof r?r:"true"===r;o||a?setTimeout(n,s):(_.info(q),e.attr("data-rendering",!0),e.html('<div class="oc-loading">'+E+"</div>"),oc.renderByHref(e.attr("href"),function(t,r){return t||!r?(_.error(t),n()):void B(e,r,n)}))})},oc.renderByHref=function(e,n,t){var o=t,a=n;"function"==typeof n&&(o=n,a=0),oc.ready(function(){if(""===e)return o(j.replace("{1}",v));var n=e;f&&(n=U(n,{__oc_Retry:a})),r.ajax({url:n,headers:{Accept:"application/vnd.oc.unrendered+json"},contentType:"text/plain",crossDomain:!0,async:!0,success:function(e){if("unrendered"===e.renderMode)oc.render(e.template,e.data,function(n,t){return n?o(j.replace("{0}",e.href).replace("{1}",n)):(_.info(L.replace("{0}",e.template.src)),void o(null,{html:t,key:e.template.key,version:e.version,name:e.name}))});else if("rendered"===e.renderMode){if(_.info(L.replace("{0}",e.href)),0===e.html.indexOf("<"+m)){var n=e.html.slice(e.html.indexOf(">")+1),t=n.slice(0,n.lastIndexOf("<"));e.html=t}o(null,{html:e.html,version:e.version,name:e.name})}},error:function(){_.error(b),I(e,function(n){oc.renderByHref(e,n,o)},function(){o(h.replace("{0}",e))})}})})},oc.renderUnloadedComponents=function(){oc.ready(function(){var e=w?"div[data-oc-component=true]":m,n=r(e+"[data-rendered!=true]"),t=n.length,o=function(e){t--,t||oc.renderUnloadedComponents()};if(t>0)for(var a=0;a<n.length;a++)oc.renderNestedComponent(r(n[a]),o)})},oc.load=function(e,n,t){oc.ready(function(){if("function"!=typeof t&&(t=x),r(e)){r(e).html("<"+m+' href="'+n+'" />');var o=r(m,e);oc.renderNestedComponent(o,function(){t(o)})}})},oc.ready(oc.renderUnloadedComponents)}(head,document,window),oc.clientVersion="0.23.3";
\ No newline at end of file
+!function(e,n){"use strict";function t(){}function r(e,n){if(e){"object"==typeof e&&(e=[].slice.call(e));for(var t=0,r=e.length;r>t;t++)n.call(e,e[t],t)}}function o(e,t){var r=Object.prototype.toString.call(t).slice(8,-1);return t!==n&&null!==t&&r===e}function a(e){return o("Function",e)}function c(e){return o("Array",e)}function i(e){var n=e.split("/"),t=n[n.length-1],r=t.indexOf("?");return-1!==r?t.substring(0,r):t}function u(e){e=e||t,e._done||(e(),e._done=1)}function d(e,n,r,o){var a="object"==typeof e?e:{test:e,success:n?c(n)?n:[n]:!1,failure:r?c(r)?r:[r]:!1,callback:o||t},i=!!a.test;return i&&a.success?(a.success.push(a.callback),S.load.apply(null,a.success)):!i&&a.failure?(a.failure.push(a.callback),S.load.apply(null,a.failure)):o(),S}function l(e){var n={};if("object"==typeof e)for(var t in e)e[t]&&(n={name:t,url:e[t]});else n={name:i(e),url:e};var r=O[n.name];return r&&r.url===n.url?r:(O[n.name]=n,n)}function f(e){e=e||O;for(var n in e)if(e.hasOwnProperty(n)&&e[n].state!==_)return!1;return!0}function s(e){e.state=A,r(e.onpreload,function(e){e.call()})}function m(e,t){e.state===n&&(e.state=$,e.onpreload=[],g({url:e.url,type:"cache"},function(){s(e)}))}function p(){var e=arguments,n=e[e.length-1],t=[].slice.call(e,1),o=t[0];return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(o?(r(t,function(e){!a(e)&&e&&m(l(e))}),y(l(e[0]),a(o)?o:function(){S.load.apply(null,t)})):y(l(e[0])),S)}function v(){var e=arguments,n=e[e.length-1],t={};return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(r(e,function(e,r){e!==n&&(e=l(e),t[e.name]=e)}),r(e,function(e,r){e!==n&&(e=l(e),y(e,function(){f(t)&&u(n)}))}),S)}function y(e,n){return n=n||t,e.state===_?void n():e.state===k?void S.ready(e.name,n):e.state===$?void e.onpreload.push(function(){y(e,n)}):(e.state=k,void g(e,function(){e.state=_,n(),r(x[e.name],function(e){u(e)}),L&&f()&&r(x.ALL,function(e){u(e)})}))}function h(e){e=e||"";var n=e.split("?")[0].split(".");return n[n.length-1].toLowerCase()}function g(n,r){function o(n){n=n||e.event,i.onload=i.onreadystatechange=i.onerror=null,r()}function a(t){t=t||e.event,("load"===t.type||/loaded|complete/.test(i.readyState)&&(!C.documentMode||C.documentMode<9))&&(e.clearTimeout(n.errorTimeout),e.clearTimeout(n.cssTimeout),i.onload=i.onreadystatechange=i.onerror=null,r())}function c(){if(n.state!==_&&n.cssRetries<=20){for(var t=0,r=C.styleSheets.length;r>t;t++)if(C.styleSheets[t].href===i.href)return void a({type:"load"});n.cssRetries++,n.cssTimeout=e.setTimeout(c,250)}}r=r||t;var i,u=h(n.url);"css"===u?(i=C.createElement("link"),i.type="text/"+(n.type||"css"),i.rel="stylesheet",i.href=n.url,n.cssRetries=0,n.cssTimeout=e.setTimeout(c,500)):(i=C.createElement("script"),i.type="text/"+(n.type||"javascript"),i.src=n.url),i.onload=i.onreadystatechange=a,i.onerror=o,i.async=!1,i.defer=!1,n.errorTimeout=e.setTimeout(function(){o({type:"timeout"})},7e3);var d=C.head||C.getElementsByTagName("head")[0];d.insertBefore(i,d.lastChild)}function j(){for(var e=C.getElementsByTagName("script"),n=0,t=e.length;t>n;n++){var r=e[n].getAttribute("data-headjs-load");if(r)return void S.load(r)}}function T(e,n){if(e===C)return L?u(n):q.push(n),S;if(a(e)&&(n=e,e="ALL"),c(e)){var t={};return r(e,function(e){t[e]=O[e],S.ready(e,function(){f(t)&&u(n)})}),S}if("string"!=typeof e||!a(n))return S;var o=O[e];if(o&&o.state===_||"ALL"===e&&f()&&L)return u(n),S;var i=x[e];return i?i.push(n):i=x[e]=[n],S}function b(){return C.body?void(L||(L=!0,j(),r(q,function(e){u(e)}))):(e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(b,50)))}function E(){C.addEventListener?(C.removeEventListener("DOMContentLoaded",E,!1),b()):"complete"===C.readyState&&(C.detachEvent("onreadystatechange",E),b())}var L,C=e.document,q=[],x={},O={},w="async"in C.createElement("script")||"MozAppearance"in C.documentElement.style||e.opera,M=e.head_conf&&e.head_conf.head||"head",S=e[M]=e[M]||function(){S.ready.apply(null,arguments)},$=1,A=2,k=3,_=4;if("complete"===C.readyState)b();else if(C.addEventListener)C.addEventListener("DOMContentLoaded",E,!1),e.addEventListener("load",b,!1);else{C.attachEvent("onreadystatechange",E),e.attachEvent("onload",b);var I=!1;try{I=!e.frameElement&&C.documentElement}catch(U){}I&&I.doScroll&&!function B(){if(!L){try{I.doScroll("left")}catch(n){return e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(B,50))}b()}}()}S.load=S.js=w?v:p,S.test=d,S.ready=T,S.ready(C,function(){f()&&r(x.ALL,function(e){u(e)}),S.feature&&S.feature("domloaded",!0)})}(window);var oc=oc||{};!function(e,n,t){oc.conf=oc.conf||{},oc.cmd=oc.cmd||[],oc.renderedComponents=oc.renderedComponents||{},oc.$=void 0;var r="https://cdnjs.cloudflare.com/ajax/libs/",o=r+"jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js",a=r+"handlebars.js/3.0.1/handlebars.runtime.js",c=r+"jade/1.9.2/runtime.min.js",i=r+"jquery/1.11.2/jquery.min.js",u=oc.conf.retryInterval||5e3,d=oc.conf.retryLimit||30,l=oc.conf.retrySendNumber||!0,f=oc.conf.pollingInterval||500,s=oc.conf.tag||"oc-component",m="baseUrl parameter is required",p="Href parameter missing",v="name parameter is required",y="Failed to load {0} component {1} times. Giving up".replace("{1}",d),h="Error getting compiled view: {0}",g="Error rendering component: {0}, error: {1}",j="Failed to retrieve the component. Retrying in {0} seconds...".replace("{0}",u/1e3),T='Error loading component: view engine "{0}" not supported',b="Loading...",E="Component '{0}' correctly rendered",L="Unrendered component found. Trying to retrieve it...",C=oc.conf.debug||!1,q=function(){},x=t.navigator.userAgent,O=!!x.match(/MSIE 8/),w=!!x.match(/MSIE 9/),M=!1,S=!1,$={},A=function(e){return"boolean"==typeof e},k={error:function(e){return console.log(e)},info:function(e){return C?console.log(e):!1}},_=function(e,n,t){return void 0===$[e]&&($[e]=d),$[e]<=0?t():(setTimeout(function(){n(d-$[e]+1)},u),void $[e]--)},I=function(e,n){if(e&&n){var t=oc.$.param(n);return e.indexOf("?")>-1?e+"&"+t:e+"?"+t}return e};oc.require=function(n,r,o){"function"==typeof r&&(o=r,r=n,n=void 0),"string"==typeof n&&(n=[n]);var a=function(){var e=t;if("undefined"==typeof n)return!0;for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return!0;return!1},c=function(){var e=t;if("undefined"!=typeof n){for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return;return e}};a()?e.load(r,function(){o(c())}):o(c())};var U=function(e,n,t){n.id=Math.floor(9999999999*Math.random()),e.html(n.html),e.attr("id",n.id),e.attr("data-rendered",!0),e.attr("data-rendering",!1),e.attr("data-version",n.version),n.key&&e.attr("data-hash",n.key),n.name&&(e.attr("data-name",n.name),oc.renderedComponents[n.name]=n.version,oc.events.fire("oc:rendered",n)),t()};oc.build=function(e){if(!e.baseUrl)throw m;if(!e.name)throw v;var n=function(e){return e=e||"","/"!==e.slice(-1)&&(e+="/"),e},t=n(e.baseUrl)+n(e.name);if(e.version&&(t+=n(e.version)),e.parameters){t+="?";for(var r in e.parameters)e.parameters.hasOwnProperty(r)&&(t+=r+"="+e.parameters[r]+"&");t=t.slice(0,-1)}return O?'<div data-oc-component="true" href="'+t+'"></div>':"<"+s+' href="'+t+'"></'+s+">"},oc.events={},oc.ready=function(e){if(M)return e();if(S)oc.cmd.push(e);else{S=!0;var n=function(e){!O&&!w||oc.$.IE_POLYFILL_LOADED?e():oc.require(o,e)},t=function(){M=!0,S=!1,oc.events=function(){var e=oc.$({});return{fire:function(n,t){return e.trigger(n,t)},on:function(n,t){return e.on(n,t||q)},reset:function(){return e.off()}}}(),e(),oc.events.fire("oc:ready",oc);for(var n=0;n<oc.cmd.length;n++)oc.cmd[n](oc);oc.cmd={push:function(e){e(oc)}}};oc.require("jQuery",i,function(e){oc.$=e.noConflict(!0),n(t)})}},oc.render=function(e,n,t){oc.ready(function(){e.type.match(/jade|handlebars/g)?oc.require(["oc","components",e.key],e.src,function(r){r?"handlebars"===e.type?oc.require("Handlebars",a,function(e){var o=e.template(r,[]);t(null,o(n))}):"jade"===e.type&&oc.require("jade",c,function(e){t(null,r(n))}):t(h.replace("{0}",e.src))}):t(T.replace("{0}",e.type))})},oc.renderNestedComponent=function(e,n){oc.ready(function(){var t=e.attr("data-rendering"),r=e.attr("data-rendered"),o=A(t)?t:"true"===t,a=A(r)?r:"true"===r;o||a?setTimeout(n,f):(k.info(L),e.attr("data-rendering",!0),e.html('<div class="oc-loading">'+b+"</div>"),oc.renderByHref(e.attr("href"),function(t,r){return t||!r?(k.error(t),n()):void U(e,r,n)}))})},oc.renderByHref=function(e,n,t){var r=t,o=n;"function"==typeof n&&(r=n,o=0),oc.ready(function(){if(""===e)return r(g.replace("{1}",p));var n=e;l&&(n=I(n,{__oc_Retry:o})),oc.$.ajax({url:n,headers:{Accept:"application/vnd.oc.unrendered+json"},contentType:"text/plain",crossDomain:!0,async:!0,success:function(e){if("unrendered"===e.renderMode)oc.render(e.template,e.data,function(n,t){return n?r(g.replace("{0}",e.href).replace("{1}",n)):(k.info(E.replace("{0}",e.template.src)),void r(null,{html:t,key:e.template.key,version:e.version,name:e.name}))});else if("rendered"===e.renderMode){if(k.info(E.replace("{0}",e.href)),0===e.html.indexOf("<"+s)){var n=e.html.slice(e.html.indexOf(">")+1),t=n.slice(0,n.lastIndexOf("<"));e.html=t}r(null,{html:e.html,version:e.version,name:e.name})}},error:function(){k.error(j),_(e,function(n){oc.renderByHref(e,n,r)},function(){r(y.replace("{0}",e))})}})})},oc.renderUnloadedComponents=function(){oc.ready(function(){var e=O?"div[data-oc-component=true]":s,n=oc.$(e+"[data-rendered!=true]"),t=n.length,r=function(e){t--,t||oc.renderUnloadedComponents()};if(t>0)for(var o=0;o<n.length;o++)oc.renderNestedComponent(oc.$(n[o]),r)})},oc.load=function(e,n,t){oc.ready(function(){if("function"!=typeof t&&(t=q),oc.$(e)){oc.$(e).html("<"+s+' href="'+n+'" />');var r=oc.$(s,e);oc.renderNestedComponent(r,function(){t(r)})}})},oc.ready(oc.renderUnloadedComponents)}(head,document,window),oc.clientVersion="0.23.3";
\ No newline at end of file
diff --git a/components/oc-client/_package/package.json b/components/oc-client/_package/package.json
index 6c7598897..d0e3906e0 100644
--- a/components/oc-client/_package/package.json
+++ b/components/oc-client/_package/package.json
@@ -1 +1 @@
-{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.23.3","repository":"https://github.com/opentable/oc/tree/master/components/oc-client","oc":{"parameters":{},"files":{"template":{"type":"handlebars","hashKey":"bb774de6a2b7280c2b66103bd36d7e708a1b7541","src":"template.js"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"ffb0e43eaf72f55fa13dc1e7262019c14c3dfc81","src":"server.js"}},"version":"0.23.3","packaged":true,"date":1453131092939}}
+{"name":"oc-client","description":"The OpenComponents client-side javascript client","version":"0.23.3","repository":"https://github.com/opentable/oc/tree/master/components/oc-client","oc":{"parameters":{},"files":{"template":{"type":"handlebars","hashKey":"bb774de6a2b7280c2b66103bd36d7e708a1b7541","src":"template.js"},"static":["src"],"dataProvider":{"type":"node.js","hashKey":"ffb0e43eaf72f55fa13dc1e7262019c14c3dfc81","src":"server.js"}},"version":"0.23.3","packaged":true,"date":1453225620929}}
diff --git a/components/oc-client/_package/src/oc-client.js b/components/oc-client/_package/src/oc-client.js
index 04dfedc68..f55bc2ac9 100644
--- a/components/oc-client/_package/src/oc-client.js
+++ b/components/oc-client/_package/src/oc-client.js
@@ -1 +1 @@
-"use strict";var oc=oc||{};!function(e,n,r){oc.conf=oc.conf||{},oc.cmd=oc.cmd||[],oc.renderedComponents=oc.renderedComponents||{};var o,t="https://cdnjs.cloudflare.com/ajax/libs/",c=t+"jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js",a=t+"handlebars.js/3.0.1/handlebars.runtime.js",i=t+"jade/1.9.2/runtime.min.js",d=t+"jquery/1.11.2/jquery.min.js",u=oc.conf.retryInterval||5e3,f=oc.conf.retryLimit||30,s=oc.conf.retrySendNumber||!0,l=oc.conf.pollingInterval||500,m=oc.conf.tag||"oc-component",p="baseUrl parameter is required",v="Href parameter missing",y="name parameter is required",h="Failed to load {0} component {1} times. Giving up".replace("{1}",f),g="Error getting compiled view: {0}",j="Error rendering component: {0}, error: {1}",b="Failed to retrieve the component. Retrying in {0} seconds...".replace("{0}",u/1e3),q='Error loading component: view engine "{0}" not supported',x="Loading...",C="Component '{0}' correctly rendered",w="Unrendered component found. Trying to retrieve it...",E=oc.conf.debug||!1,I=function(){},O=r.navigator.userAgent,U=!!O.match(/MSIE 8/),L=!!O.match(/MSIE 9/),M=!1,k=!1,H={},_={error:function(e){return console.log(e)},info:function(e){return E?console.log(e):!1}},N=function(e,n,r){return void 0===H[e]&&(H[e]=f),H[e]<=0?r():(setTimeout(function(){n(f-H[e]+1)},u),void H[e]--)},T=function(e,n){if(e&&n){var r=o.param(n);return e.indexOf("?")>-1?e+"&"+r:e+"?"+r}return e};oc.require=function(n,o,t){"function"==typeof o&&(t=o,o=n,n=void 0),"string"==typeof n&&(n=[n]);var c=function(){var e=r;if("undefined"==typeof n)return!0;for(var o=0;o<n.length;o++)if(e=e[n[o]],!e)return!0;return!1},a=function(){var e=r;if("undefined"!=typeof n){for(var o=0;o<n.length;o++)if(e=e[n[o]],!e)return;return e}};c()?e.load(o,function(){t(a())}):t(a())};var A=function(e,n,r){n.id=Math.floor(9999999999*Math.random()),e.html(n.html),e.attr("id",n.id),e.attr("data-rendered",!0),e.attr("data-rendering",!1),e.attr("data-version",n.version),n.key&&e.attr("data-hash",n.key),n.name&&(e.attr("data-name",n.name),oc.renderedComponents[n.name]=n.version,oc.events.fire("oc:rendered",n)),r()};oc.build=function(e){if(!e.baseUrl)throw p;if(!e.name)throw y;var n=function(e){return e=e||"","/"!==e.slice(-1)&&(e+="/"),e},r=n(e.baseUrl)+n(e.name);if(e.version&&(r+=n(e.version)),e.parameters){r+="?";for(var o in e.parameters)e.parameters.hasOwnProperty(o)&&(r+=o+"="+e.parameters[o]+"&");r=r.slice(0,-1)}return U?'<div data-oc-component="true" href="'+r+'"></div>':"<"+m+' href="'+r+'"></'+m+">"},oc.events={},oc.ready=function(e){if(M)return e();if(k)oc.cmd.push(e);else{k=!0;var n=function(e){!U&&!L||o.IE_POLYFILL_LOADED?e():oc.require(c,e)},r=function(){M=!0,k=!1,oc.events=function(){var e=o({});return{fire:function(n,r){return e.trigger(n,r)},on:function(n,r){return e.on(n,r||I)},reset:function(){return e.off()}}}(),e(),oc.events.fire("oc:ready",oc);for(var n=0;n<oc.cmd.length;n++)oc.cmd[n](oc);oc.cmd={push:function(e){e(oc)}}};oc.require("jQuery",d,function(e){o=e,n(r)})}},oc.render=function(e,n,r){oc.ready(function(){e.type.match(/jade|handlebars/g)?oc.require(["oc","components",e.key],e.src,function(o){o?"handlebars"===e.type?oc.require("Handlebars",a,function(e){var t=e.template(o,[]);r(null,t(n))}):"jade"===e.type&&oc.require("jade",i,function(e){r(null,o(n))}):r(g.replace("{0}",e.src))}):r(q.replace("{0}",e.type))})},oc.renderNestedComponent=function(e,n){oc.ready(function(){var r=e.attr("data-rendering"),o=e.attr("data-rendered"),t="boolean"==typeof r?r:"true"===r,c="boolean"==typeof o?o:"true"===o;t||c?setTimeout(n,l):(_.info(w),e.attr("data-rendering",!0),e.html('<div class="oc-loading">'+x+"</div>"),oc.renderByHref(e.attr("href"),function(r,o){return r||!o?(_.error(r),n()):void A(e,o,n)}))})},oc.renderByHref=function(e,n,r){var t=r,c=n;"function"==typeof n&&(t=n,c=0),oc.ready(function(){if(""===e)return t(j.replace("{1}",v));var n=e;s&&(n=T(n,{__oc_Retry:c})),o.ajax({url:n,headers:{Accept:"application/vnd.oc.unrendered+json"},contentType:"text/plain",crossDomain:!0,async:!0,success:function(e){if("unrendered"===e.renderMode)oc.render(e.template,e.data,function(n,r){return n?t(j.replace("{0}",e.href).replace("{1}",n)):(_.info(C.replace("{0}",e.template.src)),void t(null,{html:r,key:e.template.key,version:e.version,name:e.name}))});else if("rendered"===e.renderMode){if(_.info(C.replace("{0}",e.href)),0===e.html.indexOf("<"+m)){var n=e.html.slice(e.html.indexOf(">")+1),r=n.slice(0,n.lastIndexOf("<"));e.html=r}t(null,{html:e.html,version:e.version,name:e.name})}},error:function(){_.error(b),N(e,function(n){oc.renderByHref(e,n,t)},function(){t(h.replace("{0}",e))})}})})},oc.renderUnloadedComponents=function(){oc.ready(function(){var e=U?"div[data-oc-component=true]":m,n=o(e+"[data-rendered!=true]"),r=n.length,t=function(e){r--,r||oc.renderUnloadedComponents()};if(r>0)for(var c=0;c<n.length;c++)oc.renderNestedComponent(o(n[c]),t)})},oc.load=function(e,n,r){oc.ready(function(){if("function"!=typeof r&&(r=I),o(e)){o(e).html("<"+m+' href="'+n+'" />');var t=o(m,e);oc.renderNestedComponent(t,function(){r(t)})}})},oc.ready(oc.renderUnloadedComponents)}(head,document,window);
\ No newline at end of file
+"use strict";var oc=oc||{};!function(e,n,r){oc.conf=oc.conf||{},oc.cmd=oc.cmd||[],oc.renderedComponents=oc.renderedComponents||{},oc.$=void 0;var o="https://cdnjs.cloudflare.com/ajax/libs/",t=o+"jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js",c=o+"handlebars.js/3.0.1/handlebars.runtime.js",a=o+"jade/1.9.2/runtime.min.js",i=o+"jquery/1.11.2/jquery.min.js",d=oc.conf.retryInterval||5e3,u=oc.conf.retryLimit||30,f=oc.conf.retrySendNumber||!0,s=oc.conf.pollingInterval||500,l=oc.conf.tag||"oc-component",m="baseUrl parameter is required",p="Href parameter missing",v="name parameter is required",h="Failed to load {0} component {1} times. Giving up".replace("{1}",u),y="Error getting compiled view: {0}",g="Error rendering component: {0}, error: {1}",j="Failed to retrieve the component. Retrying in {0} seconds...".replace("{0}",d/1e3),q='Error loading component: view engine "{0}" not supported',b="Loading...",C="Component '{0}' correctly rendered",$="Unrendered component found. Trying to retrieve it...",x=oc.conf.debug||!1,w=function(){},E=r.navigator.userAgent,I=!!E.match(/MSIE 8/),O=!!E.match(/MSIE 9/),U=!1,L=!1,M={},k=function(e){return"boolean"==typeof e},H={error:function(e){return console.log(e)},info:function(e){return x?console.log(e):!1}},_=function(e,n,r){return void 0===M[e]&&(M[e]=u),M[e]<=0?r():(setTimeout(function(){n(u-M[e]+1)},d),void M[e]--)},N=function(e,n){if(e&&n){var r=oc.$.param(n);return e.indexOf("?")>-1?e+"&"+r:e+"?"+r}return e};oc.require=function(n,o,t){"function"==typeof o&&(t=o,o=n,n=void 0),"string"==typeof n&&(n=[n]);var c=function(){var e=r;if("undefined"==typeof n)return!0;for(var o=0;o<n.length;o++)if(e=e[n[o]],!e)return!0;return!1},a=function(){var e=r;if("undefined"!=typeof n){for(var o=0;o<n.length;o++)if(e=e[n[o]],!e)return;return e}};c()?e.load(o,function(){t(a())}):t(a())};var T=function(e,n,r){n.id=Math.floor(9999999999*Math.random()),e.html(n.html),e.attr("id",n.id),e.attr("data-rendered",!0),e.attr("data-rendering",!1),e.attr("data-version",n.version),n.key&&e.attr("data-hash",n.key),n.name&&(e.attr("data-name",n.name),oc.renderedComponents[n.name]=n.version,oc.events.fire("oc:rendered",n)),r()};oc.build=function(e){if(!e.baseUrl)throw m;if(!e.name)throw v;var n=function(e){return e=e||"","/"!==e.slice(-1)&&(e+="/"),e},r=n(e.baseUrl)+n(e.name);if(e.version&&(r+=n(e.version)),e.parameters){r+="?";for(var o in e.parameters)e.parameters.hasOwnProperty(o)&&(r+=o+"="+e.parameters[o]+"&");r=r.slice(0,-1)}return I?'<div data-oc-component="true" href="'+r+'"></div>':"<"+l+' href="'+r+'"></'+l+">"},oc.events={},oc.ready=function(e){if(U)return e();if(L)oc.cmd.push(e);else{L=!0;var n=function(e){!I&&!O||oc.$.IE_POLYFILL_LOADED?e():oc.require(t,e)},r=function(){U=!0,L=!1,oc.events=function(){var e=oc.$({});return{fire:function(n,r){return e.trigger(n,r)},on:function(n,r){return e.on(n,r||w)},reset:function(){return e.off()}}}(),e(),oc.events.fire("oc:ready",oc);for(var n=0;n<oc.cmd.length;n++)oc.cmd[n](oc);oc.cmd={push:function(e){e(oc)}}};oc.require("jQuery",i,function(e){oc.$=e.noConflict(!0),n(r)})}},oc.render=function(e,n,r){oc.ready(function(){e.type.match(/jade|handlebars/g)?oc.require(["oc","components",e.key],e.src,function(o){o?"handlebars"===e.type?oc.require("Handlebars",c,function(e){var t=e.template(o,[]);r(null,t(n))}):"jade"===e.type&&oc.require("jade",a,function(e){r(null,o(n))}):r(y.replace("{0}",e.src))}):r(q.replace("{0}",e.type))})},oc.renderNestedComponent=function(e,n){oc.ready(function(){var r=e.attr("data-rendering"),o=e.attr("data-rendered"),t=k(r)?r:"true"===r,c=k(o)?o:"true"===o;t||c?setTimeout(n,s):(H.info($),e.attr("data-rendering",!0),e.html('<div class="oc-loading">'+b+"</div>"),oc.renderByHref(e.attr("href"),function(r,o){return r||!o?(H.error(r),n()):void T(e,o,n)}))})},oc.renderByHref=function(e,n,r){var o=r,t=n;"function"==typeof n&&(o=n,t=0),oc.ready(function(){if(""===e)return o(g.replace("{1}",p));var n=e;f&&(n=N(n,{__oc_Retry:t})),oc.$.ajax({url:n,headers:{Accept:"application/vnd.oc.unrendered+json"},contentType:"text/plain",crossDomain:!0,async:!0,success:function(e){if("unrendered"===e.renderMode)oc.render(e.template,e.data,function(n,r){return n?o(g.replace("{0}",e.href).replace("{1}",n)):(H.info(C.replace("{0}",e.template.src)),void o(null,{html:r,key:e.template.key,version:e.version,name:e.name}))});else if("rendered"===e.renderMode){if(H.info(C.replace("{0}",e.href)),0===e.html.indexOf("<"+l)){var n=e.html.slice(e.html.indexOf(">")+1),r=n.slice(0,n.lastIndexOf("<"));e.html=r}o(null,{html:e.html,version:e.version,name:e.name})}},error:function(){H.error(j),_(e,function(n){oc.renderByHref(e,n,o)},function(){o(h.replace("{0}",e))})}})})},oc.renderUnloadedComponents=function(){oc.ready(function(){var e=I?"div[data-oc-component=true]":l,n=oc.$(e+"[data-rendered!=true]"),r=n.length,o=function(e){r--,r||oc.renderUnloadedComponents()};if(r>0)for(var t=0;t<n.length;t++)oc.renderNestedComponent(oc.$(n[t]),o)})},oc.load=function(e,n,r){oc.ready(function(){if("function"!=typeof r&&(r=w),oc.$(e)){oc.$(e).html("<"+l+' href="'+n+'" />');var o=oc.$(l,e);oc.renderNestedComponent(o,function(){r(o)})}})},oc.ready(oc.renderUnloadedComponents)}(head,document,window);
\ No newline at end of file
diff --git a/components/oc-client/_package/src/oc-client.min.js b/components/oc-client/_package/src/oc-client.min.js
index 2fc7407c2..925dfd22a 100644
--- a/components/oc-client/_package/src/oc-client.min.js
+++ b/components/oc-client/_package/src/oc-client.min.js
@@ -1 +1 @@
-!function(e,n){"use strict";function t(){}function r(e,n){if(e){"object"==typeof e&&(e=[].slice.call(e));for(var t=0,r=e.length;r>t;t++)n.call(e,e[t],t)}}function o(e,t){var r=Object.prototype.toString.call(t).slice(8,-1);return t!==n&&null!==t&&r===e}function a(e){return o("Function",e)}function c(e){return o("Array",e)}function i(e){var n=e.split("/"),t=n[n.length-1],r=t.indexOf("?");return-1!==r?t.substring(0,r):t}function u(e){e=e||t,e._done||(e(),e._done=1)}function d(e,n,r,o){var a="object"==typeof e?e:{test:e,success:n?c(n)?n:[n]:!1,failure:r?c(r)?r:[r]:!1,callback:o||t},i=!!a.test;return i&&a.success?(a.success.push(a.callback),S.load.apply(null,a.success)):!i&&a.failure?(a.failure.push(a.callback),S.load.apply(null,a.failure)):o(),S}function l(e){var n={};if("object"==typeof e)for(var t in e)e[t]&&(n={name:t,url:e[t]});else n={name:i(e),url:e};var r=O[n.name];return r&&r.url===n.url?r:(O[n.name]=n,n)}function f(e){e=e||O;for(var n in e)if(e.hasOwnProperty(n)&&e[n].state!==I)return!1;return!0}function s(e){e.state=k,r(e.onpreload,function(e){e.call()})}function m(e,t){e.state===n&&(e.state=A,e.onpreload=[],g({url:e.url,type:"cache"},function(){s(e)}))}function p(){var e=arguments,n=e[e.length-1],t=[].slice.call(e,1),o=t[0];return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(o?(r(t,function(e){!a(e)&&e&&m(l(e))}),y(l(e[0]),a(o)?o:function(){S.load.apply(null,t)})):y(l(e[0])),S)}function v(){var e=arguments,n=e[e.length-1],t={};return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(r(e,function(e,r){e!==n&&(e=l(e),t[e.name]=e)}),r(e,function(e,r){e!==n&&(e=l(e),y(e,function(){f(t)&&u(n)}))}),S)}function y(e,n){return n=n||t,e.state===I?void n():e.state===_?void S.ready(e.name,n):e.state===A?void e.onpreload.push(function(){y(e,n)}):(e.state=_,void g(e,function(){e.state=I,n(),r(x[e.name],function(e){u(e)}),L&&f()&&r(x.ALL,function(e){u(e)})}))}function h(e){e=e||"";var n=e.split("?")[0].split(".");return n[n.length-1].toLowerCase()}function g(n,r){function o(n){n=n||e.event,i.onload=i.onreadystatechange=i.onerror=null,r()}function a(t){t=t||e.event,("load"===t.type||/loaded|complete/.test(i.readyState)&&(!q.documentMode||q.documentMode<9))&&(e.clearTimeout(n.errorTimeout),e.clearTimeout(n.cssTimeout),i.onload=i.onreadystatechange=i.onerror=null,r())}function c(){if(n.state!==I&&n.cssRetries<=20){for(var t=0,r=q.styleSheets.length;r>t;t++)if(q.styleSheets[t].href===i.href)return void a({type:"load"});n.cssRetries++,n.cssTimeout=e.setTimeout(c,250)}}r=r||t;var i,u=h(n.url);"css"===u?(i=q.createElement("link"),i.type="text/"+(n.type||"css"),i.rel="stylesheet",i.href=n.url,n.cssRetries=0,n.cssTimeout=e.setTimeout(c,500)):(i=q.createElement("script"),i.type="text/"+(n.type||"javascript"),i.src=n.url),i.onload=i.onreadystatechange=a,i.onerror=o,i.async=!1,i.defer=!1,n.errorTimeout=e.setTimeout(function(){o({type:"timeout"})},7e3);var d=q.head||q.getElementsByTagName("head")[0];d.insertBefore(i,d.lastChild)}function j(){for(var e=q.getElementsByTagName("script"),n=0,t=e.length;t>n;n++){var r=e[n].getAttribute("data-headjs-load");if(r)return void S.load(r)}}function b(e,n){if(e===q)return L?u(n):C.push(n),S;if(a(e)&&(n=e,e="ALL"),c(e)){var t={};return r(e,function(e){t[e]=O[e],S.ready(e,function(){f(t)&&u(n)})}),S}if("string"!=typeof e||!a(n))return S;var o=O[e];if(o&&o.state===I||"ALL"===e&&f()&&L)return u(n),S;var i=x[e];return i?i.push(n):i=x[e]=[n],S}function T(){return q.body?void(L||(L=!0,j(),r(C,function(e){u(e)}))):(e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(T,50)))}function E(){q.addEventListener?(q.removeEventListener("DOMContentLoaded",E,!1),T()):"complete"===q.readyState&&(q.detachEvent("onreadystatechange",E),T())}var L,q=e.document,C=[],x={},O={},w="async"in q.createElement("script")||"MozAppearance"in q.documentElement.style||e.opera,M=e.head_conf&&e.head_conf.head||"head",S=e[M]=e[M]||function(){S.ready.apply(null,arguments)},A=1,k=2,_=3,I=4;if("complete"===q.readyState)T();else if(q.addEventListener)q.addEventListener("DOMContentLoaded",E,!1),e.addEventListener("load",T,!1);else{q.attachEvent("onreadystatechange",E),e.attachEvent("onload",T);var U=!1;try{U=!e.frameElement&&q.documentElement}catch(B){}U&&U.doScroll&&!function N(){if(!L){try{U.doScroll("left")}catch(n){return e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(N,50))}T()}}()}S.load=S.js=w?v:p,S.test=d,S.ready=b,S.ready(q,function(){f()&&r(x.ALL,function(e){u(e)}),S.feature&&S.feature("domloaded",!0)})}(window);var oc=oc||{};!function(e,n,t){oc.conf=oc.conf||{},oc.cmd=oc.cmd||[],oc.renderedComponents=oc.renderedComponents||{};var r,o="https://cdnjs.cloudflare.com/ajax/libs/",a=o+"jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js",c=o+"handlebars.js/3.0.1/handlebars.runtime.js",i=o+"jade/1.9.2/runtime.min.js",u=o+"jquery/1.11.2/jquery.min.js",d=oc.conf.retryInterval||5e3,l=oc.conf.retryLimit||30,f=oc.conf.retrySendNumber||!0,s=oc.conf.pollingInterval||500,m=oc.conf.tag||"oc-component",p="baseUrl parameter is required",v="Href parameter missing",y="name parameter is required",h="Failed to load {0} component {1} times. Giving up".replace("{1}",l),g="Error getting compiled view: {0}",j="Error rendering component: {0}, error: {1}",b="Failed to retrieve the component. Retrying in {0} seconds...".replace("{0}",d/1e3),T='Error loading component: view engine "{0}" not supported',E="Loading...",L="Component '{0}' correctly rendered",q="Unrendered component found. Trying to retrieve it...",C=oc.conf.debug||!1,x=function(){},O=t.navigator.userAgent,w=!!O.match(/MSIE 8/),M=!!O.match(/MSIE 9/),S=!1,A=!1,k={},_={error:function(e){return console.log(e)},info:function(e){return C?console.log(e):!1}},I=function(e,n,t){return void 0===k[e]&&(k[e]=l),k[e]<=0?t():(setTimeout(function(){n(l-k[e]+1)},d),void k[e]--)},U=function(e,n){if(e&&n){var t=r.param(n);return e.indexOf("?")>-1?e+"&"+t:e+"?"+t}return e};oc.require=function(n,r,o){"function"==typeof r&&(o=r,r=n,n=void 0),"string"==typeof n&&(n=[n]);var a=function(){var e=t;if("undefined"==typeof n)return!0;for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return!0;return!1},c=function(){var e=t;if("undefined"!=typeof n){for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return;return e}};a()?e.load(r,function(){o(c())}):o(c())};var B=function(e,n,t){n.id=Math.floor(9999999999*Math.random()),e.html(n.html),e.attr("id",n.id),e.attr("data-rendered",!0),e.attr("data-rendering",!1),e.attr("data-version",n.version),n.key&&e.attr("data-hash",n.key),n.name&&(e.attr("data-name",n.name),oc.renderedComponents[n.name]=n.version,oc.events.fire("oc:rendered",n)),t()};oc.build=function(e){if(!e.baseUrl)throw p;if(!e.name)throw y;var n=function(e){return e=e||"","/"!==e.slice(-1)&&(e+="/"),e},t=n(e.baseUrl)+n(e.name);if(e.version&&(t+=n(e.version)),e.parameters){t+="?";for(var r in e.parameters)e.parameters.hasOwnProperty(r)&&(t+=r+"="+e.parameters[r]+"&");t=t.slice(0,-1)}return w?'<div data-oc-component="true" href="'+t+'"></div>':"<"+m+' href="'+t+'"></'+m+">"},oc.events={},oc.ready=function(e){if(S)return e();if(A)oc.cmd.push(e);else{A=!0;var n=function(e){!w&&!M||r.IE_POLYFILL_LOADED?e():oc.require(a,e)},t=function(){S=!0,A=!1,oc.events=function(){var e=r({});return{fire:function(n,t){return e.trigger(n,t)},on:function(n,t){return e.on(n,t||x)},reset:function(){return e.off()}}}(),e(),oc.events.fire("oc:ready",oc);for(var n=0;n<oc.cmd.length;n++)oc.cmd[n](oc);oc.cmd={push:function(e){e(oc)}}};oc.require("jQuery",u,function(e){r=e,n(t)})}},oc.render=function(e,n,t){oc.ready(function(){e.type.match(/jade|handlebars/g)?oc.require(["oc","components",e.key],e.src,function(r){r?"handlebars"===e.type?oc.require("Handlebars",c,function(e){var o=e.template(r,[]);t(null,o(n))}):"jade"===e.type&&oc.require("jade",i,function(e){t(null,r(n))}):t(g.replace("{0}",e.src))}):t(T.replace("{0}",e.type))})},oc.renderNestedComponent=function(e,n){oc.ready(function(){var t=e.attr("data-rendering"),r=e.attr("data-rendered"),o="boolean"==typeof t?t:"true"===t,a="boolean"==typeof r?r:"true"===r;o||a?setTimeout(n,s):(_.info(q),e.attr("data-rendering",!0),e.html('<div class="oc-loading">'+E+"</div>"),oc.renderByHref(e.attr("href"),function(t,r){return t||!r?(_.error(t),n()):void B(e,r,n)}))})},oc.renderByHref=function(e,n,t){var o=t,a=n;"function"==typeof n&&(o=n,a=0),oc.ready(function(){if(""===e)return o(j.replace("{1}",v));var n=e;f&&(n=U(n,{__oc_Retry:a})),r.ajax({url:n,headers:{Accept:"application/vnd.oc.unrendered+json"},contentType:"text/plain",crossDomain:!0,async:!0,success:function(e){if("unrendered"===e.renderMode)oc.render(e.template,e.data,function(n,t){return n?o(j.replace("{0}",e.href).replace("{1}",n)):(_.info(L.replace("{0}",e.template.src)),void o(null,{html:t,key:e.template.key,version:e.version,name:e.name}))});else if("rendered"===e.renderMode){if(_.info(L.replace("{0}",e.href)),0===e.html.indexOf("<"+m)){var n=e.html.slice(e.html.indexOf(">")+1),t=n.slice(0,n.lastIndexOf("<"));e.html=t}o(null,{html:e.html,version:e.version,name:e.name})}},error:function(){_.error(b),I(e,function(n){oc.renderByHref(e,n,o)},function(){o(h.replace("{0}",e))})}})})},oc.renderUnloadedComponents=function(){oc.ready(function(){var e=w?"div[data-oc-component=true]":m,n=r(e+"[data-rendered!=true]"),t=n.length,o=function(e){t--,t||oc.renderUnloadedComponents()};if(t>0)for(var a=0;a<n.length;a++)oc.renderNestedComponent(r(n[a]),o)})},oc.load=function(e,n,t){oc.ready(function(){if("function"!=typeof t&&(t=x),r(e)){r(e).html("<"+m+' href="'+n+'" />');var o=r(m,e);oc.renderNestedComponent(o,function(){t(o)})}})},oc.ready(oc.renderUnloadedComponents)}(head,document,window),oc.clientVersion="0.23.3";
\ No newline at end of file
+!function(e,n){"use strict";function t(){}function r(e,n){if(e){"object"==typeof e&&(e=[].slice.call(e));for(var t=0,r=e.length;r>t;t++)n.call(e,e[t],t)}}function o(e,t){var r=Object.prototype.toString.call(t).slice(8,-1);return t!==n&&null!==t&&r===e}function a(e){return o("Function",e)}function c(e){return o("Array",e)}function i(e){var n=e.split("/"),t=n[n.length-1],r=t.indexOf("?");return-1!==r?t.substring(0,r):t}function u(e){e=e||t,e._done||(e(),e._done=1)}function d(e,n,r,o){var a="object"==typeof e?e:{test:e,success:n?c(n)?n:[n]:!1,failure:r?c(r)?r:[r]:!1,callback:o||t},i=!!a.test;return i&&a.success?(a.success.push(a.callback),S.load.apply(null,a.success)):!i&&a.failure?(a.failure.push(a.callback),S.load.apply(null,a.failure)):o(),S}function l(e){var n={};if("object"==typeof e)for(var t in e)e[t]&&(n={name:t,url:e[t]});else n={name:i(e),url:e};var r=O[n.name];return r&&r.url===n.url?r:(O[n.name]=n,n)}function f(e){e=e||O;for(var n in e)if(e.hasOwnProperty(n)&&e[n].state!==_)return!1;return!0}function s(e){e.state=A,r(e.onpreload,function(e){e.call()})}function m(e,t){e.state===n&&(e.state=$,e.onpreload=[],g({url:e.url,type:"cache"},function(){s(e)}))}function p(){var e=arguments,n=e[e.length-1],t=[].slice.call(e,1),o=t[0];return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(o?(r(t,function(e){!a(e)&&e&&m(l(e))}),y(l(e[0]),a(o)?o:function(){S.load.apply(null,t)})):y(l(e[0])),S)}function v(){var e=arguments,n=e[e.length-1],t={};return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(r(e,function(e,r){e!==n&&(e=l(e),t[e.name]=e)}),r(e,function(e,r){e!==n&&(e=l(e),y(e,function(){f(t)&&u(n)}))}),S)}function y(e,n){return n=n||t,e.state===_?void n():e.state===k?void S.ready(e.name,n):e.state===$?void e.onpreload.push(function(){y(e,n)}):(e.state=k,void g(e,function(){e.state=_,n(),r(x[e.name],function(e){u(e)}),L&&f()&&r(x.ALL,function(e){u(e)})}))}function h(e){e=e||"";var n=e.split("?")[0].split(".");return n[n.length-1].toLowerCase()}function g(n,r){function o(n){n=n||e.event,i.onload=i.onreadystatechange=i.onerror=null,r()}function a(t){t=t||e.event,("load"===t.type||/loaded|complete/.test(i.readyState)&&(!C.documentMode||C.documentMode<9))&&(e.clearTimeout(n.errorTimeout),e.clearTimeout(n.cssTimeout),i.onload=i.onreadystatechange=i.onerror=null,r())}function c(){if(n.state!==_&&n.cssRetries<=20){for(var t=0,r=C.styleSheets.length;r>t;t++)if(C.styleSheets[t].href===i.href)return void a({type:"load"});n.cssRetries++,n.cssTimeout=e.setTimeout(c,250)}}r=r||t;var i,u=h(n.url);"css"===u?(i=C.createElement("link"),i.type="text/"+(n.type||"css"),i.rel="stylesheet",i.href=n.url,n.cssRetries=0,n.cssTimeout=e.setTimeout(c,500)):(i=C.createElement("script"),i.type="text/"+(n.type||"javascript"),i.src=n.url),i.onload=i.onreadystatechange=a,i.onerror=o,i.async=!1,i.defer=!1,n.errorTimeout=e.setTimeout(function(){o({type:"timeout"})},7e3);var d=C.head||C.getElementsByTagName("head")[0];d.insertBefore(i,d.lastChild)}function j(){for(var e=C.getElementsByTagName("script"),n=0,t=e.length;t>n;n++){var r=e[n].getAttribute("data-headjs-load");if(r)return void S.load(r)}}function T(e,n){if(e===C)return L?u(n):q.push(n),S;if(a(e)&&(n=e,e="ALL"),c(e)){var t={};return r(e,function(e){t[e]=O[e],S.ready(e,function(){f(t)&&u(n)})}),S}if("string"!=typeof e||!a(n))return S;var o=O[e];if(o&&o.state===_||"ALL"===e&&f()&&L)return u(n),S;var i=x[e];return i?i.push(n):i=x[e]=[n],S}function b(){return C.body?void(L||(L=!0,j(),r(q,function(e){u(e)}))):(e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(b,50)))}function E(){C.addEventListener?(C.removeEventListener("DOMContentLoaded",E,!1),b()):"complete"===C.readyState&&(C.detachEvent("onreadystatechange",E),b())}var L,C=e.document,q=[],x={},O={},w="async"in C.createElement("script")||"MozAppearance"in C.documentElement.style||e.opera,M=e.head_conf&&e.head_conf.head||"head",S=e[M]=e[M]||function(){S.ready.apply(null,arguments)},$=1,A=2,k=3,_=4;if("complete"===C.readyState)b();else if(C.addEventListener)C.addEventListener("DOMContentLoaded",E,!1),e.addEventListener("load",b,!1);else{C.attachEvent("onreadystatechange",E),e.attachEvent("onload",b);var I=!1;try{I=!e.frameElement&&C.documentElement}catch(U){}I&&I.doScroll&&!function B(){if(!L){try{I.doScroll("left")}catch(n){return e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(B,50))}b()}}()}S.load=S.js=w?v:p,S.test=d,S.ready=T,S.ready(C,function(){f()&&r(x.ALL,function(e){u(e)}),S.feature&&S.feature("domloaded",!0)})}(window);var oc=oc||{};!function(e,n,t){oc.conf=oc.conf||{},oc.cmd=oc.cmd||[],oc.renderedComponents=oc.renderedComponents||{},oc.$=void 0;var r="https://cdnjs.cloudflare.com/ajax/libs/",o=r+"jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js",a=r+"handlebars.js/3.0.1/handlebars.runtime.js",c=r+"jade/1.9.2/runtime.min.js",i=r+"jquery/1.11.2/jquery.min.js",u=oc.conf.retryInterval||5e3,d=oc.conf.retryLimit||30,l=oc.conf.retrySendNumber||!0,f=oc.conf.pollingInterval||500,s=oc.conf.tag||"oc-component",m="baseUrl parameter is required",p="Href parameter missing",v="name parameter is required",y="Failed to load {0} component {1} times. Giving up".replace("{1}",d),h="Error getting compiled view: {0}",g="Error rendering component: {0}, error: {1}",j="Failed to retrieve the component. Retrying in {0} seconds...".replace("{0}",u/1e3),T='Error loading component: view engine "{0}" not supported',b="Loading...",E="Component '{0}' correctly rendered",L="Unrendered component found. Trying to retrieve it...",C=oc.conf.debug||!1,q=function(){},x=t.navigator.userAgent,O=!!x.match(/MSIE 8/),w=!!x.match(/MSIE 9/),M=!1,S=!1,$={},A=function(e){return"boolean"==typeof e},k={error:function(e){return console.log(e)},info:function(e){return C?console.log(e):!1}},_=function(e,n,t){return void 0===$[e]&&($[e]=d),$[e]<=0?t():(setTimeout(function(){n(d-$[e]+1)},u),void $[e]--)},I=function(e,n){if(e&&n){var t=oc.$.param(n);return e.indexOf("?")>-1?e+"&"+t:e+"?"+t}return e};oc.require=function(n,r,o){"function"==typeof r&&(o=r,r=n,n=void 0),"string"==typeof n&&(n=[n]);var a=function(){var e=t;if("undefined"==typeof n)return!0;for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return!0;return!1},c=function(){var e=t;if("undefined"!=typeof n){for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return;return e}};a()?e.load(r,function(){o(c())}):o(c())};var U=function(e,n,t){n.id=Math.floor(9999999999*Math.random()),e.html(n.html),e.attr("id",n.id),e.attr("data-rendered",!0),e.attr("data-rendering",!1),e.attr("data-version",n.version),n.key&&e.attr("data-hash",n.key),n.name&&(e.attr("data-name",n.name),oc.renderedComponents[n.name]=n.version,oc.events.fire("oc:rendered",n)),t()};oc.build=function(e){if(!e.baseUrl)throw m;if(!e.name)throw v;var n=function(e){return e=e||"","/"!==e.slice(-1)&&(e+="/"),e},t=n(e.baseUrl)+n(e.name);if(e.version&&(t+=n(e.version)),e.parameters){t+="?";for(var r in e.parameters)e.parameters.hasOwnProperty(r)&&(t+=r+"="+e.parameters[r]+"&");t=t.slice(0,-1)}return O?'<div data-oc-component="true" href="'+t+'"></div>':"<"+s+' href="'+t+'"></'+s+">"},oc.events={},oc.ready=function(e){if(M)return e();if(S)oc.cmd.push(e);else{S=!0;var n=function(e){!O&&!w||oc.$.IE_POLYFILL_LOADED?e():oc.require(o,e)},t=function(){M=!0,S=!1,oc.events=function(){var e=oc.$({});return{fire:function(n,t){return e.trigger(n,t)},on:function(n,t){return e.on(n,t||q)},reset:function(){return e.off()}}}(),e(),oc.events.fire("oc:ready",oc);for(var n=0;n<oc.cmd.length;n++)oc.cmd[n](oc);oc.cmd={push:function(e){e(oc)}}};oc.require("jQuery",i,function(e){oc.$=e.noConflict(!0),n(t)})}},oc.render=function(e,n,t){oc.ready(function(){e.type.match(/jade|handlebars/g)?oc.require(["oc","components",e.key],e.src,function(r){r?"handlebars"===e.type?oc.require("Handlebars",a,function(e){var o=e.template(r,[]);t(null,o(n))}):"jade"===e.type&&oc.require("jade",c,function(e){t(null,r(n))}):t(h.replace("{0}",e.src))}):t(T.replace("{0}",e.type))})},oc.renderNestedComponent=function(e,n){oc.ready(function(){var t=e.attr("data-rendering"),r=e.attr("data-rendered"),o=A(t)?t:"true"===t,a=A(r)?r:"true"===r;o||a?setTimeout(n,f):(k.info(L),e.attr("data-rendering",!0),e.html('<div class="oc-loading">'+b+"</div>"),oc.renderByHref(e.attr("href"),function(t,r){return t||!r?(k.error(t),n()):void U(e,r,n)}))})},oc.renderByHref=function(e,n,t){var r=t,o=n;"function"==typeof n&&(r=n,o=0),oc.ready(function(){if(""===e)return r(g.replace("{1}",p));var n=e;l&&(n=I(n,{__oc_Retry:o})),oc.$.ajax({url:n,headers:{Accept:"application/vnd.oc.unrendered+json"},contentType:"text/plain",crossDomain:!0,async:!0,success:function(e){if("unrendered"===e.renderMode)oc.render(e.template,e.data,function(n,t){return n?r(g.replace("{0}",e.href).replace("{1}",n)):(k.info(E.replace("{0}",e.template.src)),void r(null,{html:t,key:e.template.key,version:e.version,name:e.name}))});else if("rendered"===e.renderMode){if(k.info(E.replace("{0}",e.href)),0===e.html.indexOf("<"+s)){var n=e.html.slice(e.html.indexOf(">")+1),t=n.slice(0,n.lastIndexOf("<"));e.html=t}r(null,{html:e.html,version:e.version,name:e.name})}},error:function(){k.error(j),_(e,function(n){oc.renderByHref(e,n,r)},function(){r(y.replace("{0}",e))})}})})},oc.renderUnloadedComponents=function(){oc.ready(function(){var e=O?"div[data-oc-component=true]":s,n=oc.$(e+"[data-rendered!=true]"),t=n.length,r=function(e){t--,t||oc.renderUnloadedComponents()};if(t>0)for(var o=0;o<n.length;o++)oc.renderNestedComponent(oc.$(n[o]),r)})},oc.load=function(e,n,t){oc.ready(function(){if("function"!=typeof t&&(t=q),oc.$(e)){oc.$(e).html("<"+s+' href="'+n+'" />');var r=oc.$(s,e);oc.renderNestedComponent(r,function(){t(r)})}})},oc.ready(oc.renderUnloadedComponents)}(head,document,window),oc.clientVersion="0.23.3";
\ No newline at end of file
diff --git a/components/oc-client/src/oc-client.js b/components/oc-client/src/oc-client.js
index d0ec78cbe..4157047ca 100644
--- a/components/oc-client/src/oc-client.js
+++ b/components/oc-client/src/oc-client.js
@@ -7,6 +7,7 @@ var oc = oc || {};
   oc.conf = oc.conf || {};
   oc.cmd = oc.cmd || [];
   oc.renderedComponents = oc.renderedComponents || {};
+  oc.$ = undefined;
 
   // Constants
   var CDNJS_BASEURL = 'https://cdnjs.cloudflare.com/ajax/libs/',
@@ -34,14 +35,14 @@ var oc = oc || {};
   // The code
   var debug = oc.conf.debug || false,
       headScripts = [],
-      $,
       noop = function(){},
       nav = $window.navigator.userAgent,
       is8 = !!(nav.match(/MSIE 8/)),
       is9 = !!(nav.match(/MSIE 9/)),
       initialised = false,
       initialising = false,
-      retries = {};
+      retries = {},
+      isBool = function(a){ return typeof(a) === 'boolean'; };
 
   var logger = {
     error: function(msg){
@@ -69,7 +70,7 @@ var oc = oc || {};
   
   var addParametersToHref = function (href, parameters) {
     if(href && parameters) {
-      var param = $.param(parameters);
+      var param = oc.$.param(parameters);
       if(href.indexOf('?') > -1) {
         return href + '&' + param;
       } else {
@@ -211,7 +212,7 @@ var oc = oc || {};
       initialising = true;
 
       var requirePolyfills = function(cb){
-        if((is8 || is9) && !$.IE_POLYFILL_LOADED){
+        if((is8 || is9) && !oc.$.IE_POLYFILL_LOADED){
           oc.require(IE89_AJAX_POLYFILL_URL, cb);
         } else {
           cb();
@@ -224,7 +225,7 @@ var oc = oc || {};
 
         oc.events = (function(){
 
-          var obj = $({});
+          var obj = oc.$({});
 
           return {
             fire: function(key, data){
@@ -254,7 +255,7 @@ var oc = oc || {};
       };
 
       oc.require('jQuery', JQUERY_URL, function(jQuery){
-        $ = jQuery;
+        oc.$ = jQuery.noConflict(true);
         requirePolyfills(done);
       });
     }
@@ -289,8 +290,8 @@ var oc = oc || {};
     oc.ready(function(){
       var dataRendering = $component.attr('data-rendering'),
           dataRendered = $component.attr('data-rendered'),
-          isRendering = typeof(dataRendering) === 'boolean' ? dataRendering : (dataRendering === 'true'),
-          isRendered = typeof(dataRendered) === 'boolean' ? dataRendered : (dataRendered === 'true');
+          isRendering = isBool(dataRendering) ? dataRendering : (dataRendering === 'true'),
+          isRendered = isBool(dataRendered) ? dataRendered : (dataRendered === 'true');
 
       if(!isRendering && !isRendered){
         logger.info(MESSAGES_RETRIEVING);
@@ -330,7 +331,7 @@ var oc = oc || {};
           });
         }
 
-        $.ajax({
+        oc.$.ajax({
           url: hrefWithCount,
           headers: { 'Accept': 'application/vnd.oc.unrendered+json' },
           contentType: 'text/plain',
@@ -385,7 +386,7 @@ var oc = oc || {};
   oc.renderUnloadedComponents = function(){
     oc.ready(function(){
       var selector = (is8 ? 'div[data-oc-component=true]' : OC_TAG),
-          $unloadedComponents = $(selector + '[data-rendered!=true]'),
+          $unloadedComponents = oc.$(selector + '[data-rendered!=true]'),
           toDo = $unloadedComponents.length;
       
       var done = function(cb){
@@ -397,7 +398,7 @@ var oc = oc || {};
       
       if(toDo > 0){
         for(var i = 0; i < $unloadedComponents.length; i++){
-          oc.renderNestedComponent($($unloadedComponents[i]), done);
+          oc.renderNestedComponent(oc.$($unloadedComponents[i]), done);
         }
       }
     });
@@ -409,9 +410,9 @@ var oc = oc || {};
         callback = noop;
       }
 
-      if($(placeholder)){
-        $(placeholder).html('<' + OC_TAG + ' href="' + href + '" />');
-        var newComponent = $(OC_TAG, placeholder);
+      if(oc.$(placeholder)){
+        oc.$(placeholder).html('<' + OC_TAG + ' href="' + href + '" />');
+        var newComponent = oc.$(OC_TAG, placeholder);
         oc.renderNestedComponent(newComponent, function(){
           callback(newComponent);
         });
diff --git a/components/oc-client/src/oc-client.min.js b/components/oc-client/src/oc-client.min.js
index 2fc7407c2..925dfd22a 100644
--- a/components/oc-client/src/oc-client.min.js
+++ b/components/oc-client/src/oc-client.min.js
@@ -1 +1 @@
-!function(e,n){"use strict";function t(){}function r(e,n){if(e){"object"==typeof e&&(e=[].slice.call(e));for(var t=0,r=e.length;r>t;t++)n.call(e,e[t],t)}}function o(e,t){var r=Object.prototype.toString.call(t).slice(8,-1);return t!==n&&null!==t&&r===e}function a(e){return o("Function",e)}function c(e){return o("Array",e)}function i(e){var n=e.split("/"),t=n[n.length-1],r=t.indexOf("?");return-1!==r?t.substring(0,r):t}function u(e){e=e||t,e._done||(e(),e._done=1)}function d(e,n,r,o){var a="object"==typeof e?e:{test:e,success:n?c(n)?n:[n]:!1,failure:r?c(r)?r:[r]:!1,callback:o||t},i=!!a.test;return i&&a.success?(a.success.push(a.callback),S.load.apply(null,a.success)):!i&&a.failure?(a.failure.push(a.callback),S.load.apply(null,a.failure)):o(),S}function l(e){var n={};if("object"==typeof e)for(var t in e)e[t]&&(n={name:t,url:e[t]});else n={name:i(e),url:e};var r=O[n.name];return r&&r.url===n.url?r:(O[n.name]=n,n)}function f(e){e=e||O;for(var n in e)if(e.hasOwnProperty(n)&&e[n].state!==I)return!1;return!0}function s(e){e.state=k,r(e.onpreload,function(e){e.call()})}function m(e,t){e.state===n&&(e.state=A,e.onpreload=[],g({url:e.url,type:"cache"},function(){s(e)}))}function p(){var e=arguments,n=e[e.length-1],t=[].slice.call(e,1),o=t[0];return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(o?(r(t,function(e){!a(e)&&e&&m(l(e))}),y(l(e[0]),a(o)?o:function(){S.load.apply(null,t)})):y(l(e[0])),S)}function v(){var e=arguments,n=e[e.length-1],t={};return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(r(e,function(e,r){e!==n&&(e=l(e),t[e.name]=e)}),r(e,function(e,r){e!==n&&(e=l(e),y(e,function(){f(t)&&u(n)}))}),S)}function y(e,n){return n=n||t,e.state===I?void n():e.state===_?void S.ready(e.name,n):e.state===A?void e.onpreload.push(function(){y(e,n)}):(e.state=_,void g(e,function(){e.state=I,n(),r(x[e.name],function(e){u(e)}),L&&f()&&r(x.ALL,function(e){u(e)})}))}function h(e){e=e||"";var n=e.split("?")[0].split(".");return n[n.length-1].toLowerCase()}function g(n,r){function o(n){n=n||e.event,i.onload=i.onreadystatechange=i.onerror=null,r()}function a(t){t=t||e.event,("load"===t.type||/loaded|complete/.test(i.readyState)&&(!q.documentMode||q.documentMode<9))&&(e.clearTimeout(n.errorTimeout),e.clearTimeout(n.cssTimeout),i.onload=i.onreadystatechange=i.onerror=null,r())}function c(){if(n.state!==I&&n.cssRetries<=20){for(var t=0,r=q.styleSheets.length;r>t;t++)if(q.styleSheets[t].href===i.href)return void a({type:"load"});n.cssRetries++,n.cssTimeout=e.setTimeout(c,250)}}r=r||t;var i,u=h(n.url);"css"===u?(i=q.createElement("link"),i.type="text/"+(n.type||"css"),i.rel="stylesheet",i.href=n.url,n.cssRetries=0,n.cssTimeout=e.setTimeout(c,500)):(i=q.createElement("script"),i.type="text/"+(n.type||"javascript"),i.src=n.url),i.onload=i.onreadystatechange=a,i.onerror=o,i.async=!1,i.defer=!1,n.errorTimeout=e.setTimeout(function(){o({type:"timeout"})},7e3);var d=q.head||q.getElementsByTagName("head")[0];d.insertBefore(i,d.lastChild)}function j(){for(var e=q.getElementsByTagName("script"),n=0,t=e.length;t>n;n++){var r=e[n].getAttribute("data-headjs-load");if(r)return void S.load(r)}}function b(e,n){if(e===q)return L?u(n):C.push(n),S;if(a(e)&&(n=e,e="ALL"),c(e)){var t={};return r(e,function(e){t[e]=O[e],S.ready(e,function(){f(t)&&u(n)})}),S}if("string"!=typeof e||!a(n))return S;var o=O[e];if(o&&o.state===I||"ALL"===e&&f()&&L)return u(n),S;var i=x[e];return i?i.push(n):i=x[e]=[n],S}function T(){return q.body?void(L||(L=!0,j(),r(C,function(e){u(e)}))):(e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(T,50)))}function E(){q.addEventListener?(q.removeEventListener("DOMContentLoaded",E,!1),T()):"complete"===q.readyState&&(q.detachEvent("onreadystatechange",E),T())}var L,q=e.document,C=[],x={},O={},w="async"in q.createElement("script")||"MozAppearance"in q.documentElement.style||e.opera,M=e.head_conf&&e.head_conf.head||"head",S=e[M]=e[M]||function(){S.ready.apply(null,arguments)},A=1,k=2,_=3,I=4;if("complete"===q.readyState)T();else if(q.addEventListener)q.addEventListener("DOMContentLoaded",E,!1),e.addEventListener("load",T,!1);else{q.attachEvent("onreadystatechange",E),e.attachEvent("onload",T);var U=!1;try{U=!e.frameElement&&q.documentElement}catch(B){}U&&U.doScroll&&!function N(){if(!L){try{U.doScroll("left")}catch(n){return e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(N,50))}T()}}()}S.load=S.js=w?v:p,S.test=d,S.ready=b,S.ready(q,function(){f()&&r(x.ALL,function(e){u(e)}),S.feature&&S.feature("domloaded",!0)})}(window);var oc=oc||{};!function(e,n,t){oc.conf=oc.conf||{},oc.cmd=oc.cmd||[],oc.renderedComponents=oc.renderedComponents||{};var r,o="https://cdnjs.cloudflare.com/ajax/libs/",a=o+"jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js",c=o+"handlebars.js/3.0.1/handlebars.runtime.js",i=o+"jade/1.9.2/runtime.min.js",u=o+"jquery/1.11.2/jquery.min.js",d=oc.conf.retryInterval||5e3,l=oc.conf.retryLimit||30,f=oc.conf.retrySendNumber||!0,s=oc.conf.pollingInterval||500,m=oc.conf.tag||"oc-component",p="baseUrl parameter is required",v="Href parameter missing",y="name parameter is required",h="Failed to load {0} component {1} times. Giving up".replace("{1}",l),g="Error getting compiled view: {0}",j="Error rendering component: {0}, error: {1}",b="Failed to retrieve the component. Retrying in {0} seconds...".replace("{0}",d/1e3),T='Error loading component: view engine "{0}" not supported',E="Loading...",L="Component '{0}' correctly rendered",q="Unrendered component found. Trying to retrieve it...",C=oc.conf.debug||!1,x=function(){},O=t.navigator.userAgent,w=!!O.match(/MSIE 8/),M=!!O.match(/MSIE 9/),S=!1,A=!1,k={},_={error:function(e){return console.log(e)},info:function(e){return C?console.log(e):!1}},I=function(e,n,t){return void 0===k[e]&&(k[e]=l),k[e]<=0?t():(setTimeout(function(){n(l-k[e]+1)},d),void k[e]--)},U=function(e,n){if(e&&n){var t=r.param(n);return e.indexOf("?")>-1?e+"&"+t:e+"?"+t}return e};oc.require=function(n,r,o){"function"==typeof r&&(o=r,r=n,n=void 0),"string"==typeof n&&(n=[n]);var a=function(){var e=t;if("undefined"==typeof n)return!0;for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return!0;return!1},c=function(){var e=t;if("undefined"!=typeof n){for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return;return e}};a()?e.load(r,function(){o(c())}):o(c())};var B=function(e,n,t){n.id=Math.floor(9999999999*Math.random()),e.html(n.html),e.attr("id",n.id),e.attr("data-rendered",!0),e.attr("data-rendering",!1),e.attr("data-version",n.version),n.key&&e.attr("data-hash",n.key),n.name&&(e.attr("data-name",n.name),oc.renderedComponents[n.name]=n.version,oc.events.fire("oc:rendered",n)),t()};oc.build=function(e){if(!e.baseUrl)throw p;if(!e.name)throw y;var n=function(e){return e=e||"","/"!==e.slice(-1)&&(e+="/"),e},t=n(e.baseUrl)+n(e.name);if(e.version&&(t+=n(e.version)),e.parameters){t+="?";for(var r in e.parameters)e.parameters.hasOwnProperty(r)&&(t+=r+"="+e.parameters[r]+"&");t=t.slice(0,-1)}return w?'<div data-oc-component="true" href="'+t+'"></div>':"<"+m+' href="'+t+'"></'+m+">"},oc.events={},oc.ready=function(e){if(S)return e();if(A)oc.cmd.push(e);else{A=!0;var n=function(e){!w&&!M||r.IE_POLYFILL_LOADED?e():oc.require(a,e)},t=function(){S=!0,A=!1,oc.events=function(){var e=r({});return{fire:function(n,t){return e.trigger(n,t)},on:function(n,t){return e.on(n,t||x)},reset:function(){return e.off()}}}(),e(),oc.events.fire("oc:ready",oc);for(var n=0;n<oc.cmd.length;n++)oc.cmd[n](oc);oc.cmd={push:function(e){e(oc)}}};oc.require("jQuery",u,function(e){r=e,n(t)})}},oc.render=function(e,n,t){oc.ready(function(){e.type.match(/jade|handlebars/g)?oc.require(["oc","components",e.key],e.src,function(r){r?"handlebars"===e.type?oc.require("Handlebars",c,function(e){var o=e.template(r,[]);t(null,o(n))}):"jade"===e.type&&oc.require("jade",i,function(e){t(null,r(n))}):t(g.replace("{0}",e.src))}):t(T.replace("{0}",e.type))})},oc.renderNestedComponent=function(e,n){oc.ready(function(){var t=e.attr("data-rendering"),r=e.attr("data-rendered"),o="boolean"==typeof t?t:"true"===t,a="boolean"==typeof r?r:"true"===r;o||a?setTimeout(n,s):(_.info(q),e.attr("data-rendering",!0),e.html('<div class="oc-loading">'+E+"</div>"),oc.renderByHref(e.attr("href"),function(t,r){return t||!r?(_.error(t),n()):void B(e,r,n)}))})},oc.renderByHref=function(e,n,t){var o=t,a=n;"function"==typeof n&&(o=n,a=0),oc.ready(function(){if(""===e)return o(j.replace("{1}",v));var n=e;f&&(n=U(n,{__oc_Retry:a})),r.ajax({url:n,headers:{Accept:"application/vnd.oc.unrendered+json"},contentType:"text/plain",crossDomain:!0,async:!0,success:function(e){if("unrendered"===e.renderMode)oc.render(e.template,e.data,function(n,t){return n?o(j.replace("{0}",e.href).replace("{1}",n)):(_.info(L.replace("{0}",e.template.src)),void o(null,{html:t,key:e.template.key,version:e.version,name:e.name}))});else if("rendered"===e.renderMode){if(_.info(L.replace("{0}",e.href)),0===e.html.indexOf("<"+m)){var n=e.html.slice(e.html.indexOf(">")+1),t=n.slice(0,n.lastIndexOf("<"));e.html=t}o(null,{html:e.html,version:e.version,name:e.name})}},error:function(){_.error(b),I(e,function(n){oc.renderByHref(e,n,o)},function(){o(h.replace("{0}",e))})}})})},oc.renderUnloadedComponents=function(){oc.ready(function(){var e=w?"div[data-oc-component=true]":m,n=r(e+"[data-rendered!=true]"),t=n.length,o=function(e){t--,t||oc.renderUnloadedComponents()};if(t>0)for(var a=0;a<n.length;a++)oc.renderNestedComponent(r(n[a]),o)})},oc.load=function(e,n,t){oc.ready(function(){if("function"!=typeof t&&(t=x),r(e)){r(e).html("<"+m+' href="'+n+'" />');var o=r(m,e);oc.renderNestedComponent(o,function(){t(o)})}})},oc.ready(oc.renderUnloadedComponents)}(head,document,window),oc.clientVersion="0.23.3";
\ No newline at end of file
+!function(e,n){"use strict";function t(){}function r(e,n){if(e){"object"==typeof e&&(e=[].slice.call(e));for(var t=0,r=e.length;r>t;t++)n.call(e,e[t],t)}}function o(e,t){var r=Object.prototype.toString.call(t).slice(8,-1);return t!==n&&null!==t&&r===e}function a(e){return o("Function",e)}function c(e){return o("Array",e)}function i(e){var n=e.split("/"),t=n[n.length-1],r=t.indexOf("?");return-1!==r?t.substring(0,r):t}function u(e){e=e||t,e._done||(e(),e._done=1)}function d(e,n,r,o){var a="object"==typeof e?e:{test:e,success:n?c(n)?n:[n]:!1,failure:r?c(r)?r:[r]:!1,callback:o||t},i=!!a.test;return i&&a.success?(a.success.push(a.callback),S.load.apply(null,a.success)):!i&&a.failure?(a.failure.push(a.callback),S.load.apply(null,a.failure)):o(),S}function l(e){var n={};if("object"==typeof e)for(var t in e)e[t]&&(n={name:t,url:e[t]});else n={name:i(e),url:e};var r=O[n.name];return r&&r.url===n.url?r:(O[n.name]=n,n)}function f(e){e=e||O;for(var n in e)if(e.hasOwnProperty(n)&&e[n].state!==_)return!1;return!0}function s(e){e.state=A,r(e.onpreload,function(e){e.call()})}function m(e,t){e.state===n&&(e.state=$,e.onpreload=[],g({url:e.url,type:"cache"},function(){s(e)}))}function p(){var e=arguments,n=e[e.length-1],t=[].slice.call(e,1),o=t[0];return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(o?(r(t,function(e){!a(e)&&e&&m(l(e))}),y(l(e[0]),a(o)?o:function(){S.load.apply(null,t)})):y(l(e[0])),S)}function v(){var e=arguments,n=e[e.length-1],t={};return a(n)||(n=null),c(e[0])?(e[0].push(n),S.load.apply(null,e[0]),S):(r(e,function(e,r){e!==n&&(e=l(e),t[e.name]=e)}),r(e,function(e,r){e!==n&&(e=l(e),y(e,function(){f(t)&&u(n)}))}),S)}function y(e,n){return n=n||t,e.state===_?void n():e.state===k?void S.ready(e.name,n):e.state===$?void e.onpreload.push(function(){y(e,n)}):(e.state=k,void g(e,function(){e.state=_,n(),r(x[e.name],function(e){u(e)}),L&&f()&&r(x.ALL,function(e){u(e)})}))}function h(e){e=e||"";var n=e.split("?")[0].split(".");return n[n.length-1].toLowerCase()}function g(n,r){function o(n){n=n||e.event,i.onload=i.onreadystatechange=i.onerror=null,r()}function a(t){t=t||e.event,("load"===t.type||/loaded|complete/.test(i.readyState)&&(!C.documentMode||C.documentMode<9))&&(e.clearTimeout(n.errorTimeout),e.clearTimeout(n.cssTimeout),i.onload=i.onreadystatechange=i.onerror=null,r())}function c(){if(n.state!==_&&n.cssRetries<=20){for(var t=0,r=C.styleSheets.length;r>t;t++)if(C.styleSheets[t].href===i.href)return void a({type:"load"});n.cssRetries++,n.cssTimeout=e.setTimeout(c,250)}}r=r||t;var i,u=h(n.url);"css"===u?(i=C.createElement("link"),i.type="text/"+(n.type||"css"),i.rel="stylesheet",i.href=n.url,n.cssRetries=0,n.cssTimeout=e.setTimeout(c,500)):(i=C.createElement("script"),i.type="text/"+(n.type||"javascript"),i.src=n.url),i.onload=i.onreadystatechange=a,i.onerror=o,i.async=!1,i.defer=!1,n.errorTimeout=e.setTimeout(function(){o({type:"timeout"})},7e3);var d=C.head||C.getElementsByTagName("head")[0];d.insertBefore(i,d.lastChild)}function j(){for(var e=C.getElementsByTagName("script"),n=0,t=e.length;t>n;n++){var r=e[n].getAttribute("data-headjs-load");if(r)return void S.load(r)}}function T(e,n){if(e===C)return L?u(n):q.push(n),S;if(a(e)&&(n=e,e="ALL"),c(e)){var t={};return r(e,function(e){t[e]=O[e],S.ready(e,function(){f(t)&&u(n)})}),S}if("string"!=typeof e||!a(n))return S;var o=O[e];if(o&&o.state===_||"ALL"===e&&f()&&L)return u(n),S;var i=x[e];return i?i.push(n):i=x[e]=[n],S}function b(){return C.body?void(L||(L=!0,j(),r(q,function(e){u(e)}))):(e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(b,50)))}function E(){C.addEventListener?(C.removeEventListener("DOMContentLoaded",E,!1),b()):"complete"===C.readyState&&(C.detachEvent("onreadystatechange",E),b())}var L,C=e.document,q=[],x={},O={},w="async"in C.createElement("script")||"MozAppearance"in C.documentElement.style||e.opera,M=e.head_conf&&e.head_conf.head||"head",S=e[M]=e[M]||function(){S.ready.apply(null,arguments)},$=1,A=2,k=3,_=4;if("complete"===C.readyState)b();else if(C.addEventListener)C.addEventListener("DOMContentLoaded",E,!1),e.addEventListener("load",b,!1);else{C.attachEvent("onreadystatechange",E),e.attachEvent("onload",b);var I=!1;try{I=!e.frameElement&&C.documentElement}catch(U){}I&&I.doScroll&&!function B(){if(!L){try{I.doScroll("left")}catch(n){return e.clearTimeout(S.readyTimeout),void(S.readyTimeout=e.setTimeout(B,50))}b()}}()}S.load=S.js=w?v:p,S.test=d,S.ready=T,S.ready(C,function(){f()&&r(x.ALL,function(e){u(e)}),S.feature&&S.feature("domloaded",!0)})}(window);var oc=oc||{};!function(e,n,t){oc.conf=oc.conf||{},oc.cmd=oc.cmd||[],oc.renderedComponents=oc.renderedComponents||{},oc.$=void 0;var r="https://cdnjs.cloudflare.com/ajax/libs/",o=r+"jquery-ajaxtransport-xdomainrequest/1.0.3/jquery.xdomainrequest.min.js",a=r+"handlebars.js/3.0.1/handlebars.runtime.js",c=r+"jade/1.9.2/runtime.min.js",i=r+"jquery/1.11.2/jquery.min.js",u=oc.conf.retryInterval||5e3,d=oc.conf.retryLimit||30,l=oc.conf.retrySendNumber||!0,f=oc.conf.pollingInterval||500,s=oc.conf.tag||"oc-component",m="baseUrl parameter is required",p="Href parameter missing",v="name parameter is required",y="Failed to load {0} component {1} times. Giving up".replace("{1}",d),h="Error getting compiled view: {0}",g="Error rendering component: {0}, error: {1}",j="Failed to retrieve the component. Retrying in {0} seconds...".replace("{0}",u/1e3),T='Error loading component: view engine "{0}" not supported',b="Loading...",E="Component '{0}' correctly rendered",L="Unrendered component found. Trying to retrieve it...",C=oc.conf.debug||!1,q=function(){},x=t.navigator.userAgent,O=!!x.match(/MSIE 8/),w=!!x.match(/MSIE 9/),M=!1,S=!1,$={},A=function(e){return"boolean"==typeof e},k={error:function(e){return console.log(e)},info:function(e){return C?console.log(e):!1}},_=function(e,n,t){return void 0===$[e]&&($[e]=d),$[e]<=0?t():(setTimeout(function(){n(d-$[e]+1)},u),void $[e]--)},I=function(e,n){if(e&&n){var t=oc.$.param(n);return e.indexOf("?")>-1?e+"&"+t:e+"?"+t}return e};oc.require=function(n,r,o){"function"==typeof r&&(o=r,r=n,n=void 0),"string"==typeof n&&(n=[n]);var a=function(){var e=t;if("undefined"==typeof n)return!0;for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return!0;return!1},c=function(){var e=t;if("undefined"!=typeof n){for(var r=0;r<n.length;r++)if(e=e[n[r]],!e)return;return e}};a()?e.load(r,function(){o(c())}):o(c())};var U=function(e,n,t){n.id=Math.floor(9999999999*Math.random()),e.html(n.html),e.attr("id",n.id),e.attr("data-rendered",!0),e.attr("data-rendering",!1),e.attr("data-version",n.version),n.key&&e.attr("data-hash",n.key),n.name&&(e.attr("data-name",n.name),oc.renderedComponents[n.name]=n.version,oc.events.fire("oc:rendered",n)),t()};oc.build=function(e){if(!e.baseUrl)throw m;if(!e.name)throw v;var n=function(e){return e=e||"","/"!==e.slice(-1)&&(e+="/"),e},t=n(e.baseUrl)+n(e.name);if(e.version&&(t+=n(e.version)),e.parameters){t+="?";for(var r in e.parameters)e.parameters.hasOwnProperty(r)&&(t+=r+"="+e.parameters[r]+"&");t=t.slice(0,-1)}return O?'<div data-oc-component="true" href="'+t+'"></div>':"<"+s+' href="'+t+'"></'+s+">"},oc.events={},oc.ready=function(e){if(M)return e();if(S)oc.cmd.push(e);else{S=!0;var n=function(e){!O&&!w||oc.$.IE_POLYFILL_LOADED?e():oc.require(o,e)},t=function(){M=!0,S=!1,oc.events=function(){var e=oc.$({});return{fire:function(n,t){return e.trigger(n,t)},on:function(n,t){return e.on(n,t||q)},reset:function(){return e.off()}}}(),e(),oc.events.fire("oc:ready",oc);for(var n=0;n<oc.cmd.length;n++)oc.cmd[n](oc);oc.cmd={push:function(e){e(oc)}}};oc.require("jQuery",i,function(e){oc.$=e.noConflict(!0),n(t)})}},oc.render=function(e,n,t){oc.ready(function(){e.type.match(/jade|handlebars/g)?oc.require(["oc","components",e.key],e.src,function(r){r?"handlebars"===e.type?oc.require("Handlebars",a,function(e){var o=e.template(r,[]);t(null,o(n))}):"jade"===e.type&&oc.require("jade",c,function(e){t(null,r(n))}):t(h.replace("{0}",e.src))}):t(T.replace("{0}",e.type))})},oc.renderNestedComponent=function(e,n){oc.ready(function(){var t=e.attr("data-rendering"),r=e.attr("data-rendered"),o=A(t)?t:"true"===t,a=A(r)?r:"true"===r;o||a?setTimeout(n,f):(k.info(L),e.attr("data-rendering",!0),e.html('<div class="oc-loading">'+b+"</div>"),oc.renderByHref(e.attr("href"),function(t,r){return t||!r?(k.error(t),n()):void U(e,r,n)}))})},oc.renderByHref=function(e,n,t){var r=t,o=n;"function"==typeof n&&(r=n,o=0),oc.ready(function(){if(""===e)return r(g.replace("{1}",p));var n=e;l&&(n=I(n,{__oc_Retry:o})),oc.$.ajax({url:n,headers:{Accept:"application/vnd.oc.unrendered+json"},contentType:"text/plain",crossDomain:!0,async:!0,success:function(e){if("unrendered"===e.renderMode)oc.render(e.template,e.data,function(n,t){return n?r(g.replace("{0}",e.href).replace("{1}",n)):(k.info(E.replace("{0}",e.template.src)),void r(null,{html:t,key:e.template.key,version:e.version,name:e.name}))});else if("rendered"===e.renderMode){if(k.info(E.replace("{0}",e.href)),0===e.html.indexOf("<"+s)){var n=e.html.slice(e.html.indexOf(">")+1),t=n.slice(0,n.lastIndexOf("<"));e.html=t}r(null,{html:e.html,version:e.version,name:e.name})}},error:function(){k.error(j),_(e,function(n){oc.renderByHref(e,n,r)},function(){r(y.replace("{0}",e))})}})})},oc.renderUnloadedComponents=function(){oc.ready(function(){var e=O?"div[data-oc-component=true]":s,n=oc.$(e+"[data-rendered!=true]"),t=n.length,r=function(e){t--,t||oc.renderUnloadedComponents()};if(t>0)for(var o=0;o<n.length;o++)oc.renderNestedComponent(oc.$(n[o]),r)})},oc.load=function(e,n,t){oc.ready(function(){if("function"!=typeof t&&(t=q),oc.$(e)){oc.$(e).html("<"+s+' href="'+n+'" />');var r=oc.$(s,e);oc.renderNestedComponent(r,function(){t(r)})}})},oc.ready(oc.renderUnloadedComponents)}(head,document,window),oc.clientVersion="0.23.3";
\ No newline at end of file
diff --git a/test/front-end/render-by-href.js b/test/front-end/render-by-href.js
index 2c010dfa8..84bbae188 100644
--- a/test/front-end/render-by-href.js
+++ b/test/front-end/render-by-href.js
@@ -40,13 +40,13 @@ describe('oc-client : renderByHref', function(){
   var route = 'http://my-registry.com/v3/a-component/1.2.X/?name=John',
       compiledViewContent = 'oc.components=oc.components||{},oc.components["46ee85c314b371cac60471cef5b2e2e6c443dccf"]={compiler:[6,">= 2.0.0-beta.1"],main:function(){return"Hello world!"},useData:!0};';
 
-  var originalAjax = jQuery.ajax,
+  var originalAjax = oc.$.ajax,
       originalConsoleLog = console.log;
 
   var initialise = function(response, fail){
     var spy = sinon.spy();
 
-    jQuery.ajax = $.ajax = function(params){
+    oc.$.ajax = function(params){
       var method = (typeof(fail) === 'boolean' && fail) ? 'error' : 'success';
 
       spy(params);
@@ -61,7 +61,7 @@ describe('oc-client : renderByHref', function(){
   var cleanup = function(){
     head.load.restore();
     console.log = originalConsoleLog;
-    jQuery.ajax = $.ajax = originalAjax;
+    oc.$.ajax = originalAjax;
     delete oc.components;
   };
   
diff --git a/test/front-end/render-unloaded-components.js b/test/front-end/render-unloaded-components.js
index 5f13c2eb9..57ff0b4ac 100644
--- a/test/front-end/render-unloaded-components.js
+++ b/test/front-end/render-unloaded-components.js
@@ -41,11 +41,11 @@ describe('oc-client : renderUnloadedComponents', function(){
     view: 'oc.components=oc.components||{},oc.components["97f07144341a214735c4cec85b002c4c8f394455"]=function(c){var o=[];return o.push("<div>this is a component</div>"),o.join("")};'
   };
 
-  var originalAjax = jQuery.ajax, 
+  var originalAjax = oc.$.ajax, 
       originalConsoleLog = console.log;
 
   var initialise = function(){
-    jQuery.ajax = $.ajax = function(p){
+    oc.$.ajax = function(p){
       var isAnother = p.url.indexOf('another') > 0;
       p.success((isAnother ? anotherComponent : aComponent).response); 
     };
@@ -61,8 +61,8 @@ describe('oc-client : renderUnloadedComponents', function(){
       '<div data-oc-component="true" href="' + anotherComponent.response.href + '"></div>' :
       '<oc-component href="' + anotherComponent.response.href + '"></oc-component>';
 
-    $('body').append(aComponentHtml);
-    $('body').append(anotherComponentHtml);
+    oc.$('body').append(aComponentHtml);
+    oc.$('body').append(anotherComponentHtml);
     eval(aComponent.view);
     eval(anotherComponent.view);
   };
@@ -71,8 +71,8 @@ describe('oc-client : renderUnloadedComponents', function(){
     head.load.restore();
     console.log = originalConsoleLog;
     oc.events.reset();
-    $('body').find('oc-component').remove();
-    jQuery.ajax = $.ajax = originalAjax;
+    oc.$('body').find('oc-component').remove();
+    oc.$.ajax = originalAjax;
     delete oc.components;
     oc.renderedComponents = {};
   };