noConflict not required

needs more testing

Author: FinalAngel

cms/static/cms/js/modules/cms.base.js

@@ -12,8 +12,8 @@ window.Class = window.Class || undefined;
 
 // ensuring CMS namespace is set correctly
 var CMS = {
-	'$': (jQuery) ? jQuery.noConflict() : undefined,
-	'Class': (Class) ? Class.noConflict() : undefined,
+	'$': (jQuery) ? jQuery : undefined,
+	'Class': (Class) ? Class : undefined,
 	'API': {}
 };